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

831 commits

Author SHA1 Message Date
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
MrZYX
2eaf5abf32 updated locales 2011-04-16 00:59:12 +02:00
MrZYX
30c30e0d3e remove unused contact_of_contacts translation 2011-04-13 16:03:48 +02:00
Raphael Sofaer
07ba9b98df Typo 2011-04-12 11:50:11 -07:00
Raphael Sofaer
d5ecce7ca6 Merge branch 'limit_similar_contacts' 
Conflicts:
	app/controllers/people_controller.rb
 2011-04-12 11:48:41 -07:00
MrZYX
7362c8f79f updated locales 2011-04-12 16:24:59 +02:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -07:00
MrZYX
71f7fcf22f updated locales 2011-04-10 22:25:54 +02:00
MrZYX
d59a1f1233 updated locales 2011-04-10 00:25:19 +02:00
maxwell
48cfa49582 change the mention notification wording to be less akward 2011-04-07 17:45:03 -07:00
MrZYX
bea1f26c14 updated locales 2011-04-07 22:43:54 +02:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
MrZYX
1b2abce5e1 updated locales 2011-04-06 22:06:32 +02:00
MrZYX
3df419a081 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-05 22:26:14 +02:00
MrZYX
50b1846710 updated locales 2011-04-05 22:26:03 +02:00
Jordi Mallach
dc55b3137d Update Catalan translation to 87c48b0. 2011-04-05 21:00:23 +02:00
MrZYX
3a1094dee8 fixed #859 2011-04-05 18:12:08 +02:00
MrZYX
8b00ca2861 fixed #678 2011-04-05 17:38:53 +02:00
maxwell
87c48b003a make inviter say find your friends, because thats what it helps you do 2011-04-04 15:48:10 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
MrZYX
a34d7f5a83 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-04 20:50:01 +02:00
MrZYX
8cccdaf75c updated locales 2011-04-04 20:49:58 +02:00
Jordi Mallach
b21fd0e9ca Update Catalan translation to b776bb5. 2011-04-03 23:26:20 +02:00
MrZYX
b776bb52db made string on mobile page translatable 2011-04-03 13:17:09 +02:00
MrZYX
1a1a06118f Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-02 15:15:45 +02:00
MrZYX
4a044d6f1e updated locales 2011-04-02 15:15:31 +02:00
Jordi Mallach
c28131c7e0 Updated Catalan to f2ca2c2. 2011-04-01 23:45:50 +02:00
maxwell
f2ca2c2357 fix up translations, and remote on publisher" 2011-03-31 23:52:29 -07:00
maxwell
569fb66e9e bunch of small mobile ui fixes 2011-03-31 23:38:38 -07:00
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
MrZYX
bd8c9af122 updated locales 2011-03-31 21:31:17 +02:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
MrZYX
183ea42d54 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-30 22:44:53 +02:00
MrZYX
45c13d3a7d updated locales 2011-03-30 22:44:49 +02:00
Jordi Mallach
f09e06c56b Update Catalan translation to a3b2c60. 2011-03-30 18:24:47 +02:00
Jordi Mallach
a3b2c60c3b Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 18:18:45 +02:00
Jordi Mallach
313704cb9a Update Catalan translation to 0aaaefe. 2011-03-30 17:32:36 +02:00
Jordi Mallach
8b4d17a65a Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 17:29:33 +02:00
MrZYX
699264e7a3 made flash messages for conversations translatable 2011-03-30 16:52:43 +02:00
zhitomirskiyi
0aaaefeba2 fix tag plugin 2011-03-29 16:53:48 -07:00
Jordi Mallach
4129bb105a Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 00:04:11 +02:00
MrZYX
4dabfdad2b Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-29 21:53:37 +02:00
MrZYX
2027655316 updated locales 2011-03-29 21:53:29 +02:00
Jordi Mallach
d759f97c9f Update Catalan translation to aa478ddd. 2011-03-29 20:56:11 +02:00
Jordi Mallach
8a222e2991 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-29 20:40:43 +02:00
MrZYX
aa478ddd5c string concatenation with translations is bad, especially if you leave on part of it untranslated :P 2011-03-29 15:39:57 +02:00
maxwell
ccbba9b52e fix translations 2011-03-28 20:09:09 -07:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
Jordi Mallach
9d04f36a38 Update Catalan translation to 40810741. 2011-03-28 20:55:13 +02:00
MrZYX
40810741f3 fixed cucumber 2011-03-27 22:04:36 +02:00
adonix
b71bfdf583 972-issue:all-aspects-spelling 2011-03-27 12:14:09 -07:00
MrZYX
a9e3511c19 updated locales 2011-03-27 18:50:01 +02:00
MrZYX
d50cfe8d5d updated locales 2011-03-27 00:40:34 +01:00
MrZYX
2d366bcf71 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-25 21:13:02 +01:00
MrZYX
467b85f7ba updated locales 2011-03-25 21:13:00 +01:00
Jordi Mallach
cf99c19e2c Update Catalan translation to 7a315312. 2011-03-25 15:25:48 +01:00
MrZYX
82e08ef5d0 updated locales 2011-03-24 18:05:56 +01:00
Raphael Sofaer
555a774668 Initial contacts_of_contact page 2011-03-23 16:42:53 -07:00
zhitomirskiyi
7a31531258 added location to the profile 2011-03-23 15:56:46 -07:00
zhitomirskiyi
24db7a3b87 added tooltips to the service icons 2011-03-23 14:13:54 -07:00
zhitomirskiyi
8a9a95d854 added a flash notice 2011-03-23 11:45:06 -07:00
danielgrippi
b9b9d7e07d renamed home to all aspects in header, made clicking aspect names on right trigger filtering 2011-03-23 10:29:34 -07:00
danielgrippi
fe44ee8230 fix tab order in publisher; removed 'to mention...' text 2011-03-22 17:29:03 -07:00
danielgrippi
a44ca157e6 added text to private message notification; user picture in popup 2011-03-22 17:14:37 -07:00
MrZYX
c483246ac7 updated locales 2011-03-22 22:48:08 +01:00
MrZYX
643a066691 moar translatable 2011-03-22 22:45:36 +01:00
maxwell
a036a8035f add a plaintext layout for emails, and include a link to change your email settings in the emails 2011-03-22 12:26:38 -07:00
MrZYX
deff67f486 fixed a translation 2011-03-22 13:47:44 +01:00
Raphael Sofaer
a45103d0ef Make post not found redirect clearer 2011-03-21 16:40:53 -07:00
zhitomirskiyi
058b74846a removed the bring your friends message from the stream 2011-03-21 15:23:34 -07:00
MrZYX
87dafeb67b Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-21 21:37:28 +01:00
MrZYX
e0b176ee2c updated locales 2011-03-21 21:37:13 +01:00
Jordi Mallach
9ffa7ac03d Updated Catalan translation to a2715ca. 2011-03-21 15:02:56 +01:00
MrZYX
a2715ca963 fixed migration naming, fixed translation 2011-03-20 23:00:56 +01:00
MrZYX
4b7a4686db updated locales 2011-03-20 18:53:29 +01:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
c1bf68068f Pull relationship action button from search results out into a partial. 
Copyedit messages.
 2011-03-19 15:59:56 -07:00
MrZYX
73905e6831 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-19 14:15:37 +01:00
MrZYX
a29b3ba5e8 updated locales 2011-03-19 14:15:32 +01:00
Jordi Mallach
c1bcb421ce Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-19 14:10:29 +01:00
Jordi Mallach
6bfdcb0583 Updated Catalan to a05c9b0. 2011-03-19 14:09:58 +01:00
MrZYX
a05c9b0010 fixed a translation, keep up the new format in en.yml, set pagination labels in application controller 2011-03-19 14:04:11 +01:00
Jordi Mallach
4274e977cb Update Catalan translation to 3db11cf. 2011-03-19 13:43:03 +01:00
Jordi Mallach
dc8e9565e9 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-19 13:35:41 +01:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -07:00
Jordi Mallach
db04092b8c Correct translation. 2011-03-18 14:39:10 +01:00
Jordi Mallach
7d739a5071 Update Catalan translation to 574a3b4. 2011-03-18 14:37:34 +01:00
MrZYX
24335aa5bf updated locales 2011-03-18 14:01:18 +01:00
zhitomirskiyi
574a3b45b1 made it flash the sm on the profile page 2011-03-17 11:54:13 -07:00
Jordi Mallach
57aa8e71bf Updated Catalan translation to a787106. 2011-03-17 15:57:12 +01:00
Jordi Mallach
25691ac8b2 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-17 15:45:27 +01:00
Jordi Mallach
f7391ca7ae Fix some leftovers thanks to MrZYX's diff-yml-keys.py. 2011-03-17 15:42:14 +01:00
MrZYX
c661bce988 updated locales 2011-03-17 15:23:34 +01:00
MrZYX
a78710690a moar translations 2011-03-17 15:11:24 +01:00
Jordi Mallach
4ee9642d02 Correct indentation and re-add requests & message_inbox tags. 2011-03-17 14:44:10 +01:00
Jordi Mallach
a2da1240b8 Adding "1" to notification message. 2011-03-17 14:34:53 +01:00
MrZYX
5a8ba0e805 fixed syntax errors in ca.yml 2011-03-17 14:31:14 +01:00
Jordi Mallach
5c9370f2e0 Two of the keys are verb, not noun. Adapt accordingly. 2011-03-17 14:16:25 +01:00
Jordi Mallach
a03238ec40 Fix typo. 2011-03-17 13:45:02 +01:00
Jordi Mallach
e8a3537520 Updated Catalan translations to 6a33ae7. 2011-03-17 13:44:13 +01:00