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

1741 commits

Author SHA1 Message Date
Maxwell Salzberg
7956eb7d51 update the jquery (only for mobile site) as jquery mobile requires jquery 1.6. why this did not break yesterday when I did it is beyond me 2011-07-30 09:36:28 -07:00
danielgrippi
905a982d35 add two more default aspects for new users 2011-07-29 19:21:18 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3a6f0583c7 added featured users dg iz 2011-07-29 19:00:15 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8 featured users section 2011-07-29 19:00:15 -07:00
Maxwell Salzberg
d55a21c458 just kidding. totally going to namespace users 2011-07-29 18:53:46 -07:00
Maxwell Salzberg
d407be036e i am not a number! include username in the main url of a local user! 2011-07-29 18:53:46 -07:00
MrZYX
289126b984 updated locales 2011-07-29 23:51:49 +02:00
Raphael Sofaer
b56838e5b1 Fall back to english on MissingInterpolationError 2011-07-29 14:30:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
00571b84cd completed donate option 2011-07-29 11:33:30 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -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
ee95def580 removed js from the view. added grabbing hand while moving aspects 2011-07-28 15:34:01 -07: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
6425bdc47c added esperanto to the available languages 2011-07-25 15:38:17 +02: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
maxwell
7a5852e73a fix a bug with openssl keys in development. note to future max and 
rafi.  never monkey patch anything on the top of a completely random
model. never again. ever.

TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
 2011-07-24 20:06:07 -07: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
7382dfb7be Multi-server spec now successfully passes along a reshare 2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -07:00
danielgrippi
509a435cc9 moving to not including the post in the reshare xml 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07: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
14759b2c80 Use person_link in notifications_helper, move hovercard css out to a file 2011-07-12 16:21:03 -07:00
Raphael Sofaer
c622c08d49 Clarify already invited 2011-07-12 15:13:45 -07:00
MrZYX
7e84747a52 clean up routes.rb a bit 2011-07-12 16:47:04 +02: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
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Raphael Sofaer
eafe6a7c85 Merge branch 'ajaxy-comments' 2011-07-11 14:05:45 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
594c9b02b1 A admin is now able to allow open invitations 2011-07-11 13:32:02 -07:00
Raphael Sofaer
3f555eefc4 Server side of ajaxy comments done, need to modify comments/_comments and make it work. 2011-07-11 09:11:16 -07:00
Jordi Mallach
676035f0c2 Updated Catalan translation to 97ca10d. 2011-07-11 15:51:36 +02:00
Raphael Sofaer
2fb0fce1a8 Nest likes and comments routes in the post route 2011-07-10 21:44:34 -07:00
danielgrippi
e09ddef361 DH DG; lightboxin wip 2011-07-10 21:08:34 -07:00
Raphael Sofaer
934ae80a5f Take index route off until I actually make it 2011-07-10 20:26:38 -07: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
danielgrippi
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07: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
danielgrippi
76382b074c fix jammit warnings; specs 2011-07-06 14:32:40 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382 HOVERCARD 2011-07-06 12:45:16 -07:00
Daniel Grippi
030e7663f4 Merge pull request #671 from disconn3ct/deploy-current-branch 
deploy the currently checked-out branch
 2011-07-06 10:07:44 -07:00
Dis McCarthy
bf4fb994f5 deploy the currently checked-out branch 2011-07-06 10:41:19 -04: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