ilya
|
8fae836b65
|
isolating the problem
|
2010-10-07 15:28:58 -07:00 |
|
danielvincent
|
68590ccc17
|
removed autotest
|
2010-10-07 15:26:02 -07:00 |
|
danielvincent
|
6531a27594
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:22:14 -07:00 |
|
danielvincent
|
0ebb597b72
|
DG MS; test for users#export
|
2010-10-07 15:22:03 -07:00 |
|
Raphael
|
e5e812f0d5
|
Merge remote branch 'maco/master'
Conflicts:
script/ubuntu-setup.bash
|
2010-10-07 15:10:42 -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 |
|
danielvincent
|
206e10f66a
|
dont put log behind devise
|
2010-10-07 14:57:00 -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 |
|
Sarah Mei
|
058da8ebf6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:39:01 -06:00 |
|
danielvincent
|
bd9e9043e0
|
fixed nb locale
|
2010-10-07 14:37:38 -07:00 |
|
ilya
|
73e3154a16
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:36:25 -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 |
|
danielvincent
|
0f5a09783d
|
positioning
|
2010-10-07 14:32:45 -07:00 |
|
ilya
|
c036e63289
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:27:38 -07:00 |
|
Sarah Mei
|
b63fb5d7a6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:27:18 -06:00 |
|
Sarah Mei
|
4dba2d7c35
|
Fix failing spec. Backfill spec for DevUtilitiesController#set_backer_number.
|
2010-10-07 15:27:04 -06: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
|
bb3442afa5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:20:44 -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 |
|
danielvincent
|
7a3d168123
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:17:22 -07:00 |
|
danielvincent
|
09dad2d80f
|
DG MS; exporter includes comments. exporter spec
|
2010-10-07 14:10:14 -07:00 |
|
ilya
|
71610afef8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:04:49 -07:00 |
|
ilya
|
8352a7cf95
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
config/routes.rb
|
2010-10-07 14:04:31 -07:00 |
|
Raphael
|
135ebb7583
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:03:59 -07:00 |
|
ilya
|
7ecc94d7b2
|
added the password route to make email reset password work
|
2010-10-07 14:03:18 -07:00 |
|
Raphael
|
ec9e180eab
|
Merge branch 'master' into HEAD
Conflicts:
public/stylesheets/application.css
|
2010-10-07 13:58:06 -07:00 |
|
danielvincent
|
7e8bf40a87
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 12:21:31 -07:00 |
|
danielvincent
|
8a130a68aa
|
DG MS; xml exporter file added
|
2010-10-07 12:21:14 -07:00 |
|
minilibra
|
ae6f39a0d0
|
Localization file for Indonesian added. Change "en" at the top of both files to "id". Thanks to rsofaer.
|
2010-10-08 02:09:13 +07:00 |
|
Raphael
|
9cbdf78aa7
|
Don't redirect on status message create
|
2010-10-07 12:01:49 -07:00 |
|
Raphael
|
0859d8ebfe
|
Merge remote branch 'jeffry/master'
|
2010-10-07 11:45:39 -07:00 |
|
Raphael
|
e26ad0bdf8
|
topic branch
|
2010-10-07 11:38:07 -07:00 |
|
Raphael
|
4ecf4213f0
|
Merge remote branch 'jbhannah/master'
|
2010-10-07 11:08:39 -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
|
67fc01aa36
|
Send friend_acceptances correctly
|
2010-10-07 09:49:34 -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 |
|
Alec Leamas
|
e9252e8aec
|
After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png
|
2010-10-07 14:59:13 +02:00 |
|