Sarah Mei
|
e44eec4a9e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 00:39:41 -06:00 |
|
Sarah Mei
|
c0bf7ab5cd
|
Rake task for CI that includes a bundle install
|
2010-10-08 00:39:30 -06:00 |
|
Sarah Mei
|
03a0031ddd
|
.gitignore capybara output
|
2010-10-08 00:38:53 -06:00 |
|
danielvincent
|
894d6654b2
|
only selected nav element should be a tab on aspect_nav, preventing tab overload.
|
2010-10-07 23:35:55 -07:00 |
|
danielvincent
|
8f741795fb
|
aspect manage margin fix
|
2010-10-07 23:27:31 -07:00 |
|
danielvincent
|
5b66a191cd
|
more stream tweaks
|
2010-10-07 23:25:49 -07:00 |
|
danielvincent
|
b314ee22ec
|
intermediate misc ui polish
|
2010-10-07 22:51:08 -07:00 |
|
ilya
|
9a34ca07c4
|
Merge branch 'master' of github.com:diaspora/diaspora into invites
|
2010-10-07 19:25:42 -07:00 |
|
ilya
|
ddb98502b9
|
setup the controller, still need to make the person
|
2010-10-07 19:25:34 -07:00 |
|
danielvincent
|
14ae1e8e6d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 18:52:53 -07:00 |
|
danielvincent
|
ed1cb5a0e7
|
DG MS; moved change password to account page; fixed the styling on password inputs
|
2010-10-07 18:52:46 -07:00 |
|
Raphael
|
41c6f8d377
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 18:39:52 -07:00 |
|
Raphael
|
fef09b9c2f
|
Merge remote branch 'leamas/pkg-fix'
|
2010-10-07 18:39:37 -07:00 |
|
danielvincent
|
75aadc5c57
|
DG MS; cleaned up routes, killed all deprication warnings in everything. totally legit.
|
2010-10-07 18:25:59 -07:00 |
|
ilya
|
4ecda6ab8f
|
Merge branch 'master' of github.com:diaspora/diaspora into invites
Conflicts:
Gemfile
Gemfile.lock
|
2010-10-07 18:20:51 -07:00 |
|
danielvincent
|
c756e1a331
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 18:17:38 -07:00 |
|
danielvincent
|
2e73104d6f
|
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
|
2010-10-07 18:17:26 -07:00 |
|
ilya
|
3c61365fa1
|
initial invitable in user
|
2010-10-07 18:11:17 -07:00 |
|
Alec Leamas
|
dd1a488be1
|
Bringing in some very old stuff lost in patch mgmmt.
|
2010-10-08 03:00:36 +02:00 |
|
Raphael
|
3632143959
|
Take out pending on spec that exposes issue 150
|
2010-10-07 17:54:26 -07:00 |
|
Raphael
|
399e437655
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 17:34:03 -07:00 |
|
Raphael
|
2bb36a266a
|
Merge remote branch 'minilibra/master'
|
2010-10-07 17:32:20 -07:00 |
|
ilya
|
c75a2ebd66
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 17:00:52 -07:00 |
|
ilya
|
97f058c625
|
moving to app config yml
|
2010-10-07 17:00:38 -07:00 |
|
danielvincent
|
7a56d82873
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 16:56:22 -07:00 |
|
danielvincent
|
4deea95057
|
DG MS; export photos button in users#edit
|
2010-10-07 16:56:10 -07:00 |
|
ilya
|
ad348ed24c
|
trying the mailer_condig
|
2010-10-07 16:54:38 -07:00 |
|
Raphael
|
5008b75a44
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 16:51:20 -07:00 |
|
Raphael
|
1d463d22a1
|
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
|
2010-10-07 16:50:19 -07:00 |
|
ilya
|
9c59adee51
|
in dev env as well
|
2010-10-07 16:48:49 -07:00 |
|
ilya
|
487637d5a3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 16:42:49 -07:00 |
|
ilya
|
f022c2d8bd
|
correct smtp server
|
2010-10-07 16:42:39 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
Raphael
|
c855a93cbd
|
Move install scripts to /pkg
|
2010-10-07 16:06:59 -07:00 |
|
Raphael
|
e358452571
|
Merge remote branch 'leamas/fedora-pkg'
|
2010-10-07 16:05:55 -07:00 |
|
Crimer
|
ec3102cecd
|
Fixed typo in readme
|
2010-10-08 00:52:04 +00:00 |
|
Raphael
|
244fab21e0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:50:26 -07:00 |
|
ilya
|
720d1daa9e
|
moved the mailer settings back into env
|
2010-10-07 15:40:18 -07:00 |
|
ilya
|
cda5efbee9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:29:10 -07:00 |
|
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 |
|