MrZYX
05aa73e93c
made everything in the sidebar translatable
2011-05-30 18:06:05 +02:00
MrZYX
61fd8b55af
updated locales
2011-05-29 23:28:55 +02:00
MrZYX
dd607fb47d
user can now disable thin and use ./script/server to fire up resque and websocket only
2011-05-29 16:11:29 +02:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00
MrZYX
4e5c6f0c97
updated locales
2011-05-29 04:14:25 +02:00
Raphael Sofaer
503de3efe1
Fix facebox close button and loading gif
2011-05-28 18:18:22 -07:00
MrZYX
307b69c7cf
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-05-27 15:34:58 +02:00
MrZYX
0bfb6f01c6
updated locales
2011-05-27 15:34:50 +02:00
cyberkov
ba0cf65b48
fixed typos as mentioned in bug 994
2011-05-27 14:42:17 +02:00
Jordi Mallach
b086d3a2ca
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-05-27 01:11:55 +02:00
Jordi Mallach
2c6be3c28e
Update Catalan translation to db22be43. Fix some leftovers in the process.
2011-05-27 01:10:51 +02:00
MrZYX
c5630006b6
better compatibillity with old git versions to get the current rev.
2011-05-26 16:27:56 +02:00
Jordi Mallach
89086c2453
Shorter message for one string that was overlapping.
2011-05-26 10:35:09 +02:00
Raphael Sofaer
38289b1a47
Multi-server integration tests are now possible
2011-05-25 15:16:14 -07:00
MrZYX
cf1d83878c
fixed #747
2011-05-25 22:50:13 +02:00
Maxwell Salzberg
52487e87de
added a very basic page for the stream of all public activity stream photos
2011-05-25 12:57:29 -07:00
Sarah Mei
c6d61c68c0
Backfill some tests for app config, refactor base file name so people copy it instead of moving it
2011-05-25 11:07:29 -07:00
MrZYX
e946600ad4
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-05-24 17:33:40 +02:00
MrZYX
ce9e7c5369
updated locales
2011-05-24 17:33:36 +02:00
MrZYX
db22be43a8
really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF
2011-05-24 17:03:48 +02:00
Jordi Mallach
75e7b0e45d
Update Catalan translation to fc7b2cf.
2011-05-24 16:17:00 +02:00
Raphael Sofaer
fc7b2cfe3f
Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation.
2011-05-23 23:09:48 -07:00
MrZYX
5dca73e535
updated locales
2011-05-24 00:07:24 +02:00
danielgrippi
8e3149ca01
better page explaining cubbi.es and why we're promoting it on diaspora
2011-05-23 01:14:33 -07:00
Maxwell Salzberg
bb62a3dc61
move double post in notifications
2011-05-22 14:50:50 -07:00
MrZYX
4e94fe46d2
updated locales
2011-05-22 23:49:22 +02:00
Maxwell Salzberg
2f6d079635
added failure test for deleted likes
2011-05-22 14:45:16 -07:00
MrZYX
a68031179b
prevent inviting yourself, #515
2011-05-22 14:48:07 +02:00
MrZYX
e6f3adb69f
updated locales
2011-05-22 01:06:23 +02:00
danielgrippi
6a108104e8
add spacing
2011-05-21 14:56:11 -07:00
danielgrippi
0391795f80
better right pane sections
2011-05-21 14:52:59 -07:00
Raphael Sofaer
286f1b876d
Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions.
2011-05-20 15:14:23 -07:00
MrZYX
a605ed80dd
updated locales
2011-05-20 21:40:56 +02:00
danielgrippi
16351227f7
use aspect dropdowns everywhere; updated rake to 0.9.0
2011-05-20 11:50:41 -07:00
Arzumy MD
7c1a2f8d1d
add remove_contact to en.yml to fix the build
2011-05-20 11:05:06 +08:00
Raphael Sofaer
93be5497a7
Small controller for generating an auth token, if you are an authable user
2011-05-19 18:29:53 -07:00
danielgrippi
f2259e5e25
put link in via link translation, add via link to mobile site
2011-05-19 16:06:29 -07:00
danielgrippi
d7899d10e3
Fix various links in to cubbi.es objects
2011-05-19 15:17:42 -07:00
Maxwell Salzberg
3c4c62abd5
moved auth token to admins page, and added a link in the dropdown
2011-05-19 14:23:04 -07:00
danielgrippi
177061d1c5
added via links
2011-05-19 13:13:08 -07:00
danielgrippi
c8e31825c5
Bookmark -> ActivitiyStreams::Photo
2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520
Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed.
2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6
added token authenticatable to user model
2011-05-19 11:57:06 -07:00
Jonne Hass
01796fb7be
Merge pull request #641 from aneesh/malayalam-localization
...
Malayalam localization
2011-05-19 11:13:19 -07:00
MrZYX
331aa1ff60
you know the facepalm smiley? Here it is: m(
2011-05-19 20:10:35 +02:00
Anish A
174c5772af
Malayalam translation, final touchups
2011-05-19 23:25:58 +05:30
Anish A
626733b9f9
Malayalam translation, updated translations from me and siddique pk
2011-05-19 23:22:04 +05:30
Anish A
15fc0dd3ae
Malayalam translation, updated translations suggested from diaspora
2011-05-19 23:22:04 +05:30
MrZYX
e592e1b06e
updated locales
2011-05-18 23:33:21 +02:00
Shane Becker
910cc52387
rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011
2011-05-18 11:46:45 -07:00
