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
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
Pistos
e013e4103f Corrected English for button text when no aspects are selected in publisher. 2011-10-11 23:44:41 -04:00
Pistos
cc1fea92e6 Whitespace cleanup. 2011-10-11 23:44:28 -04:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
danielgrippi
a2b79d0338 touch up header 2011-10-11 08:00:36 -07:00
Jonne Hass
8bc67f983c Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-11 14:07:31 +02:00
Jonne Hass
6ff2bdd300 updated locales and added sq, uk and en_1337 2011-10-11 13:03:11 +02:00
Gonzalo Rodriguez
7994c4d43f 1 new notifications must be 1 new notification 2011-10-08 21:36:58 -02:00
Maxwell Salzberg
2b22e1dab5 make the links on featued users tile be the tag with the name in the link. added a following count to tags 2011-10-07 12:19:28 -07:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Your Name
b8984e7eaf didn't like my language 2011-10-06 15:52:30 -07:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Gonzalo Rodriguez
fa58fbe272 Typo on english locale 2011-10-06 00:42:56 -02:00
Gonzalo Rodriguez
30a13674e8 Edit aspect pencil was messed up with the title on the home page 2011-10-05 22:44:57 -02:00
Maxwell Salzberg
513b2cb5bc make the aspect edit page a little more helpful for empty state. a loonngggg way to go 2011-10-05 15:07:35 -07:00
Jordi Mallach
3a62b10384 Updated Catalan translation to ad9dcd8. 2011-10-04 13:19:46 +02:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
Maxwell Salzberg
b27a8dd330 fix up info sidebar" 2011-09-29 12:51:00 -07:00
Jonne Hass
68f15a8a34 fix ca.yml 2011-09-29 14:37:10 +02: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
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
Jordi Mallach
2e86e9ece7 Fix a variable and add missing ellipsis. 2011-09-28 21:18:52 +02:00
Jordi Mallach
b712586ca3 Updated Catalan translation to d2d205e. 2011-09-28 21:11:10 +02:00
danielgrippi
d2d205ee08 make autoexpand work 2011-09-28 11:21:14 -07:00
danielgrippi
64113eb8f2 increment counter on comment add 2011-09-27 21:09:27 -07:00
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
00e561dd01 comments -> reactions 2011-09-27 21:09:26 -07: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
Ilya Zhitomirskiy
675908a57d added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services 2011-09-26 16:04:25 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Jonne Hass
6ffcec0885 updated 53 locale files [ci skip] 2011-09-24 21:08:18 +02:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
494ab8b13b added community welcome and a non-mandatory wording 2011-09-23 14:56:33 -07:00
Ilya Zhitomirskiy
f8c05851f6 added an email link to the right section 2011-09-21 14:40:59 -07:00
Ilya Zhitomirskiy
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -07:00
Sarah Mei
346e1f1c87 SPELL CHECK PLZ. 2011-09-20 21:56:17 -07:00
Maxwell Salzberg
8187fb9ddb clean up and move help widget up the page 2011-09-20 10:05:39 -07: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
Sarah Mei
3a9d8f0f38 ARRRGGGHH *twitch* *twitch* 2011-09-19 22:00:00 -07:00
Ilya Zhitomirskiy
352be4d0c0 added the have support section and reworded the donation section to be clearer 2011-09-19 15:29:19 -07:00
Jonne Hass
473642234d updated locales and pulled in NN 2011-09-19 15:36:12 +02:00
Jordi Mallach
ff5919f43f Change "Click this link" to "Follow this link". 
As discussed with @rsofaer in 9797e04957,
"follow" is more device-neutral, better for mobile browser users.
 2011-09-18 22:46:31 +02:00
Jordi Mallach
d006ca9850 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-09-18 03:21:57 +02:00
Jonne Hass
661d5d3bbc pull in ur-PK 2011-09-18 00:56:04 +02:00
Jordi Mallach
98aa2a0196 Update Catalan translation to 91e6499. 2011-09-17 21:50:37 +02:00
Jordi Mallach
021f704de7 Add trailing dot. 2011-09-17 21:47:57 +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
Lennart Prelle
40ac7b7620 make string in authorizations translateable 2011-09-11 17:20:54 +02:00
Jonne Hass
79a8ab709f updated 77 locales [ci skip] 2011-09-11 03:20:59 +02:00
Maxwell Salzberg
1fa01a811e DG MS; updated text to reflect the fact that hiding posts now 
mutes notifications as well
 2011-09-09 10:52:19 -07:00
Manuel Schölling
0b28376216 Fixed some texts in "Getting Started" that were not translatable 2011-09-09 01:15:54 +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
b1f283c995 updated locales 2011-09-01 23:18:47 +02:00
MrZYX
6ef8edc9c1 updated locales 2011-08-31 20:34:45 +02:00
Gonzalo Rodriguez
b9dbe0ecdd Closes #1827. Minor text fix on Getting Started page 2011-08-27 21:32:58 -03:00
MrZYX
5b51dde195 updated locales 2011-08-27 23:00:33 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a40543e15c a user now has the option to disable reshare email notifications 2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
MrZYX
ded85fb225 updated locales 2011-08-25 00:10:14 +02:00
MrZYX
f8a030d761 updated locales 2011-08-22 23:16:30 +02:00
MrZYX
87cd09a936 fix string concat 2011-08-22 23:09:51 +02:00
Andrej Kacian
b772b8354d Fixed misplaced translations for no tags on own profile 2011-08-22 01:55:36 +02:00
MrZYX
1b5698c1f5 updated locales 2011-08-21 17:09:16 +02:00
Gonzalo Rodriguez
f1cf81772b Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00
Maxwell Salzberg
fe78a69161 combine invitation emails 2011-08-19 12:15:11 -07:00
MrZYX
f2e25c5fc5 updated locales 2011-08-19 20:39:26 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Gonzalo Rodriguez
2d54d9a97e Validate presence of message text on conversations. Closes #1329. 2011-08-17 23:52:31 -03:00
MrZYX
1da481d362 updated locales 2011-08-17 21:26:59 +02:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07: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
MrZYX
a9312daf69 fixed syntax error in ml.yml 2011-08-15 13:50:05 +02:00
Anish A
e7f1c3d251 malayalam localization stage 3. diaspora completed 2011-08-15 14:03:17 +05:30
Anish A
2cea39672e malayalam localization stage 2. javascript completed 2011-08-15 14:03:17 +05:30
Anish A
a3ac384aa5 malayalam localization restarted. devise.ml.yml completed 2011-08-15 14:03:17 +05:30
MrZYX
7e59193e2c updated locales 2011-08-13 23:54:14 +02:00
Raphael Sofaer
f60ce932b1 Localize string 2011-08-13 09:44:40 -07:00
danielgrippi
a8d37fb3fc Move Facebook inviter view into the contacts layout, rather than a facebox 2011-08-12 17:05:01 -07:00
danielgrippi
7e901d0220 remove shapado 2011-08-12 11:12:30 -07:00
MrZYX
6e0630c43f updated locales 2011-08-11 22:21:32 +02:00
Raphael Sofaer
a2043671ce Move comment email subject line code into models 2011-08-11 10:46:15 -07:00
danielgrippi
db645e8da8 merged publics/show and posts/show 2011-08-10 18:07:38 -07:00
Raphael Sofaer
350a4b4f6d Fix 500 on invitations new on unknown facebook user... bad solution, maybe we should just delete the offending invitations? 2011-08-10 16:42:08 -07:00
Maxwell Salzberg
2d6a69cdc8 fix for 500s in liked emails for reshares and activity streams photos 2011-08-10 10:25:43 -07:00
Maxwell Salzberg
d22e5e7598 make some getting started text slightly cleaner 2011-08-10 09:38:54 -07:00
Sarah Mei
0b02653f44 Merge pull request #1694 from ticho/tag-list-has-unfollow-icon 
Add a "unfollow" icon to each tag in followed tags listing
 2011-08-09 21:44:21 -07:00
Maxwell Salzberg
7b1ff4cd7b more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form 2011-08-09 18:02:50 -07:00
Andrej Kacian
2a970145c8 Added icon to directly unfollow a tag to listing of followed tags. 2011-08-09 22:45:06 +02:00
Raphael Sofaer
46d6bbff5a Remove stray comma. 2011-08-08 19:02:07 -07:00
MrZYX
f370769fe7 updated locales 2011-08-09 03:19:28 +02:00
MrZYX
d3c73502cd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-08-07 22:56:52 +02:00
MrZYX
b412f379e0 updated locales 2011-08-07 22:56:44 +02:00
Manuel Schölling
8b99ae9cb6 Changed translation and fixed misspelled function call 2011-08-07 22:00:23 +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
Jordi Mallach
afd08a7b94 Aspects are... intuitive. 2011-08-06 18:06:33 +02:00
Jordi Mallach
a622a5b1ee Updated Catalan translation to 5eadc7d. 2011-08-06 18:02:44 +02:00
MrZYX
2a0ca46949 updated locales 2011-08-06 16:56:39 +02:00
MrZYX
4a43441194 updated locales 2011-08-06 01:18:38 +02:00
Raphael Sofaer
5eadc7d41c Fix the last broken jasmine spec by restoring the #no_posts div 2011-08-05 15:09:16 -07:00
danielgrippi
75c3107035 made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -07:00
danielgrippi
99ac976594 fix redirects around getting_started and aspect/index 2011-08-03 18:07:43 -07:00
danielgrippi
23c2eaf1c5 added a real profile description on the welcome tab 2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 2011-08-03 18:02:57 -07:00
danielgrippi
120cf9835b added more translations; welcome text switch 2011-08-03 18:02:57 -07:00
danielgrippi
b8b4ad3d84 added helpers for each of the getting started steps; make step sections dull if completed 2011-08-03 18:02:56 -07:00
danielgrippi
303b23883d added featured users, left nav, and search boxes into getting started 2011-08-03 18:02:56 -07:00
danielgrippi
6369eefdbe added translations to getting started 2011-08-03 18:02:56 -07:00
MrZYX
eb16d15c42 updated locales 2011-08-04 00:02:30 +02:00
MrZYX
b3b370db1b updated locales 2011-08-03 00:54:45 +02:00
danielgrippi
25e4f5d0ae dg ms; made no posts text on person show more explicit 2011-08-02 12:53:36 -07:00
danielgrippi
66315eca18 capitalize reshare when there are no reshares 2011-08-02 10:40:36 -07:00
Raphael Sofaer
8b74d2afe1 Revert "fixed the build" 
This reverts commit b9120fca80.
 2011-08-02 10:18:32 -07:00
danielgrippi
b9120fca80 fixed the build 2011-08-02 10:17:06 -07:00
Raphael Sofaer
406ab7a073 Delete a stray file, some cleanup 2011-08-02 09:47:17 -07:00
Raphael Sofaer
d7ac6c4713 Link the no_tags text to a tag page, we should make tags#index something meaningful one day. 2011-08-01 17:59:19 -07:00
MrZYX
31ea1227a4 updated locales 2011-08-02 00:46:40 +02:00
danielgrippi
6daf7f5ad9 add prompt to add more contacts if user has less than 2 contacts on aspect index 2011-08-01 15:31:13 -07:00
Jakob Kramer
5ccebd3893 fix wrong string 'Reshare orignial' 2011-08-01 15:03:02 +02:00
MrZYX
1a350c16fd updated locales 2011-07-30 21:53:12 +02:00
danielgrippi
905a982d35 add two more default aspects for new users 2011-07-29 19:21:18 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8 featured users section 2011-07-29 19:00:15 -07:00
MrZYX
289126b984 updated locales 2011-07-29 23:51:49 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
00571b84cd completed donate option 2011-07-29 11:33:30 -07:00
MrZYX
6c9f8ca782 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-29 01:43:04 +02:00
MrZYX
33cecf111d updated locales 2011-07-29 01:42:59 +02:00
danielgrippi
6e25a6a0f1 touched up reshare view 2011-07-28 13:46:16 -07:00
Jordi Mallach
7a55d6f974 Update Catalan translation to e4a81fb. 2011-07-28 15:14:21 +02:00
Andrej Kacian
e4a81fbc8a Use "Sending..." instead of "Posting..." for new conversation. 2011-07-27 23:09:05 +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
0237c54452 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-26 10:27:45 +02:00
Jordi Mallach
835005ef02 Update Catalan translation to 658e836. 2011-07-26 10:27:29 +02:00
Andrej Kacian
658e836f4c Make the "No tags" string translatable 2011-07-25 23:09:53 +02:00
Jordi Mallach
c5e3f7a231 Update Catalan translation to 384a71b. 2011-07-25 17:03:22 +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
Jordi Mallach
986306f03c Fix overcapitalisation in reshare strings. 2011-07-25 16:27:29 +02:00
Jonne Hass
384a71bdc4 Merge pull request #1614 from ticho/1603-likes-i18n-fix 
Fix for issue #1603 - use different i18n string for comment likes count
 2011-07-25 07:20:24 -07:00
MrZYX
47e2f70e96 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-25 13:25:42 +02:00
MrZYX
072e48462b updated locales 2011-07-25 13:25:16 +02:00
Jordi Mallach
e88c151031 Harmonise spelling of ‘email’ and capitalisation. 
Use ‘email’ everywhere and avoid capitalisation where it’s not needed.
 2011-07-25 12:37:40 +02:00
Jordi Mallach
7503b0775c Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-25 12:26:00 +02:00
Raphael Sofaer
241999f72a MS RS translated reshares 2011-07-22 17:58:52 -07:00
Raphael Sofaer
00885be738 Provide feedback when a user tries to double-reshare 2011-07-22 17:43:05 -07:00
Andrej Kacian
c1e5a83f15 Fix for issue #1603 - use different i18n string for comment likes count 2011-07-22 19:57:18 +02:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
 2011-07-19 10:44:00 -07:00
Jordi Mallach
956e2ead27 Update Catalan translation to 713f4dc. 2011-07-18 12:15:42 +02:00
Jordi Mallach
d8fce7a9db Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-18 12:14:36 +02:00
Andrej Kacian
713f4dcc9d Fix for issue #1600: Missing string for translation ("Recent notifications") 2011-07-17 17:04:51 +02:00
Jordi Mallach
ae298e803a Updated Catalan translation to 12cb51d. 2011-07-17 07:49:14 +02:00
Jordi Mallach
2262bb4dca Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-17 07:38:13 +02:00
danielgrippi
12cb51d194 take ':' out of translation 2011-07-15 21:32:01 -07:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -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
Adrián Chaves Fernández (Gallaecio)
92b06323d3 Added correct string delimiters to the last strings of ‘diaspora/gl.yml’ file. 2011-07-15 11:55:53 +02:00
Adrián Chaves Fernández (Gallaecio)
80b72a9213 Minor (translation) fix for a string, the one related to the “time ago”. 2011-07-15 11:48:08 +02:00
Adrián Chaves Fernández (Gallaecio)
db22c60578 Minor (translation) fix for a string, the one related to the “time ago”. 2011-07-15 11:44:50 +02:00
Adrián Chaves Fernández (Gallaecio)
effd951f58 Finished the review of the Galician (gl) translation of ‘diaspora/(lang).yml’ file. 2011-07-15 11:40:55 +02:00
MrZYX
d88e86681d updated locales 2011-07-14 20:29:55 +02:00
Adrián Chaves Fernández (Gallaecio)
8816e82ad4 Started revision of Galician (gl) translation of ‘diaspora/(lang).yml’ file. Progress: around 50%. 2011-07-14 18:20:07 +02:00
Adrián Chaves Fernández (Gallaecio)
5111279bfd Removed unneeded character (probably problematic) after a string. 2011-07-14 12:59:15 +02:00
Adrián Chaves Fernández (Gallaecio)
cade8c4d04 Fixed usage of the wrong delimiter for strings with variables. 2011-07-14 12:55:59 +02:00
Adrián Chaves Fernández (Gallaecio)
0653f4fa4f Updated Galician (gl) translation of ‘devise.yml’ file. 2011-07-14 12:38:52 +02:00
Jordi Mallach
2ea2e55353 Updated Catalan translation to 03e79da. 2011-07-13 20:18:32 +02:00
Arzumy MD
03e79da171 fixed missing i18n key for no_services 2011-07-13 12:17:47 +08:00
Raphael Sofaer
c622c08d49 Clarify already invited 2011-07-12 15:13:45 -07:00
MrZYX
5934616422 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-12 15:12:00 +02:00
MrZYX
8863bb2091 updated locales 2011-07-12 15:08:44 +02:00
MrZYX
2a15a17983 rails-i18n is now a gem 2011-07-12 15:04:48 +02:00
Jordi Mallach
676035f0c2 Updated Catalan translation to 97ca10d. 2011-07-11 15:51:36 +02:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
manuels
30b2a6fe88 Corrected german translation (from noun to verb for 'mention') 2011-07-09 07:12:04 -07:00
MrZYX
ed23406f57 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-08 01:36:18 +02:00
MrZYX
7a7cfbf33f updated locales 2011-07-08 01:32:57 +02:00
Jordi Mallach
2e67549dc7 Updated Catalan translation to 738487b. 2011-07-07 14:43:52 +02:00
Jordi Mallach
84072305c5 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-07 14:34:41 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
738487b381 moved the are you sure dialog into a translation 2011-07-06 16:34:51 -07:00
Jordi Mallach
355e29c237 Better messages for following. 2011-07-07 00:34:19 +02:00
Jordi Mallach
fcb3d843e5 Fix names and indentation of some keys. Oops. 2011-07-06 23:47:24 +02:00
Jordi Mallach
5cac35ed27 Updated Catalan translation to c3e477f2. 2011-07-06 23:47:24 +02:00
MrZYX
78ba1590e5 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-06 15:44:46 +02:00
MrZYX
b7e86673e8 updated locales 2011-07-06 15:41:29 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
danielgrippi
47aab723bd fix message focus bug 2011-07-05 12:17:23 -07:00
Jordi Mallach
10f40043cc Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-05 10:28:49 +02:00
Jordi Mallach
99abd474c1 Updated Catalan translation to ecd7976. 2011-07-05 10:28:26 +02:00
danielgrippi
ecd79766ce remove aspect badges 2011-07-04 22:36:21 -07:00
Jordi Mallach
9248a34c89 Updated Catalan translation to 85d6eb70. 2011-07-05 02:06:57 +02:00
Jordi Mallach
035b8893c9 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-05 01:56:51 +02:00
danielgrippi
85d6eb70e7 fix cubbies info page (removed reference to token, changed infographic) 2011-07-04 16:14:05 -07:00
Maxwell Salzberg
b645a77be9 translate a string in services#index view 2011-07-04 13:59:44 -07:00
Maxwell Salzberg
2f1118f95f refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect 2011-07-04 13:54:05 -07:00
Jordi Mallach
c4c0846ed3 Updated Catalan translation to 9ec9055. 2011-07-04 19:02:20 +02:00
MrZYX
b8ff203af8 updated locales 2011-07-04 01:19:17 +02:00
danielgrippi
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -07:00
danielgrippi
9ec905560c visual touchups, show loading gif right away 2011-07-02 17:53:07 -07:00
Raphael Sofaer
49d905c719 Some more translation stuff. @MrZYX the content thing in the Diaspora ID explanation is messed up, what's the best way to get bold text into the translation string? 2011-07-01 23:27:53 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
f90dc0996a More visual cleanup; top nav; edit aspects 2011-07-01 16:12:14 -07:00
danielgrippi
cd9be3904b publisher rework 2011-07-01 10:51:45 -07:00
danielgrippi
60077bd70a minor visual changes, more or less. facebox headers are now white. 2011-07-01 10:51:45 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -07:00
MrZYX
84ae3e6b96 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-01 00:11:06 +02:00
MrZYX
705dec4e02 updated locales 2011-07-01 00:11:01 +02:00
Jordi Mallach
dfa0a4eb71 Update Catalan translation to 91f984c. 2011-06-30 14:20:12 +02:00
Raphael Sofaer
91f984c2ad Diaspora handle is really confusing, we should just say ID 2011-06-29 14:59:30 -07:00
MrZYX
6519ffcd33 updated locales 2011-06-29 21:10:58 +02:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
parimbra
47512db147 better description for #tags 2011-06-28 19:47:19 +05:30
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
danielgrippi
a9b7cd1254 nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
MrZYX
c6f045dfb7 updated locales 2011-06-23 14:06:54 +02:00
MrZYX
cb59930749 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-18 23:18:15 +02:00
MrZYX
d34d623b62 updated locales 2011-06-18 23:18:04 +02:00
Jordi Mallach
9a6c175dbd Better message for what's on your mind. 2011-06-17 21:14:50 +02:00
Ilya Zhitomirskiy
3d77186d35 added authorizations page where a user can see all of their authorized applications 2011-06-13 15:40:55 -07:00
MrZYX
abedcc1cc3 updated locales 2011-06-10 02:15:03 +02:00
MrZYX
69efeb0179 updated locales 2011-06-08 19:13:20 +02:00
MrZYX
10b8f88e97 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-06 23:06:51 +02:00
MrZYX
be8e61ec1d updated locales 2011-06-06 23:06:32 +02:00
Jordi Mallach
cd2c37a19f Updated Catalan translation to 686464c. 2011-06-06 14:39:57 +02:00
MrZYX
158223319e updated locales 2011-06-05 00:59:58 +02:00
MrZYX
04e22c5564 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-03 23:04:58 +02:00
MrZYX
bfe38891eb updated locales 2011-06-03 23:04:52 +02:00
Raphael Sofaer
686464c36e move account deletion out of a tranaction and into a job 2011-06-03 12:05:57 -07:00
MrZYX
009985169d fixed type in ml.yml 2011-06-03 00:29:23 +02:00
Jordi Mallach
586c57f694 Update Catalan devise translation to a46ff39. 2011-06-02 19:20:10 +02:00
Jordi Mallach
e00586e937 Update Catalan translation to f7181a7. 2011-06-02 12:17:08 +02:00
Maxwell Salzberg
f7181a7123 add tumblr translation 2011-06-01 22:43:23 -07: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
Sebastian
ea85daadc4 Added UsersController#confirm_email with route and some specs 2011-06-01 16:26:54 +02:00
Sebastian
37ccbce153 Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update 2011-06-01 16:26:53 +02:00
Sebastian
602382e24e Extended UsersController#update method for changing password with minimal specs, added form to view and locales (en). 2011-06-01 16:26:53 +02:00
Jordi Mallach
6a39dec635 Updated Catalan javascript to 331aa1f. 2011-06-01 11:50:13 +02:00
Jordi Mallach
191b5f1a28 Update Catalan translation to 05aa73e. 2011-06-01 11:47:16 +02:00
MrZYX
ed33c0b47a updated locales 2011-05-31 22:16:16 +02:00
MrZYX
7dd20a5e8b this hopefully fixes catalan and maybe even malayalam (#1110) 2011-05-31 22:13:47 +02:00
MrZYX
05aa73e93c made everything in the sidebar translatable 2011-05-30 18:06:05 +02:00
MrZYX
61fd8b55af updated locales 2011-05-29 23:28:55 +02:00
MrZYX
4e5c6f0c97 updated locales 2011-05-29 04:14:25 +02:00
MrZYX
307b69c7cf Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-05-27 15:34:58 +02:00
MrZYX
0bfb6f01c6 updated locales 2011-05-27 15:34:50 +02:00
Jordi Mallach
2c6be3c28e Update Catalan translation to db22be43. Fix some leftovers in the process. 2011-05-27 01:10:51 +02:00
Jordi Mallach
89086c2453 Shorter message for one string that was overlapping. 2011-05-26 10:35:09 +02:00
MrZYX
e946600ad4 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-05-24 17:33:40 +02:00
MrZYX
ce9e7c5369 updated locales 2011-05-24 17:33:36 +02:00
MrZYX
db22be43a8 really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF 2011-05-24 17:03:48 +02:00
Jordi Mallach
75e7b0e45d Update Catalan translation to fc7b2cf. 2011-05-24 16:17:00 +02:00
Raphael Sofaer
fc7b2cfe3f Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation. 2011-05-23 23:09:48 -07:00
MrZYX
5dca73e535 updated locales 2011-05-24 00:07:24 +02:00
danielgrippi
8e3149ca01 better page explaining cubbi.es and why we're promoting it on diaspora 2011-05-23 01:14:33 -07:00
Maxwell Salzberg
bb62a3dc61 move double post in notifications 2011-05-22 14:50:50 -07:00
MrZYX
4e94fe46d2 updated locales 2011-05-22 23:49:22 +02:00
Maxwell Salzberg
2f6d079635 added failure test for deleted likes 2011-05-22 14:45:16 -07:00
MrZYX
a68031179b prevent inviting yourself, #515 2011-05-22 14:48:07 +02:00
MrZYX
e6f3adb69f updated locales 2011-05-22 01:06:23 +02:00
danielgrippi
6a108104e8 add spacing 2011-05-21 14:56:11 -07:00
danielgrippi
0391795f80 better right pane sections 2011-05-21 14:52:59 -07:00
MrZYX
a605ed80dd updated locales 2011-05-20 21:40:56 +02:00
danielgrippi
16351227f7 use aspect dropdowns everywhere; updated rake to 0.9.0 2011-05-20 11:50:41 -07:00
Arzumy MD
7c1a2f8d1d add remove_contact to en.yml to fix the build 2011-05-20 11:05:06 +08:00
danielgrippi
f2259e5e25 put link in via link translation, add via link to mobile site 2011-05-19 16:06:29 -07:00
Maxwell Salzberg
3c4c62abd5 moved auth token to admins page, and added a link in the dropdown 2011-05-19 14:23:04 -07:00
danielgrippi
177061d1c5 added via links 2011-05-19 13:13:08 -07:00
Jonne Hass
01796fb7be Merge pull request #641 from aneesh/malayalam-localization 
Malayalam localization
 2011-05-19 11:13:19 -07:00
MrZYX
331aa1ff60 you know the facepalm smiley? Here it is: m( 2011-05-19 20:10:35 +02:00
Anish A
174c5772af Malayalam translation, final touchups 2011-05-19 23:25:58 +05:30
Anish A
626733b9f9 Malayalam translation, updated translations from me and siddique pk 2011-05-19 23:22:04 +05:30
Anish A
15fc0dd3ae Malayalam translation, updated translations suggested from diaspora 2011-05-19 23:22:04 +05:30
MrZYX
e592e1b06e updated locales 2011-05-18 23:33:21 +02:00
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07: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
Anish A
3837d3b1f8 Malayalam translation, nearing completion 2011-05-18 07:27:40 +05:30
Ilya Zhitomirskiy
60c0a9839b added a podwide email preference 2011-05-17 18:19:47 -07:00