Commit graph

368 commits

Author SHA1 Message Date
Adrián Chaves Fernández (Gallaecio)
39f39b12fd Minor changes to Galician translation for ‘diaspora’ file, and review of the ‘JavaScript’. 2012-02-14 22:47:29 +01:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
danielgrippi
b27961b38a change language around explore/participate. 2012-02-13 19:13:43 -08:00
danielgrippi
ab76b0cd8e Bring the likes back. Ditch the pins.
Revert "swap pin for heart [ci skip]"

This reverts commit 488e064e11.

Conflicts:

	app/views/templates/likes_info.jst

Revert "reference pin icon in mobile view [ci skip]"

This reverts commit 9377dd30f4.

Revert "first pass at strickly user level rename from like => pin. still need to update assets"

This reverts commit d06ccb9ba9.

Conflicts:

	config/locales/diaspora/en.yml

add heart icon back
2012-02-13 19:13:43 -08:00
danielgrippi
f1c119452a made nsfw shield nicer and more condensed [ci skip] 2012-02-13 14:12:14 -08:00
Jonne Haß
ab29a58f93 updated 97 locale files [ci skip] 2012-02-13 13:04:23 +01:00
danielgrippi
398ca3d97b Participate / Explore have been upgraded to top-level status. 2012-02-09 14:29:01 -08:00
Maxwell Salzberg
d06ccb9ba9 first pass at strickly user level rename from like => pin. still need to update assets 2012-02-01 12:57:07 -08:00
Jonne Haß
52d4db36a8 updated 38 locale files [ci skip] 2012-01-31 18:43:09 +01:00
Jonne Haß
4797e8f2f8 updated 35 locale files [ci skip] 2012-01-24 13:29:17 +01:00
Jonne Haß
abd8fb104c updated 6 locale files [ci skip] 2012-01-20 13:43:43 +01:00
Jonne Haß
203607945b updated 12 locale files [ci skip] 2012-01-15 23:04:57 +01:00
Jonne Haß
9e482ff1b1 updated 99 locale files [ci skip] 2012-01-14 20:07:11 +01:00
Jonne Haß
ca87a3f9ea add two to the javascript pluralizations 2012-01-14 16:43:35 +01:00
Jonne Haß
e96dd58cff Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-13 19:32:51 +01:00
Jonne Haß
e5663126d9 updated 80 locale files [ci skip] 2012-01-13 19:32:42 +01:00
Jordi Mallach
e898e2d03f Updated Catalan translation to c11fdb0. 2012-01-09 19:20:38 +01:00
danielgrippi
c11fdb0459 put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip] 2012-01-08 23:43:17 -08:00
danielgrippi
3f7144f214 added hide post feature back to stream 2012-01-07 14:23:28 -08:00
danielgrippi
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -08:00
danielgrippi
5bbe8bfccd remove Mustache.js, use _.template as a replacement (we only want to use one js templating library) 2012-01-07 14:23:27 -08:00
Jonne Haß
a1c30ac096 updated 35 locale files [ci skip] 2012-01-07 00:00:30 +01:00
Jonne Haß
296730de04 updated 12 locale files [ci skip] 2012-01-04 13:17:36 +01:00
Jonne Haß
934175c49c updated 15 locale files [ci skip] 2012-01-01 12:55:03 +01:00
Jonne Haß
109c5b7a17 this should fix #2552 2011-12-26 23:21:04 +01:00
Jonne Haß
f4b234088d updated 4 locale files [ci skip] 2011-12-24 14:10:23 +01:00
Jonne Haß
a8357388c9 updated 47 locale files [ci skip] 2011-12-24 00:59:36 +01:00
Jonne Hass
a23a79f5b5 updated 148 locale files [ci skip] 2011-12-21 13:13:42 +01:00
Jonne Hass
54781aa71c updated 148 locale files [ci skip] 2011-12-18 14:53:08 +01:00
Jonne Hass
af66bfe840 updated 18 locale files [ci skip] 2011-12-15 14:01:32 +01:00
Jonne Hass
4e8d991487 updated 56 locale files [ci skip] 2011-12-11 05:11:12 +01:00
Jonne Hass
38cdfa4ab7 updated 55 locale files [ci skip] 2011-12-06 13:13:28 +01:00
Jonne Hass
8d6f1552e3 updated 11 locale files [ci skip] 2011-11-26 21:15:00 +01:00
Jonne Hass
61d809659c updated 11 locale files [ci skip] 2011-11-22 20:30:58 +01:00
Jonne Hass
bb356f07cb updated 62 locale files [ci skip] 2011-11-19 12:26:07 +01:00
Jonne Hass
0e10d28bb0 updated 64 locale files [ci skip] 2011-11-17 14:53:37 +01:00
Jonne Hass
1cf1c5ce3b updated 9 locale files [ci skip] 2011-11-12 22:13:59 +01:00
Jonne Hass
27996e9bb2 updated 54 locale files [ci skip] 2011-11-11 21:39:20 +01:00
Jonne Hass
907887b839 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-10 14:25:15 +01:00
Jonne Hass
67b8881198 updated 15 locale files [ci skip] 2011-11-10 14:24:49 +01:00
Jordi Mallach
bfbb8e5f8f Update Catalan translation to eb6fc5f. 2011-11-10 03:15:56 +01:00
Jonne Hass
253f948841 updated 135 locale files [ci skip] 2011-11-09 18:34:07 +01:00
Jonne Hass
a7bed99411 updated 18 locale files [ci skip] 2011-11-08 17:27:17 +01:00
Jonne Hass
56ab1991c2 updated 55 locale files [ci skip] 2011-11-07 12:35:43 +01:00
Jonne Hass
2b5963437f updated 54 locale files [ci skip] 2011-11-05 23:44:12 +01:00
Jonne Hass
b4e974161b updated 135 locale files [ci skip] 2011-11-03 23:10:07 +01:00
danielgrippi
b56dc9205b added ignore text on user pages if it applies 2011-11-03 12:31:25 -07:00
Raphael Sofaer
609894fb70 Fix personalized, closing #2308. Thanks Pistos. 2011-11-03 15:20:58 -04:00
Jonne Hass
d0d31a6f78 updated 98 locale files [ci skip] 2011-11-02 23:07:52 +01:00
Jonne Hass
419e4cd41a added vi and de_formal; updated locales 2011-10-31 20:18:18 +01:00
Jonne Hass
b0d6139bed updated 84 locale files [ci skip] 2011-10-28 12:46:57 +02:00
danielgrippi
a46a1d91db Revert "refactor aspects dropdown, (wip, still need to backfill specs)"
This reverts commit 3d8f971ca9.
2011-10-27 23:53:55 -07:00
danielgrippi
f7afcd96b4 that good, huh? 2011-10-27 20:16:42 -07:00
Dan Hansen
3d8f971ca9 refactor aspects dropdown, (wip, still need to backfill specs) 2011-10-27 22:09:04 -05:00
danielgrippi
0def71d74f add some feedback text & animation; added spec for collapsing tags 2011-10-27 19:57:00 -07:00
danielgrippi
96f74cf930 added feedback to all getting_started states. postive feedback, ftw. 2011-10-26 17:34:15 -07:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Jonne Hass
e643e8491f updated 55 locale files [ci skip] 2011-10-23 15:34:56 +02:00
Jonne Hass
2141496014 updated 57 locale files [ci skip] 2011-10-18 20:40:44 +02:00
Jonne Hass
4e17df17fc Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-15 15:06:11 +02:00
Jonne Hass
eb20f7e2f8 updated 84 locale files [ci skip] 2011-10-15 15:06:06 +02:00
Jordi Mallach
01aecabfae Update Catalan translation to 01d7b95. 2011-10-15 13:44:50 +02:00
Pistos
1c543e3bea Fixed the issue without breaking the aspects dropdown on the [other] user profile page. 2011-10-12 09:51:30 -04:00
Pistos
e013e4103f Corrected English for button text when no aspects are selected in publisher. 2011-10-11 23:44:41 -04:00
Jonne Hass
6ff2bdd300 updated locales and added sq, uk and en_1337 2011-10-11 13:03:11 +02:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
Jonne Hass
a6977c55a2 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-09-29 14:35:12 +02:00
Jonne Hass
710f241b42 updated 21 locale files [ci skip] 2011-09-29 14:34:17 +02:00
Jordi Mallach
b712586ca3 Updated Catalan translation to d2d205e. 2011-09-28 21:11:10 +02:00
Gonzalo Rodriguez
372a472fbf Empty aspect stream when no aspect selected on the left nav 2011-09-27 23:46:02 -03:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
Jonne Hass
6ffcec0885 updated 53 locale files [ci skip] 2011-09-24 21:08:18 +02:00
Jonne Hass
70c2fda2ca Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-09-20 18:42:56 +02:00
Jonne Hass
473642234d updated locales and pulled in NN 2011-09-19 15:36:12 +02:00
Jordi Mallach
98aa2a0196 Update Catalan translation to 91e6499. 2011-09-17 21:50:37 +02:00
Jonne Hass
d498110b3d updated 117 locale files [ci skip] 2011-09-17 17:32:01 +02:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Jonne Hass
10df8ef2c8 updated 6 locale files [ci skip] 2011-09-14 00:43:19 +02:00
Jonne Hass
37787605aa updated 44 locale files [ci skip] 2011-09-12 00:00:58 +02:00
Jonne Hass
79a8ab709f updated 77 locales [ci skip] 2011-09-11 03:20:59 +02:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Jonne Hass
2addd32274 shit we violoated the LDML
close #1920

* added two to pluralizations, see
  http://www.unicode.org/reports/tr35/tr35-21.html#Language_Plural_Rules
* updated pluralization rules to CLDR 2.0.1
2011-09-08 02:00:46 +02:00
Jonne Hass
daca5b0bc4 updated locales 2011-09-07 16:39:16 +02:00
Jonne Hass
7beb2bb7e5 updated locales 2011-09-06 17:54:14 +02:00
Jonne Hass
c682eb8a7a updated locales 2011-09-05 02:30:30 +02:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
MrZYX
6ef8edc9c1 updated locales 2011-08-31 20:34:45 +02:00
MrZYX
1da481d362 updated locales 2011-08-17 21:26:59 +02:00
MrZYX
1e53261606 updated locales 2011-08-16 19:43:57 +02:00
MrZYX
78aa6d0943 updated locales 2011-08-15 14:01:36 +02:00
Anish A
2cea39672e malayalam localization stage 2. javascript completed 2011-08-15 14:03:17 +05:30
MrZYX
6e0630c43f updated locales 2011-08-11 22:21:32 +02:00
MrZYX
f370769fe7 updated locales 2011-08-09 03:19:28 +02:00
Andrej Kacian
077d8fd2fe Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher. 2011-08-06 23:37:21 +02:00
MrZYX
2a0ca46949 updated locales 2011-08-06 16:56:39 +02:00
MrZYX
31ea1227a4 updated locales 2011-08-02 00:46:40 +02:00
MrZYX
1a350c16fd updated locales 2011-07-30 21:53:12 +02:00
MrZYX
33cecf111d updated locales 2011-07-29 01:42:59 +02:00
MrZYX
00b0519ed3 updated locales 2011-07-27 21:52:44 +02:00
MrZYX
ea5db03bdf Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-26 18:41:47 +02:00
MrZYX
b95fd33eac updated locales 2011-07-26 18:41:26 +02:00
Jordi Mallach
1471500166 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-25 17:00:32 +02:00
Jordi Mallach
dcda19bc17 Update Catalan translation to e88c1510. 2011-07-25 16:53:54 +02:00
Jordi Mallach
1707612628 Add missing space. 2011-07-25 16:40:12 +02:00
MrZYX
072e48462b updated locales 2011-07-25 13:25:16 +02:00
Raphael Sofaer
00885be738 Provide feedback when a user tries to double-reshare 2011-07-22 17:43:05 -07:00
Jonne Hass
8cfd2e02e1 Merge pull request #1583 from Gallaecio/master
Update of Galician (gl) translation
2011-07-15 15:28:42 -07:00
Adrián Chaves Fernández (Gallaecio)
bd8bedc22a Had forgotten to use the right string delimiters (not needed, but hey, I want to do things right\!). 2011-07-15 12:05:07 +02:00
Adrián Chaves Fernández (Gallaecio)
282f68e624 Review of Galician (gl) translation of Diaspora finished. 2011-07-15 11:59:47 +02:00
MrZYX
d88e86681d updated locales 2011-07-14 20:29:55 +02:00
MrZYX
b7e86673e8 updated locales 2011-07-06 15:41:29 +02:00
MrZYX
b8ff203af8 updated locales 2011-07-04 01:19:17 +02:00
MrZYX
c6f045dfb7 updated locales 2011-06-23 14:06:54 +02:00
MrZYX
d34d623b62 updated locales 2011-06-18 23:18:04 +02:00
MrZYX
69efeb0179 updated locales 2011-06-08 19:13:20 +02:00
MrZYX
be8e61ec1d updated locales 2011-06-06 23:06:32 +02:00
MrZYX
bfe38891eb updated locales 2011-06-03 23:04:52 +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
Jordi Mallach
6a39dec635 Updated Catalan javascript to 331aa1f. 2011-06-01 11:50:13 +02:00
MrZYX
ed33c0b47a updated locales 2011-05-31 22:16:16 +02:00
MrZYX
61fd8b55af updated locales 2011-05-29 23:28:55 +02:00
MrZYX
0bfb6f01c6 updated locales 2011-05-27 15:34:50 +02:00
Jordi Mallach
75e7b0e45d Update Catalan translation to fc7b2cf. 2011-05-24 16:17:00 +02:00
MrZYX
5dca73e535 updated locales 2011-05-24 00:07:24 +02:00
MrZYX
4e94fe46d2 updated locales 2011-05-22 23:49:22 +02:00
MrZYX
e6f3adb69f updated locales 2011-05-22 01:06:23 +02:00
MrZYX
a605ed80dd updated locales 2011-05-20 21:40:56 +02:00
MrZYX
331aa1ff60 you know the facepalm smiley? Here it is: m( 2011-05-19 20:10:35 +02:00
MrZYX
e592e1b06e updated locales 2011-05-18 23:33:21 +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
MrZYX
2edec3c6ae updated locales 2011-05-18 02:58:58 +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
MrZYX
20231891d2 updated locales 2011-05-15 22:57:08 +02:00
MrZYX
7e6cae9f96 updated locales 2011-05-15 01:32:06 +02: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
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
7893129435 prevent user from hitting aspectmemberships controller before response on dropdowns 2011-05-11 17:07:58 -07:00
MrZYX
4a24e90671 updated locales 2011-05-11 17:04:47 +02:00
MrZYX
35d929c217 updated locales 2011-05-09 13:40:28 +02:00
MrZYX
92089f97e9 updated locales 2011-05-08 01:00:09 +02:00
MrZYX
989d178987 updated locales 2011-05-07 00:39:24 +02:00
Anish A
63e334c2f0 Translations of jerrinphilip 2011-05-05 10:19:17 +05:30
MrZYX
c59ef78a99 updated locales 2011-05-04 15:44:29 +02:00
MrZYX
1b9f5f8709 updated locales 2011-05-03 23:13:13 +02: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
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
1813b248c6 updated locales 2011-04-20 01:04:33 +02:00
MrZYX
e12c7a0eb0 updated locales 2011-04-17 22:22:56 +02:00
MrZYX
7362c8f79f updated locales 2011-04-12 16:24:59 +02:00
MrZYX
d59a1f1233 updated locales 2011-04-10 00:25:19 +02:00
MrZYX
50b1846710 updated locales 2011-04-05 22:26:03 +02:00
MrZYX
8cccdaf75c updated locales 2011-04-04 20:49:58 +02:00
MrZYX
4a044d6f1e updated locales 2011-04-02 15:15:31 +02:00
MrZYX
45c13d3a7d updated locales 2011-03-30 22:44:49 +02: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
467b85f7ba updated locales 2011-03-25 21:13:00 +01:00
MrZYX
c483246ac7 updated locales 2011-03-22 22:48:08 +01:00
MrZYX
e0b176ee2c updated locales 2011-03-21 21:37:13 +01: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
db04092b8c Correct translation. 2011-03-18 14:39:10 +01:00
MrZYX
24335aa5bf updated locales 2011-03-18 14:01:18 +01:00
MrZYX
c661bce988 updated locales 2011-03-17 15:23:34 +01:00
Jordi Mallach
e8a3537520 Updated Catalan translations to 6a33ae7. 2011-03-17 13:44:13 +01:00
zhitomirskiyi
abbf949fe1 publishing from a person profile page wip
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
MrZYX
5457f48c2a updated locales 2011-03-16 16:11:51 +01:00
MrZYX
879aa9eb4a updated locales 2011-03-15 16:03:45 +01:00
MrZYX
63caff1f40 updated locales 2011-03-12 12:55:37 +01:00
MrZYX
dd97f1b985 updated locales 2011-03-10 15:50:43 +01:00
MrZYX
a5d170ef1c updated locales 2011-03-09 15:53:52 +01:00
MrZYX
fd0bc8a09a updated locales 2011-03-08 15:38:18 +01:00
MrZYX
98999b1703 updated locales 2011-02-28 22:15:15 +01:00
MrZYX
9fdf1e599f updated locales 2011-02-25 15:58:34 +01:00
MrZYX
62badaa0df updated catalan locale 2011-02-24 16:24:05 +01:00
MrZYX
ea6dc0eb9a updated locales 2011-02-24 00:39:00 +01:00
MrZYX
3d034668fd Revert "updated locales"
This reverts commit 85c346b520.
2011-02-22 16:07:31 +01:00
MrZYX
85c346b520 updated locales 2011-02-22 13:59:23 +01:00
MrZYX
65447e63ec Catalan locale update from Jordi Mallach 2011-02-22 13:51:38 +01:00
MrZYX
e4ae0ddf67 updated locales 2011-02-21 15:32:32 +01:00
MrZYX
ece7cddc51 added license to javascripts.en.yml; better langcodes_alias_map.yml; .gitignore users.yaml fixture 2011-02-18 17:22:19 +01:00
MrZYX
666c040c1d updated locales 2011-02-18 17:21:11 +01:00
MrZYX
026ced5276 updated locales 2011-02-17 15:46:53 +01:00
MrZYX
2161c1dd72 updated locales 2011-02-16 15:42:23 +01:00
MrZYX
7fb6c5bcb9 updated locales 2011-02-15 13:43:45 +01:00