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

1402 commits

Author SHA1 Message Date
matze
76073d45ed ~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated 
~Translate: changed the mail contents of the invitation mail: no weird html string below the invitecode url.

- M
 2012-04-09 00:25:08 +02:00
movilla
6ded31a940 Add translation /authorizations fix image 2012-04-08 15:33:46 +02:00
Besnik
62c4469a9c using other quotes throughout the file 2012-04-06 23:21:40 +03:00
Besnik
44f48f7ae1 using other quotes throughout the file 2012-04-06 23:21:00 +03:00
Besnik
866524aff2 update-for-sq-locale - adding javascript.sq.yml 2012-04-06 20:13:30 +03:00
Besnik
65c698b448 update-for-sq-locale - adding devise.sq.yml 2012-04-06 20:13:30 +03:00
Jonne Haß
0850d5147f fix syntax errors in sq locale 2012-04-06 00:40:23 +02:00
Besnik
f0ef59256f Updating the translation for sq 2012-04-06 00:50:08 +03:00
Jonne Haß
9c85b0b42b hotfix spanish locale [ci skip] 
If anybody has a cool idea on how to generally sanitize the input for the tag_path (own helper method?) that would be great
Thanks to jankusanagi for pointing me to this
 2012-04-05 15:55:00 +02:00
Jonne Haß
9c337ac03e updated locales [ci skip] 2012-04-05 03:43:48 +02:00
Lennart Prelle
01ed9fc9d9 fallback to diaspora donation if no paypal-id is present 2012-04-04 11:44:06 +02:00
Maxwell Salzberg
79a09dbea6 Merge pull request #3069 from movilla/trad_mobile 
Small translations of mobile "My Activity" and add translation "via mobile" for mobile posts
 2012-03-29 12:14:35 -07:00
movilla
2d1393b0c5 Add translation: via mobile 2012-03-29 17:33:51 +03:00
Jonne Haß
67a2f29e84 updated 12 locale files [ci skip] 2012-03-27 13:07:04 +02:00
Jonne Haß
37d4f97764 updated 22 locale files [ci skip] 2012-03-23 13:26:16 +01:00
movilla
3b2725f133 Comprobación para el castellano para app/views/admins/correlations.haml 2012-03-22 21:57:29 +01:00
movilla
1c14f4bdf3 Update en.yml for translation app/views/admins/correlations.haml 2012-03-22 21:51:21 +01:00
movilla
c8c708930f Añadida comprobación en castellano 2012-03-22 17:02:51 +01:00
movilla
708c61bc2f Upload en.yml for translation /app/views/admins/_admin_bar.haml 2012-03-22 17:01:12 +01:00
movilla
2d32595db6 Añadida traducción en castellano para comprobar 2012-03-21 15:41:53 +01:00
movilla
965c30f406 Update config/locales/diaspora/en.yml 2012-03-21 15:37:54 +01:00
Jonne Haß
dceb3253a0 updated 8 locale files [ci skip] 2012-03-20 14:00:05 +01:00
Jonne Haß
491d484a2e updated 28 locale files [ci skip] 2012-03-18 22:22:07 +01:00
Maxwell Salzberg
aee17798c1 rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form 2012-03-17 17:10:08 -07:00
Jonne Haß
7e7de439f8 fix untranslatable stuff from the invite refactor 2012-03-17 13:52:46 +01:00
Maxwell Salzberg
11505a386c adding a test for decremented invites, as, and check the invite is valid in the controller 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Jonne Haß
0419ca0bb6 made change password explanations translatable [ci skip] 2012-03-15 15:22:20 +01:00
Maxwell Salzberg
2d3df3e374 two cukes failed because the local files were changed? 2012-03-14 18:44:10 -07:00
Jonne Haß
b3868fc6dd updated 9 locale files [ci skip] 2012-03-14 10:29:16 +01:00
Maxwell Salzberg
2a30e60fe0 Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly 2012-03-13 16:41:16 -07:00
Jonne Haß
854735dc52 fix plurals 2012-03-10 17:18:42 +01:00
Jonne Haß
40be5ab805 updated 37 locale files, added es-MX 2012-03-10 17:08:52 +01:00
Steven Fuchs
7048fa6d50 fixing conflicts in merge 2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e run second search ajaxily when no results are found from remote pod. 2012-03-07 23:19:50 -05:00
Maxwell Salzberg
22cda15aa8 presenter now has a title 2012-02-27 18:11:41 -08:00
danielgrippi
5bebd97bca added translations to post viewer 2012-02-27 15:14:19 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
Jonne Haß
38e4394e55 updated 22 locale files [ci skip] 2012-02-27 22:33:19 +01:00
Jonne Haß
0604a36a15 updated 161 locale files [ci skip] 2012-02-26 01:07:13 +01:00
Dennis Collinson
b28508ecbc MS DC show last post and show page works unauthenticated 
phasing out app.user() for app.currentUser
 2012-02-24 19:09:00 -08:00
Jonne Haß
14d7348a0d updates locales and fixed needed empty timeago translations 2012-02-20 14:24:30 +01:00
Jonne Haß
fd085c6653 updated 129 locale files [ci skip] 2012-02-20 01:26:16 +01:00
Jonne Haß
097a8b409d updated 20 locale files [ci skip] 2012-02-18 02:34:50 +01:00
Jonne Haß
4e93d087bd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-02-17 01:33:08 +01:00
Jonne Haß
a4a79db86b updated 108 locale files [ci skip] 2012-02-17 01:33:02 +01:00
Jordi Mallach
4a9d2ff9e9 Update Catalan translation to e16a20e. 2012-02-17 00:27:24 +01:00
Jonne Haß
7a1f491008 updated 19 locale files [ci skip] 2012-02-16 23:10:18 +01:00
Jonne Haß
21b420ca1e updated 100 locale files [ci skip] 2012-02-15 14:13:47 +01:00
Jonne Haß
d9fd978f9d Merge pull request #2892 from Gallaecio/master 
Updated Galician (gl) translation
 2012-02-14 16:04:32 -08:00
Adrián Chaves Fernández (Gallaecio)
4088af9159 Galician translation is now completely up-to-date. 2012-02-14 23:38:48 +01:00
Dennis Collinson
e16a20e18c toggle all nsfw posts 2012-02-14 14:15:24 -08:00
Adrián Chaves Fernández (Gallaecio)
098a9e3484 Merge remote-tracking branch 'upstream/master' 2012-02-14 22:55:19 +01:00
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
Adrián Chaves Fernández (Gallaecio)
0c8b0189d1 Updated Galician translation of the ‘diaspora’ file. 2012-02-14 22:28:09 +01:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08: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
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
Adrián Chaves Fernández (Gallaecio)
db10d8ec58 Some progress on Galician translation review. 2012-02-06 08:33:30 +01:00
Jakob Kramer
d8183d3973 add missing translation in the invitation-lightbox [ci skip] 2012-02-04 14:17:19 +01:00
danielgrippi
310a0679f1 particpate stream, yo! 2012-02-01 16:05:16 -08:00
Maxwell Salzberg
9abbf151a0 changed some keys by accident 2012-02-01 13:39:02 -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ß
f1de7f9be1 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-31 18:43:15 +01:00
Jonne Haß
52d4db36a8 updated 38 locale files [ci skip] 2012-01-31 18:43:09 +01:00
Jordi Mallach
c47108080e Update Catalan translation to 44ff6ae. 2012-01-31 01:32:35 +01:00
Jordi Mallach
67e907eef0 Merge branch 'master' of git://github.com/diaspora/diaspora 2012-01-31 01:13:56 +01:00
Adrián Chaves Fernández (Gallaecio)
b141f35d12 Additional progress on the Galician translation. 2012-01-30 08:37:37 +01:00
Adrián Chaves Fernández (Gallaecio)
52a7f72f23 Some progress on the Galician translation review. 2012-01-29 21:33:09 +01:00
Jakob Kramer
44ff6ae8d8 fixed a link titled 'RSS' linking to an atom feed 2012-01-29 15:20:34 +01:00
Jonne Haß
03f119ede7 fix heavy sentence construction, ugh haven't seen one of these in a while :P [ci skip] 2012-01-29 13:09:03 +01:00
Jordi Mallach
01712dd00a Update Catalan translation to 5bd929b. 2012-01-29 02:26:22 +01:00
Adrián Chaves Fernández (Gallaecio)
4141adea28 Updated devise.gl.yml Galician translation file. 2012-01-26 22:49:40 +01:00
Jonne Haß
4797e8f2f8 updated 35 locale files [ci skip] 2012-01-24 13:29:17 +01:00
Sarah Mei
5bd929b697 Remove references to GetSatisfaction 2012-01-22 20:46:13 -08:00
Jonne Haß
c8e09bf325 localize back to top [ci skip] 2012-01-22 13:54:31 +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ß
c5654a43db do proper pluralization for JS 2012-01-14 20:27:17 +01:00
Jonne Haß
8e47b26f01 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-14 20:07:20 +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
Jordi Mallach
52c88440a2 Update Catalan translation to e1edef9. 2012-01-14 12:49:26 +01:00
Jordi Mallach
685662c3de Merge branch 'master' of git://github.com/diaspora/diaspora 2012-01-14 12:43:46 +01:00
Jonne Haß
e1edef9ff1 lets see how all this markdown in the title looks. Attempt to fix #2395 2012-01-13 22:09:22 +01:00
Jordi Mallach
a6f68fa670 Update Catalan translation to e4f4f06. 2012-01-13 20:51:28 +01:00
Sarah Mei
e4f4f06404 Terminology clean up - remove references to Diaspora Handle, make capitalization of Diaspora ID consistent. 2012-01-13 11:24:27 -08: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
Jordi Mallach
42dc12988a Updated Catalan translation to 1b8f78e. 2012-01-09 18:55:54 +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
danielgrippi
1b8f78e006 remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway 2012-01-07 14:23:24 -08:00
Jonne Haß
a1c30ac096 updated 35 locale files [ci skip] 2012-01-07 00:00:30 +01:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature"" 
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
 2012-01-04 13:49:56 +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ß
c766163422 pull in ka 2011-12-24 14:12:36 +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
danielgrippi
5bbbad7c4f added missing pluralizations 2011-12-22 14:30:15 -08:00
Jonne Hass
a23a79f5b5 updated 148 locale files [ci skip] 2011-12-21 13:13:42 +01:00
Jonne Hass
bbfb47b6a3 added fil, ms, te 2011-12-18 15:37:27 +01:00
Jonne Hass
54781aa71c updated 148 locale files [ci skip] 2011-12-18 14:53:08 +01:00
Jonne Hass
56f0457c03 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-15 14:01:53 +01:00
Jonne Hass
af66bfe840 updated 18 locale files [ci skip] 2011-12-15 14:01:32 +01:00
Jordi Mallach
3bfaf7ef8b Merge branch 'master' of git://github.com/diaspora/diaspora 2011-12-12 13:48:03 +01:00
Jordi Mallach
38f06ae258 Update Catalan translation to 12d0eee. 2011-12-12 13:47:46 +01:00
Jordi Mallach
450d0de753 Update Catalan translation to e38cb41. 2011-12-12 13:27:31 +01:00
Jonne Hass
dbdee43cc6 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-11 05:11:21 +01:00
Jonne Hass
4e8d991487 updated 56 locale files [ci skip] 2011-12-11 05:11:12 +01:00
Jonne Hass
12d0eee7d9 use new translation keys for will_paginate instead of the setting 2011-12-11 02:49:43 +01:00
Maxwell Salzberg
8f8769aab5 basic NSFW filtering for authors who say their post is nsfw 2011-12-08 18:22:27 -08:00
Maxwell Salzberg
c0ac664d64 translated close account 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
90458381f5 basic page for deleting account with temporary text and cute cat picture 2011-12-08 16:32:20 -08:00
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -08:00
Jonne Hass
0c00a90793 added readme to locales directory [ci skip] 2011-12-08 20:10:07 +01:00
Jordi Mallach
cf61b5d334 Fix error in Catalan translation. 2011-12-07 13:08:39 +01:00
Jonne Hass
4a996493bd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-06 13:13:38 +01:00
Jonne Hass
38cdfa4ab7 updated 55 locale files [ci skip] 2011-12-06 13:13:28 +01:00
Jordi Mallach
da6ff549e1 Update Catalan translation to 548c225. 2011-12-05 15:24:15 +01:00
Pistos
548c225102 Can haz idiomatic English? 2011-12-04 21:47:37 -05:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag 
Fix Bug 2274, empty tag
 2011-11-30 09:07:30 -08:00
Jonne Hass
2f3876ec64 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-29 21:02:55 +01:00
Jonne Hass
759015a309 updated 51 locale files [ci skip] 2011-11-29 21:02:43 +01:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
e16e28a7eb better english 2011-11-29 08:36:48 +01:00
Daniel Grippi
8a27568273 Merge pull request #2428 from geckoxx/comment_stream 
comment_stream
 2011-11-28 09:05:45 -08:00
Jordi Mallach
963fe2cf76 Remove extra # in Catalan translation. 2011-11-27 22:30:45 +01:00
Jordi Mallach
c17d9973aa Update Catalan translation to 64a8083. 2011-11-27 05:16:30 +01:00
David Morley
64a8083744 add pp and toc for translation 2011-11-26 13:30:40 -08:00
Jonne Hass
8d6f1552e3 updated 11 locale files [ci skip] 2011-11-26 21:15:00 +01:00
Jonne Hass
a40fbc9617 Merge pull request #2403 from gandaro/outdated-information-cubbies 
deleted tokens:show:login_with_diaspora_is_comming
 2011-11-23 13:07:10 -08:00
Jonne Hass
61d809659c updated 11 locale files [ci skip] 2011-11-22 20:30:58 +01:00
Johannes Hackel
eb65074360 Fix Bug 2274, empty tag 2011-11-22 12:16:00 +01:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Jonne Hass
bb356f07cb updated 62 locale files [ci skip] 2011-11-19 12:26:07 +01:00
Jonne Hass
e60f287fc7 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-17 14:53:52 +01:00