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
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
Jonne Hass
0e10d28bb0 updated 64 locale files [ci skip] 2011-11-17 14:53:37 +01:00
Jordi Mallach
5a0b70f644 Update Catalan translation to 09bad3a. 2011-11-16 22:13:01 +01:00
Jonne Hass
09bad3a7f6 Merge pull request #2314 from Pistos/svg-to-png 
Converted all [used] SVG graphics to PNG.
 2011-11-16 10:45:33 -08:00
Jakob Kramer
3f3dbf0c6c deleted tokens:show:login_with_diaspora_is_comming, because it got outdated by now 2011-11-15 14:42:47 +01:00
danielgrippi
6408105917 Revert "auto follow back feature" 
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
 2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85 Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button. 
Get rid of 500 error on the "view this invitation in your browser" link
 2011-11-14 17:02:13 -08:00
Jonne Hass
ae8acdbfe1 typo [ci skip] 2011-11-14 22:10:18 +01:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Jonne Hass
4013335be9 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-12 22:14:13 +01:00
Jonne Hass
1cf1c5ce3b updated 9 locale files [ci skip] 2011-11-12 22:13:59 +01:00
Jordi Mallach
2dbf467490 Update Catalan devise translation to f2123d9. 2011-11-12 03:59:27 +01:00
Jordi Mallach
e4f91ddf93 Fix typo. 2011-11-12 03:59:10 +01:00
Jordi Mallach
0aaa262de1 Remove trailing tab character. 2011-11-12 03:58:29 +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
5730aea142 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-11-10 03:16:30 +01:00
Jordi Mallach
bfbb8e5f8f Update Catalan translation to eb6fc5f. 2011-11-10 03:15:56 +01:00
Daniel Grippi
eb6fc5f130 Merge pull request #2367 from lprelle/newhere_to_locale_translation 
#NewHere to locale translation
 2011-11-09 16:09:12 -08:00
Lennart Prelle
b9c57111f8 deleted german #newhere translation 2011-11-09 20:40:10 +01:00
Lennart Prelle
f2997f5146 change #newhere to translation 2011-11-09 20:38:06 +01:00
Jonne Hass
253f948841 updated 135 locale files [ci skip] 2011-11-09 18:34:07 +01:00
Jonne Hass
59b99fe917 pluralization for show more comments, fix #2350 2011-11-09 11:07:35 +01:00
Maxwell Salzberg
d9cbd32d88 not all tags are happy tags 2011-11-08 18:03:28 -08:00
Maxwell Salzberg
8cab4cb2e2 open up tag show publisher, have a cuter message on the page 2011-11-08 12:34:06 -08:00
Maxwell Salzberg
5c2b59da22 add a link to the tag show page from the search page 2011-11-08 11:47:17 -08: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
50baa4ba92 also link to the translated tag 2011-11-06 18:06:26 +01:00
Jonne Hass
a1eee6e90f made help tags translatable so that local communities can take care of the new users, also fixed #2327 2011-11-06 16:43:13 +01:00
Jonne Hass
2b5963437f updated 54 locale files [ci skip] 2011-11-05 23:44:12 +01:00
Jonne Hass
9ee3b2d080 improved closing account experience and fixed the cuke 2011-11-05 11:30:21 +01:00
Ilya Zhitomirskiy
f3183a11e1 message explaining that we're populating things in the background 2011-11-04 16:20:51 -07:00
Pistos
db94689dfa Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:56:56 -04:00
Pistos
a6d27e2bb5 Revert "Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice." 
This reverts commit 5c8ddc3ea6.
 2011-11-03 23:54:23 -04:00
Pistos
5c8ddc3ea6 Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:44:46 -04: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
danielgrippi
07f713f46c change 'mute' to 'ignore' for now; fix specs; repopulate cache upon 
contact removal
 2011-11-03 12:31:24 -07:00
danielgrippi
ee5bc25faf DH DG; don't display blocked people in stream; switch controls in stream; disallow blocking yourself 2011-11-03 12:31:24 -07:00
danielgrippi
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -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
Dan Hansen & Maxwell Salzberg
697ad1e84f add new here to right section 2011-11-01 17:19:05 -05:00
Dan Hansen
066f8d1235 Mention the person who invited a user on first message 2011-10-31 22:16:58 -05:00
Lennart Prelle
f2123d942d make language for email-invitation available 2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
82fabbadd1 Revert "remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)" 
This reverts commit 95aac2f352.
 2011-10-31 12:38:00 -07:00
Jonne Hass
419e4cd41a added vi and de_formal; updated locales 2011-10-31 20:18:18 +01:00
danielgrippi
95aac2f352 remove sort order option from the stream (commented at is too crazy and way to slow on large data sets) 2011-10-30 21:46:23 -07:00
Sarah Mei
7564089db8 Update tag following flash messages 2011-10-29 08:20:02 -07:00
Jonne Hass
4b2b2b53b6 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-28 12:47:01 +02: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
e8169ee581 follow tag from sidebar 2011-10-27 18:42:20 -07:00
danielgrippi
0b18e47b82 connect_to_comment text for federated users 2011-10-27 17:24:25 -07:00
danielgrippi
07a4fb8e96 download photo unavailable prompt 2011-10-27 17:22:33 -07:00
Maxwell Salzberg
94ebc8b37a update title 2011-10-26 17:40:24 -07:00
danielgrippi
96f74cf930 added feedback to all getting_started states. postive feedback, ftw. 2011-10-26 17:34:15 -07:00
Maxwell Salzberg
9789e25c99 fix oembed spec; prevent people from commenting on posts that wont federate 2011-10-26 17:32:27 -07:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Jordi Mallach
7a228b166e It's 2011: replace <3 with ♥. Go UTF-8‽ ☺ 
The ♥ symbol was introduced in Unicode 1.1 and should be available on
fonts of all modern, UTF-8-aware operating systems.
 2011-10-26 15:07:55 +02:00
danielgrippi
dc742845c9 fix spelling on getting started [ci skip] 2011-10-25 17:50:09 -07:00
Gonzalo Rodriguez
a642a129ac Tweak newhere locale. Not necessarily people like topics they follow. 2011-10-25 01:55:36 -02:00
danielgrippi
5d54fc6c28 removed community spotlight stream link from right side 2011-10-24 20:14:28 -07:00
Maxwell Salzberg
d5e3033308 make a setting to check out the new getting started 2011-10-24 17:10:36 -07:00
danielgrippi
90d9852e08 updated welcoming text re: peter's suggestions 2011-10-24 16:06:56 -07:00
Ilya Zhitomirskiy
62e12f248c fixed missing translation on the signup and invitation accept pages 2011-10-24 15:07:29 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
050964b7ec photo upload position, active input, spinny on complete 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
49b46f09cd Saving of first name 2011-10-24 14:11:34 -07:00
danielgrippi
42d4d4f400 down to two steps; wip. 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
Jordi Mallach
f12d9b56a7 Avoid using “has just” constructs, as discussed in ddd152505e. 
Fix grammar for plurals for mentions and reshares, too.
 2011-10-23 20:35:28 +02:00
Jordi Mallach
84bd00577d Update Catalan translation of devise to fe78a69. 2011-10-23 20:18:01 +02:00
Jordi Mallach
89f5f6e727 Update Catalan translation to ddd1525. 2011-10-23 20:10:26 +02:00
Jordi Mallach
bfae64d805 Fix grammar for the singular case. 2011-10-23 20:08:11 +02:00
Jonne Hass
e643e8491f updated 55 locale files [ci skip] 2011-10-23 15:34:56 +02:00
Gonzalo Rodriguez
ddd152505e Fix like notification message grammar. Fixes #2222. 2011-10-23 05:17:33 -02:00
Justin Thomas
f18846bf92 communtiy is community 2011-10-22 19:17:00 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
Jonne Hass
2141496014 updated 57 locale files [ci skip] 2011-10-18 20:40:44 +02:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07: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
Maxwell Salzberg
01d7b9507b DG MS; ajax in the soup 2011-10-14 11:17:25 -07:00
danielgrippi
9013903b14 featured users -> community spotlight 2011-10-13 23:33:57 -07:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Gonzalo
12ddf00e16 Merge pull request #2165 from Pistos/issue-2136-wrong-aspect-button-text 
Issue 2136 wrong aspect button text
 2011-10-12 18:47:27 -07: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