Dan Hansen
|
efd9e61f45
|
Add new infinite scroll location to jasmine config
|
2011-04-22 20:35:15 -05:00 |
|
Dan Hansen
|
3d11b402e0
|
Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks
|
2011-04-22 20:33:21 -05:00 |
|
Dan Hansen
|
d28e7e70b8
|
use typeof operand instead of object#hasOwnProperty
|
2011-04-22 20:02:54 -05:00 |
|
MrZYX
|
605382a478
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-04-23 01:18:27 +02:00 |
|
MrZYX
|
2324f0797d
|
updated locales
|
2011-04-23 01:18:15 +02:00 |
|
Maxwell Salzberg
|
e866fdb1f3
|
small fix to make atom valid
|
2011-04-22 11:01:38 -07:00 |
|
Raphael Sofaer
|
830cbf0876
|
I'm blaming that one on the vicodin
|
2011-04-21 15:13:17 -07:00 |
|
Raphael Sofaer
|
bad0d9f4ea
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
public/javascripts/keycodes.js
|
2011-04-21 12:49:49 -07:00 |
|
Raphael Sofaer
|
804b6cc490
|
Clean up some JS
|
2011-04-21 12:48:31 -07:00 |
|
MrZYX
|
45d621a9e6
|
fixed embedder the hacky way (?) and added cucumber feature for youtube feature so you'll notice if you breakt it again the next time
|
2011-04-21 15:42:28 +02:00 |
|
MrZYX
|
b297648072
|
Added migration that downcases all usernames. This should solve the "Can only login via password reset" problems
|
2011-04-21 14:24:32 +02:00 |
|
Jordi Mallach
|
2f6ed0b303
|
Updated Catalan translation to 9850a3f.
|
2011-04-21 13:48:56 +02:00 |
|
MrZYX
|
89c3e30663
|
apply suggested fix in/for #1026
|
2011-04-21 13:31:30 +02:00 |
|
MrZYX
|
46d2efd80a
|
update sod
|
2011-04-21 12:59:43 +02:00 |
|
MrZYX
|
fc526ff315
|
updated locales
|
2011-04-21 01:47:27 +02:00 |
|
Raphael Sofaer
|
9731871ca9
|
Register services before embedder render spec
|
2011-04-20 15:11:29 -07:00 |
|
DenSchub
|
8fa19f7a34
|
We don't need that on debian.
|
2011-04-20 23:16:53 +02:00 |
|
zhitomirskiyi
|
c31b6f18fd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-04-20 14:03:58 -07:00 |
|
zhitomirskiyi
|
76c24c2848
|
added debian sod recipies
|
2011-04-20 14:02:52 -07:00 |
|
Raphael Sofaer
|
470db499c5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-04-19 17:22:52 -07:00 |
|
Raphael Sofaer
|
5dcfff104a
|
Merge remote branch 'ritchewilson/prev_next'
Conflicts:
public/stylesheets/sass/mobile.sass
|
2011-04-19 17:05:12 -07:00 |
|
MrZYX
|
931b85fe62
|
added bulgarian
|
2011-04-20 01:05:57 +02:00 |
|
MrZYX
|
1813b248c6
|
updated locales
|
2011-04-20 01:04:33 +02:00 |
|
maxwell
|
9850a3f124
|
change text on manage services popup
|
2011-04-18 18:38:03 -07:00 |
|
maxwell
|
62c164e1a4
|
fixed displays of the days based on locale
|
2011-04-18 18:29:55 -07:00 |
|
maxwell
|
14bfdbd4a9
|
hack to fix the timeago for other languages. ohaibbq can you find why this broke in the first place?
|
2011-04-18 18:11:03 -07:00 |
|
maxwell
|
d70ef86337
|
make the days the right size in notification page
|
2011-04-18 17:55:17 -07:00 |
|
maxwell
|
b3c3c161ce
|
fix deprecation warning in jasmine gem in latest rubygems
|
2011-04-18 17:06:55 -07:00 |
|
MrZYX
|
c06b885aa7
|
fixed #1027
|
2011-04-19 00:27:31 +02:00 |
|
maxwell
|
1fc01c3980
|
basically fixed
|
2011-04-18 15:10:47 -07:00 |
|
maxwell
|
2223c562c0
|
first fix of notification page
|
2011-04-18 15:10:47 -07:00 |
|
maxwell
|
5050307179
|
Revert "Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])"
This reverts commit 981d39d220.
|
2011-04-18 15:10:46 -07:00 |
|
MrZYX
|
7a48d7accf
|
added readme for inflection definitions
|
2011-04-18 22:37:24 +02:00 |
|
MrZYX
|
e12c7a0eb0
|
updated locales
|
2011-04-17 22:22:56 +02:00 |
|
MrZYX
|
9df8f83276
|
fixed specs for me and serveral others (thanks @jrichardlai); fixed cucumber
|
2011-04-17 21:28:09 +02:00 |
|
MrZYX
|
981d39d220
|
Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])
This reverts commit a16e83df9e.
|
2011-04-16 14:03:24 +02:00 |
|
Dan Hansen
|
7216c8d5cb
|
DRY up timeago.js, add license to i18n.js & timeago.js
|
2011-04-15 23:37:17 -05:00 |
|
Dan Hansen
|
7ed21930b4
|
make infscroll, publisher, stream use pub/sub to listen for the stream being reloaded, random cleanups and fix aspect-filters.js spec
|
2011-04-15 18:49:31 -05:00 |
|
Dan Hansen
|
296824c92b
|
add basic pub/sub functionality to WidgetCollection
|
2011-04-15 18:29:48 -05:00 |
|
Dan Hansen
|
c0cd8fafff
|
make a widget's start method optional
|
2011-04-15 18:14:38 -05:00 |
|
MrZYX
|
2eaf5abf32
|
updated locales
|
2011-04-16 00:59:12 +02:00 |
|
Dan Hansen
|
0edc6bdeef
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-04-15 17:31:34 -05:00 |
|
Dan Hansen
|
0b85600e0a
|
diaspora.js cleanup; don't pollute global namespace in spec
|
2011-04-15 17:31:19 -05:00 |
|
Raphael Sofaer
|
8ae90e71be
|
OHAI! Y U BREAK BUILD??
|
2011-04-15 15:13:19 -07:00 |
|
danielgrippi
|
a16e83df9e
|
touched up notifications page
|
2011-04-15 10:42:21 -07:00 |
|
MrZYX
|
b25e634be1
|
fixed #1011
|
2011-04-15 16:18:59 +02:00 |
|
Raphael Sofaer
|
4870ffb944
|
Fix db seed, refactor aspect-filters a bunch, fix stream_element a little
|
2011-04-13 18:13:26 -07:00 |
|
Raphael Sofaer
|
9969dbd109
|
Start refactoring aspect-filters.js
|
2011-04-13 15:55:10 -07:00 |
|
Raphael Sofaer
|
f13304073b
|
The specs are green on my dev machine, let's see if CI is still red
|
2011-04-13 15:19:17 -07:00 |
|
Raphael Sofaer
|
efe79eb351
|
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
|
2011-04-13 14:35:20 -07:00 |
|