Raphael
|
a9b587ca06
|
Adding in deploy config for production
|
2010-09-14 22:31:57 -07:00 |
|
Daniel Vincent Grippi
|
c1a9a89be7
|
Merge branch 'production' of github.com:diaspora/diaspora into production
Conflicts:
app/models/user.rb
config/deploy.rb
spec/factories.rb
spec/models/request_spec.rb
spec/spec_helper.rb
|
2010-09-14 11:08:18 -07:00 |
|
Daniel Vincent Grippi
|
da8ec589b7
|
RS, DG; display the correct tab on manage, change edit to manage
|
2010-09-14 10:05:59 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
Raphael
|
c6aff4a562
|
making the hcard work
|
2010-09-09 13:02:59 -07:00 |
|
Raphael
|
960d40278c
|
Add username, login with username or email
|
2010-09-08 10:59:08 -07:00 |
|
maxwell
|
baa048c579
|
MS changed some bundler stuff
|
2010-09-07 17:17:57 -07:00 |
|
maxwell
|
804777f9ae
|
MS; updated to released rails
|
2010-09-07 16:47:53 -07:00 |
|
Raphael
|
fad32c12c3
|
Move routes around for clarity
|
2010-08-28 13:08:10 -07:00 |
|
maxwell
|
34cb15c423
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-27 13:33:39 -07:00 |
|
maxwell
|
d1bac3e078
|
MS added a log route for easy access
|
2010-08-27 13:33:28 -07:00 |
|
Raphael
|
7223d21721
|
Add singular move friend route, it must be eliminated later
|
2010-08-27 12:27:16 -07:00 |
|
Raphael
|
5ff1bdae90
|
Groups can now be batch edited
|
2010-08-27 12:23:20 -07:00 |
|
maxwell
|
a26229223c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:07:49 -07:00 |
|
maxwell
|
b4174c664e
|
you can now reassign a peson's group
|
2010-08-25 18:07:31 -07:00 |
|
Raphael
|
00f8a3e628
|
removed ensure_bson in user. added to_id method to String and ObjectID classes
|
2010-08-25 17:11:57 -07:00 |
|
maxwell
|
68bd5bf5f5
|
MS merging in master again
|
2010-08-24 16:21:20 -07:00 |
|
ilya
|
45f3eb2a9a
|
trying yet again
|
2010-08-24 15:37:55 -07:00 |
|
maxwell
|
46f062a5f3
|
fixing merge confilts
|
2010-08-24 14:50:01 -07:00 |
|
maxwell
|
00be2a6c40
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-08-24 14:46:02 -07:00 |
|
Raphael
|
143db96d7e
|
No more socket debug
|
2010-08-24 14:45:50 -07:00 |
|
maxwell
|
f5316fb3c1
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-08-24 14:45:04 -07:00 |
|
Raphael
|
03abd1ac21
|
Remove statuS MESsages new page. TaKE New OUt OF ROutes
|
2010-08-24 14:44:32 -07:00 |
|
Raphael
|
db33d94f07
|
Render nothing on status_messages create, Websockets now honestly
support multiple groups.
|
2010-08-24 14:36:03 -07:00 |
|
maxwell
|
4f63f60b03
|
MS merging, and added a dumb check for the email validating twice
|
2010-08-24 14:03:57 -07:00 |
|
Raphael
|
b5bb61a135
|
Merging master into production
|
2010-08-24 11:18:42 -07:00 |
|
Raphael
|
6ab6dc1c3a
|
Removing some unused routes
|
2010-08-24 11:06:56 -07:00 |
|
Raphael
|
ed99532a83
|
memory leak gone for real
|
2010-08-23 16:52:19 -07:00 |
|
Raphael
|
74be86395b
|
Changing env back to development mode, the memory leak is likely fixed
|
2010-08-23 16:33:44 -07:00 |
|
Raphael
|
efb4100e01
|
Split up socket debug and app debug
|
2010-08-23 13:58:09 -07:00 |
|
Raphael
|
97aa8a4dc9
|
No photos index route
|
2010-08-23 13:57:33 -07:00 |
|
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 |
|