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

1291 commits

Author SHA1 Message Date
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