Jesse Kriss
|
30e655fd6c
|
adding heroku-friendly mongo config
|
2010-09-16 09:46:09 +08:00 |
|
Raphael
|
e9009ea609
|
Downcase username only if it is there
|
2010-09-15 18:23:54 -07:00 |
|
Raphael
|
b8f6c0bbd4
|
adjust git clone command
|
2010-09-15 18:17:16 -07:00 |
|
Raphael
|
de93fd2818
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 18:10:13 -07:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
patcito
|
1df94e7922
|
added doc for installing from ubuntu package manager
|
2010-09-16 08:53:55 +08:00 |
|
Raphael
|
04594d7ac5
|
Merge branch 'production' of github.com:diaspora/diaspora into production
Conflicts:
app/models/user.rb
|
2010-09-15 17:25:14 -07:00 |
|
Raphael
|
33048fe6db
|
Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
app/models/user.rb
spec/models/aspect_spec.rb
|
2010-09-15 17:24:00 -07:00 |
|
Raphael
|
0e0df7fb22
|
downcase before validation
|
2010-09-15 17:21:23 -07:00 |
|
Raphael
|
bf33313bf9
|
take out index, change backer seed, no puts
|
2010-09-15 17:13:17 -07:00 |
|
Raphael
|
02dda4f0a7
|
change the name of instantiate back
|
2010-09-15 17:08:56 -07:00 |
|
Raphael
|
d2f5d3c4c1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 17:05:36 -07:00 |
|
Raphael
|
01d26f6d0e
|
Using custom registrations controller
|
2010-09-15 17:05:21 -07:00 |
|
Daniel Vincent Grippi
|
c1414c5207
|
flash messages are now colored on session wall
|
2010-09-15 16:59:44 -07:00 |
|
Daniel Vincent Grippi
|
3681ae62c7
|
remove google analytics
|
2010-09-15 16:43:38 -07:00 |
|
Raphael
|
e0ffc8bba0
|
First pass at having a custom registrationsController
|
2010-09-15 16:40:03 -07:00 |
|
Daniel Vincent Grippi
|
ee89bfaf8f
|
removed do bad things
|
2010-09-15 16:18:33 -07:00 |
|
maxwell
|
b8bbc58d30
|
save person after changing handle
|
2010-09-15 16:02:23 -07:00 |
|
Daniel Vincent Grippi
|
f0dad8c16a
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 15:55:45 -07:00 |
|
maxwell
|
77bd68e7c7
|
MS the deploy config is wrong
|
2010-09-15 15:55:26 -07:00 |
|
Daniel Vincent Grippi
|
e94b48e19a
|
Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
app/models/user.rb
|
2010-09-15 15:55:18 -07:00 |
|
maxwell
|
12f6872484
|
commas in seed script
|
2010-09-15 15:49:16 -07:00 |
|
maxwell
|
6e29a66e09
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/models/user.rb
|
2010-09-15 15:46:15 -07:00 |
|
maxwell
|
3a4eb294f8
|
MS made it two callbacks for handles and keys
|
2010-09-15 15:45:26 -07:00 |
|
Daniel Vincent Grippi
|
a4a9dffa0b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 15:39:13 -07:00 |
|
Daniel Vincent Grippi
|
b2b2748fea
|
seed aspects on user create
|
2010-09-15 15:39:04 -07:00 |
|
Daniel Vincent Grippi
|
82ada7d2d6
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-15 15:36:59 -07:00 |
|
Daniel Vincent Grippi
|
cd21ee8652
|
just seed family and work
|
2010-09-15 15:36:41 -07:00 |
|
Raphael
|
b1b24371d7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 15:35:17 -07:00 |
|
Raphael
|
dece993db9
|
Adjusting readme
|
2010-09-15 15:35:05 -07:00 |
|
maxwell
|
16625f4ee9
|
MS removing production stuff from master... yowch
|
2010-09-15 15:31:53 -07:00 |
|
maxwell
|
3631df413e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 15:26:28 -07:00 |
|
maxwell
|
7741951a42
|
MS removing production stuff from master... yowch
|
2010-09-15 15:26:06 -07:00 |
|
Raphael
|
4964771865
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 15:24:10 -07:00 |
|
Raphael
|
89f2cddde9
|
adjusting readme
|
2010-09-15 15:23:53 -07:00 |
|
maxwell
|
e375af352c
|
added url to backer script
|
2010-09-15 15:21:52 -07:00 |
|
maxwell
|
8828707c45
|
MS fixed the login bug, deploying to master
|
2010-09-15 15:15:15 -07:00 |
|
maxwell
|
c1077b3eed
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-15 14:11:24 -07:00 |
|
maxwell
|
55c1530c9f
|
MS DG fixing an edit profile bug
|
2010-09-15 14:09:05 -07:00 |
|
maxwell
|
b68ec3a5b8
|
MS DG setting diaspora handle in a unclean way
|
2010-09-15 13:53:36 -07:00 |
|
maxwell
|
78cc51efb4
|
MS DG more emails for person in the seedfile
|
2010-09-15 13:34:06 -07:00 |
|
maxwell
|
c57f6b2d9a
|
fixing merge
|
2010-09-15 13:29:39 -07:00 |
|
maxwell
|
84c60e5f2e
|
DG MS fixing webfinger, i hope to goodness
|
2010-09-15 13:28:06 -07:00 |
|
Daniel Vincent Grippi
|
7ed00424c9
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 12:39:07 -07:00 |
|
Daniel Vincent Grippi
|
a925c14310
|
fixing webfinger/salmon
|
2010-09-15 12:35:23 -07:00 |
|
Daniel Vincent Grippi
|
aad24fdfcc
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 12:22:16 -07:00 |
|
Daniel Vincent Grippi
|
57bd052c5b
|
user edit bug
|
2010-09-15 12:22:03 -07:00 |
|
Daniel Vincent Grippi
|
97b0b7b322
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 11:59:51 -07:00 |
|
Daniel Vincent Grippi
|
deac53f178
|
see yourself in aspect sidebar, because you're going to post to yourself anyway
|
2010-09-15 11:59:39 -07:00 |
|
Daniel Vincent Grippi
|
10bbf367ad
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-15 11:55:52 -07:00 |
|