Raphael
b642cd6840
Merging master into mysql
2010-12-26 16:30:17 -08:00
MrZYX
dbccb6d0de
updated locales
2010-12-26 22:26:55 +01:00
Jonne Hass
647c02d38d
updated danish locale - thanks Halfdan Mouritzen & friends
2010-12-26 22:13:40 +01:00
MrZYX
8b29e99cf8
updated locales
2010-12-25 15:22:43 +01:00
Sarah Mei
1f67cc2485
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
2010-12-24 12:31:09 -08:00
MrZYX
2f135f2579
updated locales
2010-12-24 15:41:54 +01:00
MrZYX
07a074edb6
updated locales
2010-12-23 14:50:20 +01:00
maxwell
c2c6c00db8
a bad fix for a 500 on notification show when the post is deleted
2010-12-21 12:55:07 -08:00
danielvincent
a0e85dfea2
added missing translations to photo#show
2010-12-21 12:49:40 -08:00
MrZYX
e10af7fc8a
made "Notifications" translatable
2010-12-21 19:18:29 +01:00
Sarah Mei
a4764e87e0
Moving database.yml to database.yml.example
2010-12-20 20:12:38 -08:00
maxwell
081e85f224
Revert "Extended sub-uri support." for now....
...
This reverts commit 9cd08bac67
2010-12-20 18:12:12 -08:00
maxwell
152670a72b
notification badge now in header
2010-12-20 18:05:31 -08:00
Raphael
f043c9cc7e
Took MongoMapper out of the bundle, trying to fix querying.
2010-12-20 16:53:56 -08:00
Alec Leamas
9cd08bac67
Extended sub-uri support.
...
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).
Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737 , and partially
http://joindiaspora.com/issues/391 . Ports are yet to be defined and handled
in this context.
Conflicts:
app/views/layouts/application.html.haml
config/routes.rb
2010-12-21 01:13:15 +01:00
Raphael
4c47d8334c
Add PostVisibility model, some more specs working
2010-12-20 13:23:05 -08:00
Raphael
d44e76a6aa
Down to 250 failures in mysql
2010-12-20 00:36:48 -08:00
zhitomirskiyi
e3f7bd319b
25 more passing tests
2010-12-19 21:41:46 -08:00
MrZYX
6357cd3b95
updated locales - added slovenian and hungarian to languages.yml
2010-12-19 15:01:59 +01:00
MrZYX
b52718e913
small translation fix
2010-12-19 14:41:47 +01:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff
post_spec now passes with mysql
2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d
profile_spec is passing with mysql... baby steps.
2010-12-18 18:45:55 -08:00
MrZYX
6afba8fb7b
updated locales
2010-12-18 16:07:49 +01:00
MrZYX
c3a79f7298
some fixes to translations
2010-12-18 15:25:21 +01:00
maxwell
bcca61af6b
infinate scroll
2010-12-18 01:33:33 -08:00
maxwell
84c041ba6a
aspects streams now ajax
2010-12-17 19:41:42 -08:00
danielvincent
f6701f2262
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-17 19:29:17 -08:00
maxwell
b3c63a3cc0
you can now unset the year of your birthday"
2010-12-17 18:05:13 -08:00
maxwell
2e85a9fe66
notifications now can be read
2010-12-17 17:06:49 -08:00
Raphael
2545de6470
Revert "i can haz right timezone?"
...
This reverts commit 6d233e5eed
2010-12-17 16:44:57 -08:00
danielvincent
6afb7a6bd5
Revert "added configuration for cloudfile cdn"
...
This reverts commit 0d5ac3bd36
2010-12-17 14:30:02 -08:00
danielvincent
0d5ac3bd36
added configuration for cloudfile cdn
2010-12-17 12:26:20 -08:00
maxwell
6d233e5eed
i can haz right timezone?
2010-12-17 11:52:52 -08:00
maxwell
3c3e03993a
make the two links on comment notifications clearer
2010-12-17 11:48:08 -08:00
maxwell
92bbe4cd4c
added link to changelog, updated notifications
2010-12-16 18:28:22 -08:00
maxwell
b8a0abd122
updating notification views
2010-12-16 18:07:43 -08:00
danielvincent
28a22d9fc3
increase session timeout from 10 minutes to 1 day
2010-12-16 17:24:25 -08:00
danielvincent
b4b6189321
time out a user session via devise after 10 minutes of inactivity
2010-12-16 15:50:00 -08:00
danielvincent
f821f49db1
added similar contacts to contact pages
2010-12-16 11:49:08 -08:00
maxwell
d5ba34f245
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 18:05:54 -08:00
Raphael
3b727dc887
Add share_with fancybox on search page, fix a couple of queries
2010-12-15 17:45:12 -08:00
maxwell
8ec85d3b12
basic notifications
2010-12-15 17:31:36 -08:00
Raphael
b22398951e
Send requests from the aspect list on the person show page
2010-12-15 14:48:14 -08:00
MrZYX
14f2341ae1
updated locales
2010-12-15 21:26:27 +01:00
Dan Hansen & Sarah Mei
82e2f23f91
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 14:29:33 -05:00
Raphael
bd31ff3ee3
Fix request validations, build.
2010-12-15 10:48:29 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa
added vimeo method, still needs support from lib/youtube_titles.rb. updated locales
2010-12-15 01:20:53 -05:00
maxwell
0119de4afc
adding task to fix users with periods
2010-12-14 18:45:10 -08:00
maxwell
5d336d20e8
spelling fix
2010-12-14 17:36:27 -08:00
danielvincent
b1c0facfe6
initiating a request now just creates a pending contact instead of persisting a request
2010-12-14 17:11:43 -08:00
