Commit graph

4183 commits

Author SHA1 Message Date
Alec Leamas
a3395b6de8 Bugfix (thanks, MrXYZ) 2010-11-21 12:08:52 +01:00
zhitomirskiyi
73441e0b2b the other harden_ruby reference 2010-11-20 21:48:47 -08:00
zhitomirskiyi
9756e86c82 add nginx log directory 2010-11-20 20:22:24 -08:00
Sarah Mei
fbc453d1dd Merge branch 'master' of github.com:diaspora/diaspora 2010-11-20 19:08:46 -08:00
Sarah Mei
92c508bb36 Silence warnings on ruby 1.9 build 2010-11-20 19:08:36 -08:00
Sarah Mei
ad6f6498ef Updated version of thor and mongomapper. 2010-11-20 19:08:13 -08:00
zhitomirskiyi
3e1f6d7eaa moving it making dir into own step 2010-11-20 18:40:20 -08:00
zhitomirskiyi
b15d7018c8 making a directory to cd into, for splunk 2010-11-20 18:24:44 -08:00
Hexagon
93b0f3fd81 Updating rails-i18n 2010-11-21 01:52:59 +01:00
Sarah Mei
1309ee37dc more work on the feature for ignoring a contact request 2010-11-20 12:16:18 -08:00
Alec Leamas
0a3a787ffa Merge branch 'jammit' 2010-11-20 18:35:45 +01:00
Alec Leamas
b6648cb9e2 Handle jammit by precaching in script/server.
This introduces some jammit warnings in 'rake spec'. These seem
to be just warnings. To get rid of them, take steps as described in
https://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora
in the "Read-only Installation" (sic!) chapter.
2010-11-20 18:32:40 +01:00
maxwell
194373ff70 fixing extra = 2010-11-20 18:05:00 +01:00
MrZYX
b97abbd251 hebrew is at 100%, thanks yaron 2010-11-20 14:40:57 +01:00
MrZYX
b0f4a871ee dutch is at 100%, thanks Kevin Kleinman 2010-11-20 13:29:55 +01:00
Sarah Mei
90193a16f5 fix 1.9 build 2010-11-19 23:14:08 -08:00
zhitomirskiyi
3d5cf8f625 added a panding cross path request spec 2010-11-19 18:53:46 -08:00
zhitomirskiyi
e8d86d6d07 pulled out the certlocations to a config file 2010-11-19 18:14:14 -08:00
zhitomirskiyi
69bc1e645f in all the places 2010-11-19 17:59:21 -08:00
zhitomirskiyi
bb2b4acb4b moved the url in nginx conf to the yml 2010-11-19 17:52:29 -08:00
zhitomirskiyi
e82495cc5b backing up photos once a day 2010-11-19 16:59:37 -08:00
danielvincent
bb662a2bbf use REE instead of default ruby 2010-11-19 16:52:28 -08:00
zhitomirskiyi
14a564052b Merge branch 'master' of github.com:diaspora/diaspora 2010-11-19 16:46:39 -08:00
zhitomirskiyi
8524311c51 added the photo rake task 2010-11-19 16:46:23 -08:00
Hexagon
7f971248dc Merge branch '99translations' of https://github.com/MrZYX/diaspora 2010-11-20 01:23:53 +01:00
zhitomirskiyi
24f00fc49e correct path to the crontab 2010-11-19 16:18:38 -08:00
MrZYX
50120878fb updated locales from 99translations
removed fr-informal
german is at 100%
swedish is at 100%, thanks Hexagon
french is at 100%, thanks ed0h
russian is at almost 90%, thanks rapmon
2010-11-20 01:16:01 +01:00
zhitomirskiyi
ca8bf24505 fixed the mongodump job 2010-11-19 16:12:38 -08:00
zhitomirskiyi
4b6e16af76 removed the extra debug lines 2010-11-19 15:49:31 -08:00
zhitomirskiyi
b3293fdf7b chonjob backup recipies 2010-11-19 15:46:19 -08:00
Hexagon
d6695501f7 Merge branch 'more-translatable' of https://github.com/MrZYX/diaspora into MrZYX-more-translatable 2010-11-19 22:04:39 +01:00
zhitomirskiyi
152998311f added the comments as well as loading of app config 2010-11-19 11:25:13 -08:00
zhitomirskiyi
481204a157 mongo cloudfiles backup task 2010-11-19 10:57:28 -08:00
MrZYX
6f5c3f3258 made recent changes translatable and cleanup up en.yml a bit 2010-11-19 17:25:45 +01:00
Jonne Hass
f426c08dcc made shared/_contatct_list.html.haml
and the type after "viewing:" in shared/_author_info.html.haml translatable
2010-11-19 17:25:05 +01:00
Alec Leamas
50eb0a9242 Pkg update 2010-11-19 17:04:11 +01:00
MrZYX
7200c007e5 made file uploader translatable 2010-11-19 15:25:14 +01:00
maxwell
466120cd58 fixing extra = 2010-11-18 20:07:57 -08:00
zhitomirskiyi
ff5e32d2b8 begining of a rake task for mongo backup 2010-11-18 18:38:03 -08:00
Raphael
655e92ebdd Add some scopes for Request, take putses out of specs 2010-11-18 18:04:29 -08:00
Raphael
bad76d8cef Use pod url in host-meta 2010-11-18 17:02:13 -08:00
zhitomirskiyi
c2dcf9a074 fixed the invite spec 2010-11-18 16:55:44 -08:00
Raphael
78f2f74186 Fix photo exporting, I'm not sure how to use
Kernel::system in this case, so using ``
2010-11-18 16:41:34 -08:00
zhitomirskiyi
d0d261fdae zero default invites, the rake task starts people with 5 invites 2010-11-18 16:23:35 -08:00
Raphael
5a2b3cd0a7 Fix build 2010-11-18 16:06:44 -08:00
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
maxwell
c0d10ef174 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-18 15:36:47 -08:00
maxwell
747ab761a0 pushing mailer spec for ilya 2010-11-18 15:36:30 -08:00
Alec Leamas
5b8eb2cacd Production/test mode somment in config/server.sh 2010-11-19 00:34:10 +01:00