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

708 commits

Author SHA1 Message Date
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07:00
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