Commit graph

696 commits

Author SHA1 Message Date
Raphael
6841ffbecc Disable_with on comment form 2010-11-18 15:41:51 -08:00
Raphael
c7b8c185bd Disable with on publisher form 2010-11-18 15:41:51 -08:00
Alec Leamas
5b8eb2cacd Production/test mode somment in config/server.sh 2010-11-19 00:34:10 +01:00
MrZYX
dcbcaefcbe added language codes map 2010-11-18 15:13:30 -08:00
MrZYX
60375422e7 pulled update for sk.yml from the rails i18n project 2010-11-18 15:13:30 -08:00
MrZYX
3f76699805 pulled update for et.yml from rails i18n 2010-11-18 15:13:30 -08:00
MrZYX
13ca682734 added locales from the rails-i18n project, removed rails-i18n parts from existing locales, added script to update rails-i18n locales 2010-11-18 15:13:30 -08:00
Raphael
61692c1da6 Fix translation missing in inv mailer 2010-11-18 12:50:46 -08:00
Raphael
187e9ac198 Merge remote branch 'jandom/475-Chore-Add-missing-polish-locales' 2010-11-18 11:59:55 -08:00
maxwell
3b88121244 dammit jammit... dont package always dur 2010-11-18 09:24:01 -08:00
maxwell
2ffd2d93e3 made mailchimp form ssl 2010-11-17 23:19:12 -08:00
maxwell
f01fca1877 letting jammit do its default thing 2010-11-17 22:18:15 -08:00
maxwell
5e375a30d8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:06:08 -08:00
danielvincent
558c175c2b resolved translation issue in diaspora.en in user dropdown. second login link on landing page works. 2010-11-17 21:57:27 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
maxwell
1ca5e25e53 adding default for google a analytics 2010-11-17 12:35:42 -08:00
Jan
b088e0d685 Added missing polish locales, using all of the previous translations. 2010-11-17 20:50:38 +01:00
Raphael
c0414b8184 Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts 2010-11-16 16:18:16 -08:00
Alec Leamas
90b86690d9 Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4 2010-11-16 16:25:32 +01:00
maxwell
f6c6030c6d fixing a translation 2010-11-15 23:08:57 -08:00
zhitomirskiyi
c5ae73f96d websocket secure params in app_config 2010-11-15 17:45:52 -08:00
Raphael
de1fed70f0 Add logging statement to server startup 2010-11-15 16:56:30 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Hexagon
13a2b8ce07 Small fix to devise.sv 2010-11-15 22:28:36 +01:00
Hexagon
1d3d2565df Forgot to change en.yml, here it is 2010-11-15 22:28:36 +01:00
Hexagon
35095f8859 Update of sv.yml to reflect latest changes + small fix to en.yml 2010-11-15 22:28:36 +01:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Alec Leamas
3abb2c9751 app_config update
Attempt to close http://bugs.joindiaspora.com/issues/463, establishing a
new style in app_config.yml. Many comments needs to be reviewed.
2010-11-15 09:10:35 +01:00
danielvincent
969c668518 translation fix on _person.haml. button tweak 2010-11-13 12:10:09 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
livefromthemoon@gmail.com
82f9aefaa8 Updated some french translation strings 2010-11-12 12:26:34 -08:00
livefromthemoon@gmail.com
cdfc406aad Added missing french translations 2010-11-12 12:26:34 -08:00
Raphael
a4d7b25bac Merge branch 'master' of github.com:diaspora/diaspora 2010-11-12 11:54:19 -08:00
danielvincent
4976503c0f let nginx serve static assets. 2010-11-12 11:47:19 -08:00
Jonne Hass
1816b1e4df people.show.add_friend -> people.person.add_friend 2010-11-12 06:07:37 +01:00
MrZYX
5ae4248b30 some more fixes I overlooked. Sorry 2010-11-12 06:07:37 +01:00
MrZYX
f55a973685 two small fixes 2010-11-12 06:07:37 +01:00
Hexagon
52da9c84ed Update of sv.yml to match latest additions 2010-11-12 06:07:37 +01:00
MrZYX
0a363a73b0 just found the mailer... :) 2010-11-12 06:07:37 +01:00
MrZYX
9ceb3e2fd1 found some still untranslatable strings in helpers and stuff 2010-11-12 06:07:36 +01:00
Hexagon
a4f5a1e7ae Updated swedish translation 2010-11-12 06:07:36 +01:00
MrZYX
748efb1860 eliminated senseless duplicates in en.yml 2010-11-12 06:07:36 +01:00
Jonne Hass
a957ba3aed so then I remove the newly unused friends_since for you 2010-11-12 06:06:16 +01:00
MrZYX
6400dc244f fixing again. it's getting anoying 2010-11-12 06:06:16 +01:00
MrZYX
8085a7bcd7 fixes to be in sync with latest commits 2010-11-12 06:06:15 +01:00
MrZYX
d91c26fb68 translated getting started, fixed #508 2010-11-12 06:06:15 +01:00
MrZYX
381c53b775 found some untranslatable strings 2010-11-12 06:04:05 +01:00
MrZYX
eef0901f36 unscoped fill_me_out 2010-11-12 06:04:05 +01:00