nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7839 commits 4 branches 0 tags 121 MiB
Commit graph

1616 commits

Author SHA1 Message Date
Jordi Mallach
586c57f694 Update Catalan devise translation to a46ff39. 2011-06-02 19:20:10 +02:00
MrZYX
668c4ddfc5 d'oh 
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
 2011-06-02 12:32:21 +02:00
Jordi Mallach
e00586e937 Update Catalan translation to f7181a7. 2011-06-02 12:17:08 +02:00
Maxwell Salzberg
9f7a066a44 since we try and init tumblr, we need to set it as empty...annoying 2011-06-01 23:33:16 -07:00
Maxwell Salzberg
f7181a7123 add tumblr translation 2011-06-01 22:43:23 -07:00
Maxwell Salzberg
5cbbdf2949 initial post to tumblr support 2011-06-01 22:30:22 -07:00
Maxwell Salzberg
1ef9d43262 added pagination for people on tag pages 2011-06-01 18:59:15 -07:00
MrZYX
c8dd8c98ca added es-AR 2011-06-01 23:55:48 +02:00
MrZYX
23cbb2975e Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-01 23:50:26 +02:00
MrZYX
f9486acd5e updated locales 2011-06-01 23:50:15 +02:00
Raphael Sofaer
68399be639 Deploy correct symlink for config file 2011-06-01 10:31:11 -07:00
Jordi Mallach
6a39dec635 Updated Catalan javascript to 331aa1f. 2011-06-01 11:50:13 +02:00
Jordi Mallach
191b5f1a28 Update Catalan translation to 05aa73e. 2011-06-01 11:47:16 +02:00
MrZYX
ed33c0b47a updated locales 2011-05-31 22:16:16 +02:00
MrZYX
7dd20a5e8b this hopefully fixes catalan and maybe even malayalam (#1110) 2011-05-31 22:13:47 +02:00
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
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07:00
MrZYX
2a449aa8c4 uncomment the new s3_region setting so that nobody needs to update his app_config.yml when he's using S3 2011-05-18 16:21:54 +02:00
Jonne Hass
ee1c394aa2 Merge pull request #639 from cyberkov/add-region-selection-for-s3 
Added region config to carrierwave to select other regions than US
 2011-05-18 07:20:16 -07:00
MrZYX
e79a6597e6 eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something 2011-05-18 16:11:20 +02:00
cyberkov
eb615c3e7e Added region config to carrierwave to select other regions than US 2011-05-18 15:57:02 +02:00
MrZYX
66380fd33f fixed some translations 2011-05-18 13:55:50 +02:00
Jonne Hass
4bd266e9f0 Merge pull request #638 from aneesh/malayalam-localization 
Malayalam localization
 2011-05-18 02:18:53 -07:00
Anish A
ddfb1f00f4 Malayalam translation, completed devise and javascript directory 2011-05-18 07:55:13 +05:30
Anish A
3837d3b1f8 Malayalam translation, nearing completion 2011-05-18 07:27:40 +05:30
Ilya Zhitomirskiy
60c0a9839b added a podwide email preference 2011-05-17 18:19:47 -07:00
Raphael Sofaer
0bb349ff08 Merge branch 'evant_log_post_merge' 2011-05-17 18:17:14 -07:00
Raphael Sofaer
f409ace067 Merge remote branch 'evant/354-long-post' into evant_log_post_merge 
Conflicts:
	config/assets.yml
 2011-05-17 18:02:36 -07:00
MrZYX
2edec3c6ae updated locales 2011-05-18 02:58:58 +02:00
MrZYX
f752b5a71b change infinitescroll in mobile too, thanks @dmorley 2011-05-18 01:01:36 +02:00
MrZYX
c47c9ef069 fix untranslated string; fix two translations; don't mess routes.rb again 2011-05-18 00:53:48 +02:00
Raphael Sofaer
2953cc8497 Move infinite scroll out of vendor, because it has been edited 2011-05-17 15:06:21 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
MrZYX
401b198bbf --amend 2011-05-17 16:02:37 +02:00
MrZYX
00c6631f11 replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server 2011-05-17 16:00:47 +02:00
danielgrippi
7042b43799 use appconfig instead of config 2011-05-16 18:54:50 -07:00
danielgrippi
55d39521c4 rescue redis connection attempts in websocket 2011-05-16 18:34:37 -07:00
danielgrippi
8821043ed7 work in process 2011-05-16 18:27:12 -07:00
danielgrippi
8d7b0b2c4c take out animations in inf scroll. 2011-05-16 16:55:24 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
MrZYX
8c1e64a080 updated locales 2011-05-16 21:02:15 +02:00
Jerin Philip
946896da1f Edited config/locales/diaspora/ml.yml via GitHub 2011-05-16 16:27:48 +05:30
Jerin Philip
6cc798de77 Edited config/locales/diaspora/ml.yml via GitHub 2011-05-16 16:27:48 +05:30
Anish A
f56da67b0b Added rest of jerrinphilip's translations 2011-05-16 16:27:48 +05:30
Anish A
d87c1f3ff0 Translations of jerrinphilip 2011-05-16 16:27:48 +05:30
Anish A
d8426fe6d3 Added rest of jerrinphilip's translations 2011-05-16 16:27:48 +05:30
Anish A
577f0338be Translations of jerrinphilip 2011-05-16 16:27:48 +05:30
Jerin Philip
4d31a69a20 Edited config/locales/diaspora/ml.yml via GitHub 2011-05-16 16:27:48 +05:30
Jerin Philip
fc1cddf03e Edited config/locales/diaspora/ml.yml via GitHub 2011-05-16 16:27:26 +05:30
Anish A
9003db10d1 Added rest of jerrinphilip's translations 2011-05-16 16:26:59 +05:30
Anish A
91423c7d09 Translations of jerrinphilip 2011-05-16 16:25:48 +05:30
MrZYX
20231891d2 updated locales 2011-05-15 22:57:08 +02:00
MrZYX
7e6cae9f96 updated locales 2011-05-15 01:32:06 +02:00
Sarah Mei
43ab8cfcfa Tell devise that :mobile is a navigational format. 2011-05-14 15:46:56 -07:00
Sarah Mei
c8e9225dfb For the love of god, normal Rails logs in test & development. 
There's now a setting in app_config.yml, :enable_splunk_logging, which if true outputs godawful machine-readable splunk logs. It's false in test and development, and true elsewhere.
 2011-05-14 13:29:54 -07:00
danielgrippi
666fb76bfc login as its own js file. accounted for the autofil state 2011-05-13 22:27:08 -07:00
Raphael Sofaer
32ceb278bf Restore deploy.rb 2011-05-13 16:35:55 -07:00
Raphael Sofaer
a4f81c6410 Finish fixing password changing and keeping emails downcased 2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441 Downcase emails upon inviting 2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1 update devise_invitable and devise 2011-05-13 16:32:07 -07:00
danielgrippi
402e84708b ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug 2011-05-13 16:05:37 -07:00
MrZYX
b7540ba6ab updated locales 2011-05-14 00:04:43 +02:00
danielgrippi
c200c386fb pulled new aspect into modal window 2011-05-13 11:58:18 -07:00
Evan Tatarka
5f406b18d5 Updated code to work with lastest master. Tests should now pass. 2011-05-12 20:38:05 -04:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
danielgrippi
4280417e41 broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed 2011-05-11 18:33:17 -07:00
Jerin Philip
ae2a0528b7 Edited config/locales/diaspora/ml.yml via GitHub 2011-05-12 05:43:30 +05:30
Jerin Philip
0a84f3d011 Edited config/locales/diaspora/ml.yml via GitHub 2011-05-12 05:43:30 +05:30
Jerin Philip
ca1f148094 Edited config/locales/diaspora/ml.yml via GitHub 2011-05-12 05:43:30 +05:30
Anish A
ae5e37a3c2 Added rest of jerrinphilip's translations 2011-05-12 05:43:30 +05:30
Anish A
bd4aa14a3c Translations of jerrinphilip 2011-05-12 05:42:28 +05:30
danielgrippi
7893129435 prevent user from hitting aspectmemberships controller before response on dropdowns 2011-05-11 17:07:58 -07:00
Raphael Sofaer
cb49d1f4ea fixed the formatting on emails 2011-05-11 17:02:05 -07:00
danielgrippi
9f3044838d Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started 2011-05-11 14:53:43 -07:00
Raphael Sofaer
b8d9610877 added translation to the likes popup, made the notification models a little clearer 2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13 use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4 likes controller now has destroy method. commented out dislikes from views. unlike links not functional. 2011-05-11 11:08:29 -07:00
MrZYX
4a24e90671 updated locales 2011-05-11 17:04:47 +02:00
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07:00
MrZYX
35d929c217 updated locales 2011-05-09 13:40:28 +02:00
Raphael Sofaer
ffd96d989c Update publisher callback to use ContentUpdater 2011-05-08 20:31:13 -07:00
Dan Hansen
fc25c9bedb Flash message handling is now a widget 2011-05-08 10:53:09 -05:00
MrZYX
8261547ed9 added arabic 2011-05-08 01:02:33 +02:00
MrZYX
3ee6fc0403 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-05-08 01:00:16 +02:00
MrZYX
92089f97e9 updated locales 2011-05-08 01:00:09 +02:00
Jordi Mallach
0e23434542 Updated Catalan translation to 2c4954b. 2011-05-07 15:20:35 +02:00
MrZYX
989d178987 updated locales 2011-05-07 00:39:24 +02:00
Arzumy MD
2c4954bac8 spec for application_helper#page_title, with default text 2011-05-06 00:14:18 +08:00
Anish A
cb9901d18b Added rest of jerrinphilip's translations 2011-05-05 10:19:17 +05:30
Anish A
63e334c2f0 Translations of jerrinphilip 2011-05-05 10:19:17 +05:30
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07:00
MrZYX
a71c4b3f69 added japanese 2011-05-04 15:47:02 +02:00
MrZYX
c59ef78a99 updated locales 2011-05-04 15:44:29 +02:00
MrZYX
1b9f5f8709 updated locales 2011-05-03 23:13:13 +02:00
MrZYX
c13b5a0628 pulled in plural definitions from CLDR; adjusted READMEs in locales subdirs 2011-05-03 23:08:32 +02:00
Maxwell Salzberg
c41acbabd6 grammer on notifications#index 2011-05-02 17:48:51 -07:00
Raphael Sofaer
94bc18e467 Make websocket closed message less disruptive 2011-05-02 17:12:18 -07:00
MrZYX
75234a511d in most configuration example I've seen the cert comes before the key ;) 2011-05-02 22:35:37 +02:00
MrZYX
034033f743 updated locales 2011-05-01 23:28:12 +02:00
Adrián Chaves Fernández (Gallaecio)
e7e9ef3ad5 Some translations reviewed. 2011-04-30 23:51:36 +08:00