ilya
|
8fae836b65
|
isolating the problem
|
2010-10-07 15:28:58 -07:00 |
|
ilya
|
e174722315
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:06:03 -07:00 |
|
ilya
|
43600905dc
|
trying making the port an int
|
2010-10-07 15:05:52 -07:00 |
|
Raphael
|
6dbe429ed1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:02:37 -07:00 |
|
Raphael
|
a01a059293
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:47:32 -07:00 |
|
danielvincent
|
efcd0c418d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:47:31 -07:00 |
|
danielvincent
|
bd9e9043e0
|
fixed nb locale
|
2010-10-07 14:37:38 -07:00 |
|
ilya
|
7aa49b277c
|
moved the smtp setting to intializers
|
2010-10-07 14:36:08 -07:00 |
|
Raphael
|
9646a453a1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:34:57 -07:00 |
|
ilya
|
c036e63289
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:27:38 -07:00 |
|
ilya
|
2a104ea622
|
Revert "moved the SMTP setting into app_config.yml"
This reverts commit 2451ac4957.
|
2010-10-07 14:26:59 -07:00 |
|
danielvincent
|
1a8d4a603f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:22:10 -07:00 |
|
danielvincent
|
8f1973815e
|
DG MS; added route for exported xml
|
2010-10-07 14:21:53 -07:00 |
|
ilya
|
2451ac4957
|
moved the SMTP setting into app_config.yml
|
2010-10-07 14:20:31 -07:00 |
|
Raphael
|
9912769b5b
|
Merge remote branch 'guillei/s3_upload'
|
2010-10-07 14:17:43 -07:00 |
|
ilya
|
8352a7cf95
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
config/routes.rb
|
2010-10-07 14:04:31 -07:00 |
|
ilya
|
7ecc94d7b2
|
added the password route to make email reset password work
|
2010-10-07 14:03:18 -07:00 |
|
Raphael
|
e47aa90b15
|
Merge remote branch 'Stigjb/master'
|
2010-10-07 11:06:27 -07:00 |
|
Raphael
|
6ae6d20e4f
|
Merge remote branch 'crimer/master'
|
2010-10-07 10:57:51 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
Raphael
|
0831812e97
|
Merge remote branch 'kashif/master'
|
2010-10-07 10:41:50 -07:00 |
|
Raphael
|
f078bd0a54
|
Merge remote branch 'leamas/perm-fix'
|
2010-10-07 10:09:29 -07:00 |
|
Raphael
|
b6a3549693
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 09:37:00 -07:00 |
|
Crimer
|
56ed245db0
|
MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku.
|
2010-10-07 14:29:17 +00:00 |
|
Alec Leamas
|
0d51af0a13
|
Removing shebang on non-script.
|
2010-10-07 16:11:43 +02:00 |
|
ilya
|
131e905322
|
fixed the public route
|
2010-10-06 19:05:43 -07:00 |
|
Raphael
|
a315b489f1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:19:38 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -07:00 |
|
Raphael
|
caffd8f9ff
|
Don't check for servers that aren't there
|
2010-10-05 17:58:48 -07:00 |
|
Raphael
|
79f19b6870
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:46:25 -07:00 |
|
Raphael
|
de9cdfbe7b
|
Always set the FACEBOOK constant
|
2010-10-05 17:46:14 -07:00 |
|
Yaron Shahrabani
|
77d5b68e15
|
Fixed some typos
|
2010-10-06 08:29:58 +08:00 |
|
Daniele Di Sarli
|
5074d2f8f2
|
Updated Italian translation
|
2010-10-06 08:25:29 +08:00 |
|
Raphael
|
22f90086ca
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 16:58:06 -07:00 |
|
Raphael
|
37fb2bfd32
|
Don't require a facebook yml
|
2010-10-05 16:57:22 -07:00 |
|
UserAd
|
1d0a4579f6
|
Add missing localization for aspect managment
|
2010-10-06 07:56:23 +08:00 |
|
UserAd
|
e7c153df4e
|
Add translation support in profile ('or' between buttons). Fix Russian locale
|
2010-10-06 07:56:23 +08:00 |
|
danielvincent
|
33e478229e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 13:40:10 -07:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
ilya
|
45d40f27d9
|
changed the deploy config back to master
|
2010-10-05 13:06:55 -07:00 |
|
ilya
|
85f71aa4aa
|
added the deploy task to symlink the fb_config
|
2010-10-05 12:38:20 -07:00 |
|
ilya
|
82455981b8
|
added fb_config to gitignore
|
2010-10-05 12:21:33 -07:00 |
|
Raphael
|
1fa732498b
|
Update sprinkle script
|
2010-10-05 11:55:47 -07:00 |
|
Raphael
|
bb88a6fb8c
|
Merge branch 'salmon-refactor'
|
2010-10-05 09:47:10 -07:00 |
|
Raphael
|
be909e27d6
|
Deleting adams
|
2010-10-04 14:49:27 -04:00 |
|
Raphael
|
2cd8cf0621
|
Remove a bunch of deleted backer servers
|
2010-10-02 20:30:37 -04:00 |
|
ilya
|
88dafbf5cc
|
changed deploy branch
|
2010-10-02 13:29:36 -07:00 |
|
Stig Johan Berggren
|
ff7c8c7a50
|
Added locale files for Norwegian (bokmål)
Localization files for Norwegian bokmål (nm) inserted. They have been
tested a little locally and do not produce any errors.
|
2010-09-29 17:58:25 +02:00 |
|
Kashif Rasul
|
330cf63599
|
Arabic locale fixes.
|
2010-09-29 17:13:27 +02:00 |
|
Kashif Rasul
|
08ddae0894
|
Added devise Arabic locales and moved locale to correct folder.
|
2010-09-29 16:54:33 +02:00 |
|