zhitomirskiyi
|
d6ab633e2c
|
Merge branch 'notification-migration'
|
2011-01-31 14:41:15 -08:00 |
|
Dan Hansen
|
2e03c7f9f6
|
forgot to remove these files from my previous commit
|
2011-01-31 15:23:04 -06:00 |
|
Dan Hansen
|
3746d296b0
|
fix dom traversing for embedder
|
2011-01-31 15:15:30 -06:00 |
|
zhitomirskiyi
|
a789be737a
|
also making sure that the notification actor id is unique in the keep delete table
|
2011-01-31 11:42:49 -08:00 |
|
zhitomirskiyi
|
2d078a212a
|
remove mongo id from the notifications table
|
2011-01-31 11:31:59 -08:00 |
|
zhitomirskiyi
|
7cb23fd803
|
added a select for the actor id to group by it
|
2011-01-31 11:27:56 -08:00 |
|
zhitomirskiyi
|
03e8aa31f4
|
fixed notifications migration
|
2011-01-31 11:02:51 -08:00 |
|
MrZYX
|
391a9b0de5
|
translate contacts in _header.haml
|
2011-01-31 19:48:36 +01:00 |
|
zhitomirskiyi
|
ac50a0119a
|
spec for not raising on already existant actor
|
2011-01-31 10:23:26 -08:00 |
|
MrZYX
|
0c802677c4
|
updated locales
|
2011-01-31 14:33:10 +01:00 |
|
Dan Goldenberg
|
63e2ef4a31
|
Fixed yogurt spelling
|
2011-01-31 00:49:41 -08:00 |
|
Sarah Mei
|
c40a266910
|
Deploy with capistrano.
|
2011-01-30 22:00:32 -08:00 |
|
Sarah Mei
|
c0bb1e8c7c
|
Adding config/deploy_config.yml to gitignore
|
2011-01-30 21:53:50 -08:00 |
|
Sarah Mei
|
25dc3bab8f
|
removing config/deploy_config.yml from git
|
2011-01-30 21:52:38 -08:00 |
|
zhitomirskiyi
|
cfef9a747e
|
all green
|
2011-01-30 20:10:34 -08:00 |
|
Dan Hansen
|
a5365559d7
|
specs for view.flashes.render
|
2011-01-30 16:01:28 -06:00 |
|
zhitomirskiyi
|
a4988a28b4
|
WIP
|
2011-01-30 10:00:03 -08:00 |
|
Dan Hansen
|
0c94660806
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-30 11:43:31 -06:00 |
|
Dan Hansen
|
313f87ebb9
|
make the ajax loader appear in a box
|
2011-01-30 11:43:17 -06:00 |
|
MrZYX
|
3b3807e8df
|
updated locales
|
2011-01-30 10:10:53 +01:00 |
|
MrZYX
|
f487df2961
|
added javascripts:timeago to the master file
|
2011-01-30 09:27:12 +01:00 |
|
MrZYX
|
9e457f30ae
|
moved javascript translations to their own files
|
2011-01-30 09:24:57 +01:00 |
|
zhitomirskiyi
|
17dde3a7b9
|
farther along towards getting the specs to pass
|
2011-01-29 23:58:48 -08:00 |
|
zhitomirskiyi
|
17a2c9e311
|
moving over some code migration successful
|
2011-01-29 23:34:11 -08:00 |
|
zhitomirskiyi
|
3119fc660f
|
another space
|
2011-01-29 20:56:21 -08:00 |
|
maxwell
|
6dffdd8152
|
don't remove these methods
|
2011-01-29 18:58:34 -08:00 |
|
zhitomirskiyi
|
2b4d27d2cf
|
another typo
|
2011-01-29 18:53:13 -08:00 |
|
zhitomirskiyi
|
5d3e08227e
|
whitespace
|
2011-01-29 18:46:05 -08:00 |
|
maxwell
|
348ae0b61d
|
small hack to add some feedback when links are tapped on the mobile site.
|
2011-01-29 18:42:50 -08:00 |
|
zhitomirskiyi
|
05cab33dad
|
notification migration need to try it out
|
2011-01-29 18:36:04 -08:00 |
|
Dan Hansen
|
55bee713e9
|
add more specs
|
2011-01-29 16:45:03 -06:00 |
|
Dan Hansen
|
7417dc5923
|
remove debugging statement, fix youtube phrasing
|
2011-01-29 16:41:28 -06:00 |
|
Dan Hansen
|
099e0a6e24
|
i18n is the first widget to be loaded, add video locales, embedder uses i18n, only render mustache template with i18n if the views are passed
|
2011-01-29 16:40:10 -06:00 |
|
Dan Hansen
|
a6530f4db1
|
fix yaml structure
|
2011-01-29 16:09:19 -06:00 |
|
Dan Hansen
|
4b1b7591a6
|
load diaspora.js and widgets right after vendor/*, return empty string if the value is not found
|
2011-01-29 16:07:12 -06:00 |
|
Dan Hansen
|
be2413b9a8
|
load timeago widget
|
2011-01-29 16:02:04 -06:00 |
|
Dan Hansen
|
5040a37a31
|
whoops, missed a semicolon
|
2011-01-29 15:59:39 -06:00 |
|
maxwell
|
5267365b4f
|
move js strings to application helper
|
2011-01-29 13:54:28 -08:00 |
|
Dan Hansen
|
4484bf33fa
|
fix javascript i18n specs
|
2011-01-29 13:31:45 -08:00 |
|
Dan Hansen
|
9046273ebd
|
some specs for the i18n widget
|
2011-01-29 13:31:45 -08:00 |
|
Dan Hansen
|
b89a59ca55
|
update timeago usages
|
2011-01-29 13:30:32 -08:00 |
|
Dan Hansen
|
0831ad6e40
|
move i18n.loadLocale to the application template, remove localize controller & helper, renamed localize to get_javascript_strings_for and added it to the application helper
|
2011-01-29 13:29:54 -08:00 |
|
Dan Hansen
|
ee218ecd44
|
get rid of the hacky callbacks
|
2011-01-29 13:28:43 -08:00 |
|
Dan Hansen
|
3078156dbb
|
javascript i18n wip
|
2011-01-29 13:28:43 -08:00 |
|
Dan Hansen
|
7089782ba1
|
things having to do with publisher belong in publisher.js not stream.js
|
2011-01-29 14:42:59 -06:00 |
|
Dan Hansen
|
d03119f7e9
|
Embedder is now a widget, show videos before comments
|
2011-01-29 13:22:34 -06:00 |
|
MrZYX
|
8150cd4317
|
remove mongodb from app_config.yml.example
|
2011-01-29 15:38:26 +01:00 |
|
MrZYX
|
f371ac9c74
|
updated locales
|
2011-01-29 15:07:10 +01:00 |
|
zhitomirskiyi
|
8c77f65cdb
|
notes for later
|
2011-01-29 02:01:40 -08:00 |
|
zhitomirskiyi
|
d7f06b9e6e
|
removed commented out non working migration code for now
|
2011-01-28 22:39:29 -08:00 |
|