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

1202 commits

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