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

830 commits

Author SHA1 Message Date
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
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
danielgrippi
f2259e5e25 put link in via link translation, add via link to mobile site 2011-05-19 16:06:29 -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
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
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07: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
MrZYX
2edec3c6ae updated locales 2011-05-18 02:58:58 +02:00
MrZYX
c47c9ef069 fix untranslated string; fix two translations; don't mess routes.rb again 2011-05-18 00:53:48 +02: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
Raphael Sofaer
a4f81c6410 Finish fixing password changing and keeping emails downcased 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
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
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
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
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
MrZYX
12557e7e84 updated locales 2011-04-30 13:51:02 +02:00
Maxwell Salzberg
62696c3e42 logout is also not a word 2011-04-28 12:25:50 -07:00
Maxwell Salzberg
2ac277adaf www.loginisnotaverb.com thx @starkness 2011-04-28 12:21:15 -07:00
MrZYX
4e88225d10 updated locales 2011-04-28 19:55:10 +02:00
Dan Hansen
d28a2cdb1e Show the user that the websocket connection has been closed and posts will no longer socket in 2011-04-27 16:50:23 -05:00
MrZYX
a11e16b9fb updated locales 2011-04-25 16:02:20 +02:00
MrZYX
7b6e6b4a02 updated locales 2011-04-25 01:48:04 +02:00
MrZYX
512874a338 moved zh to zh-CN 2011-04-23 13:39:02 +02:00
MrZYX
ca2a48eb58 updated locales 2011-04-23 13:29:54 +02: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
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
Jordi Mallach
2f6ed0b303 Updated Catalan translation to 9850a3f. 2011-04-21 13:48:56 +02:00
MrZYX
fc526ff315 updated locales 2011-04-21 01:47:27 +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
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