Raphael
|
51b07784fe
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
|
2010-08-19 16:47:01 -07:00 |
|
Raphael
|
170ef67181
|
set browser in selenium.yml for linux
|
2010-08-19 16:43:56 -07:00 |
|
Raphael
|
f66b5f4006
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/controllers/users_controller.rb
app/models/user.rb
config/sprinkle/provision.rb
|
2010-08-19 16:09:08 -07:00 |
|
maxwell
|
20678060e7
|
selenium, ymls, a sample test
|
2010-08-19 15:44:23 -07:00 |
|
ilya
|
e277244614
|
Fixing users routes
|
2010-08-19 10:38:42 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
maxwell
|
ff41277088
|
one thing beta couldnt handle
|
2010-08-18 21:34:02 -07:00 |
|
Raphael
|
7ce8f94d58
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:10:48 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
maxwell
|
d054162bbe
|
more RC updating stuff
|
2010-08-18 20:51:55 -07:00 |
|
Raphael
|
701bec670f
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/views/groups/index.html.haml
config/deploy_config.yml
|
2010-08-18 20:50:28 -07:00 |
|
maxwell
|
6e2c42f8de
|
MS app now works with rc1
|
2010-08-18 17:42:04 -07:00 |
|
Raphael
|
7ed31ab96a
|
Moving to file store
|
2010-08-18 16:37:05 -07:00 |
|
ilya
|
55b4d4758f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
|
2010-08-17 22:58:46 -07:00 |
|
Raphael
|
55d84b3288
|
Broke up user spec, put user update back in routes
|
2010-08-17 22:03:45 -07:00 |
|
Raphael
|
d2f50008f7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
config/routes.rb
|
2010-08-17 19:42:30 -07:00 |
|
Raphael
|
0f9190cd02
|
put an only on the users routes
|
2010-08-17 19:41:44 -07:00 |
|
Raphael
|
e8e141b24e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 19:04:03 -07:00 |
|
Raphael
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
Raphael
|
8619584834
|
things mostly working
|
2010-08-17 18:27:50 -07:00 |
|
Raphael
|
6901b4f83e
|
Devise routes
|
2010-08-17 17:54:20 -07:00 |
|
Raphael
|
7186f3537a
|
Move back paragraph tag in confirmations view
|
2010-08-17 17:48:00 -07:00 |
|
Raphael
|
188f555c72
|
Actionmailer actually working
|
2010-08-17 15:47:41 -07:00 |
|
Raphael
|
a74ea7e80f
|
Back to config actionmailer, the settings are getting set, try mail.joindiaspora.com
|
2010-08-17 15:31:14 -07:00 |
|
Raphael
|
46e7dbedac
|
Trying to get actionmailer working
|
2010-08-17 15:19:41 -07:00 |
|
Raphael
|
f84d7962fc
|
actionmailer config
|
2010-08-17 14:06:00 -07:00 |
|
Raphael
|
cbb1b550ff
|
Default url
|
2010-08-17 14:03:30 -07:00 |
|
Raphael
|
2ede5f499f
|
Commas
|
2010-08-17 13:53:15 -07:00 |
|
Raphael
|
424f576d95
|
Actionmailer config
|
2010-08-17 13:48:09 -07:00 |
|
Raphael
|
1d6e132a9f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 13:07:26 -07:00 |
|
Raphael
|
842b321dfa
|
User email checking, routes working again
|
2010-08-17 13:02:42 -07:00 |
|
Raphael
|
b55a99ec09
|
conf changes, kill nginx with go_cold
|
2010-08-17 11:42:59 -07:00 |
|
Raphael
|
2261a0d8a4
|
nginx...
|
2010-08-17 11:28:22 -07:00 |
|
Raphael
|
16f53922c5
|
nginx conf done, comments deleted
|
2010-08-17 11:22:06 -07:00 |
|
Raphael
|
29e3fa4d04
|
sprinkle role
|
2010-08-17 11:04:34 -07:00 |
|
Raphael
|
453cb06691
|
changing settings and deploy scripts, validating email
|
2010-08-17 11:01:30 -07:00 |
|
ilya
|
5dff3369ad
|
DG IZ; removed puts statements.
|
2010-08-17 10:48:40 -07:00 |
|
ilya
|
7e377fc292
|
RS, IZ; adding set backer number to routes, not authenticating it
|
2010-08-13 12:37:49 -07:00 |
|
Raphael
|
599d1da620
|
Moved socket code out to lib, unsocketing from view should now work again
|
2010-08-11 12:03:26 -07:00 |
|
Raphael
|
bd7ce5250f
|
renamed the route for signup. also, removed the link from the login page: get_to_the_choppa
|
2010-08-10 17:14:58 -07:00 |
|
maxwell
|
0ffe893f8a
|
MS IZ merging diffs
|
2010-08-10 12:37:04 -07:00 |
|
maxwell
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -07:00 |
|
Raphael
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26:43 -07:00 |
|
Raphael
|
a48fbaaf59
|
RS, DG; DashboardsController has been eliminated.
|
2010-08-10 11:36:00 -07:00 |
|
maxwell
|
d443be35f9
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
|
2010-08-09 17:31:46 -07:00 |
|
maxwell
|
56d7c67bbb
|
Going toward pending requests
|
2010-08-09 17:21:41 -07:00 |
|
Raphael
|
aebe7b97c0
|
DG RS; added groups. can't delete, but can make new ones
|
2010-08-09 15:58:53 -07:00 |
|
Raphael
|
c14bb5a4f8
|
Changed info logging to debug logging almost everywhere
|
2010-08-09 14:39:37 -07:00 |
|
Raphael
|
614c8c72ba
|
RS, DG; Log files should now rotate
|
2010-08-09 14:27:17 -07:00 |
|
Raphael
|
088da2544b
|
RS, DG; We now delete channels when there is nobody subscribed to them
|
2010-08-09 14:11:46 -07:00 |
|