Raphael
|
4a4686ce6e
|
refactored signature validation got specs passing
|
2010-08-17 23:21:00 -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
|
7c75a54d90
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 22:34:21 -07:00 |
|
Raphael
|
cb152ea3c3
|
Shortened user receive, moderated groups.first in the socketing
|
2010-08-17 22:34:01 -07:00 |
|
ilya
|
9ee10450c4
|
removing traces of bookmarks and blogs from specs
|
2010-08-17 22:32:13 -07:00 |
|
Raphael
|
29ecd53361
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 22:04:00 -07:00 |
|
Raphael
|
55d84b3288
|
Broke up user spec, put user update back in routes
|
2010-08-17 22:03:45 -07:00 |
|
ilya
|
6c729b382f
|
fixed some color on the header
|
2010-08-17 21:50:18 -07:00 |
|
Raphael
|
82f53663ab
|
remove user index
|
2010-08-17 20:39:05 -07:00 |
|
Raphael
|
9285839296
|
Merging in socket-group
|
2010-08-17 20:30:30 -07:00 |
|
Raphael
|
20bc88c0bf
|
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
|
2010-08-17 20:19:29 -07:00 |
|
Raphael
|
9fcc02a580
|
Ensure bson on visible person
|
2010-08-17 19:56:21 -07:00 |
|
Raphael
|
9f9395bc9c
|
visible_person_by_id should check against self.person.id
|
2010-08-17 19:51:29 -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
|
456e9e9634
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
|
2010-08-17 19:34:19 -07:00 |
|
Raphael
|
48756e77f3
|
Friend_by_id changed to visible_person_by_id
|
2010-08-17 19:32:42 -07:00 |
|
Raphael
|
eb84b39f93
|
change before to after
|
2010-08-17 19:11:59 -07:00 |
|
Raphael
|
e8e141b24e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 19:04:03 -07:00 |
|
Raphael
|
2b8e637934
|
no names in publisher
|
2010-08-17 19:03:47 -07:00 |
|
Raphael
|
f75ff0b680
|
Remove links from publisher
|
2010-08-17 18:57:26 -07:00 |
|
Raphael
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
Raphael
|
4fe6a54c09
|
seed groups
|
2010-08-17 18:54:27 -07:00 |
|
Raphael
|
1c91faa2c5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 18:52:35 -07:00 |
|
Raphael
|
43160496c9
|
Tommy
|
2010-08-17 18:52:15 -07:00 |
|
Raphael
|
d554b3ef1a
|
flashsocket
|
2010-08-17 18:49:23 -07:00 |
|
ilya
|
2614cb5add
|
DG IZ; find_all_by instead of find_by
|
2010-08-17 18:37:08 -07:00 |
|
Raphael
|
ffc9b00489
|
taking group seed out
|
2010-08-17 18:35:33 -07:00 |
|
Raphael
|
07549ed17e
|
Start with a group'
|
2010-08-17 18:30:08 -07:00 |
|
Raphael
|
8619584834
|
things mostly working
|
2010-08-17 18:27:50 -07:00 |
|
ilya
|
f4f377e7e7
|
DG IZ finding albums by person_id
|
2010-08-17 18:26:48 -07:00 |
|
ilya
|
daf08cd9f9
|
DG IZ posts by the user get websocketed on the group page and albums
get signed?
|
2010-08-17 18:06:35 -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 |
|
ilya
|
f15b3c46b2
|
DG IZ; reverted to before removing latest message methods
|
2010-08-17 17:40:48 -07:00 |
|
Raphael
|
bb85c46be1
|
syntax error
|
2010-08-17 17:28:17 -07:00 |
|
Raphael
|
244023ac47
|
Infield labels on sign in
|
2010-08-17 17:26:37 -07:00 |
|
Raphael
|
6f24a454c8
|
merge
|
2010-08-17 17:23:37 -07:00 |
|
Raphael
|
fb84daf68a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 17:21:38 -07:00 |
|
Raphael
|
1aefaedda1
|
merge
|
2010-08-17 17:21:10 -07:00 |
|
Raphael
|
08de5caf97
|
make signup page look better
|
2010-08-17 17:20:29 -07:00 |
|
ilya
|
054dafdf99
|
couple more
|
2010-08-17 17:16:11 -07:00 |
|
ilya
|
c1ff8544d3
|
removed a couple of js lines
|
2010-08-17 17:04:37 -07:00 |
|
ilya
|
e5036862f6
|
DG IZ removed the latest message javascript as well as the hash
|
2010-08-17 16:49:58 -07:00 |
|
Raphael
|
26a892ab4c
|
putting email verification back in
|
2010-08-17 16:43:54 -07:00 |
|
ilya
|
d211abb1bc
|
DG IZ on page for group js method now returns true
|
2010-08-17 16:32:14 -07:00 |
|
ilya
|
d5d1a2d00f
|
DG IZ; javascript variable misnamed
|
2010-08-17 16:29:51 -07:00 |
|
Raphael
|
ba83cb9d29
|
Index on email
|
2010-08-17 16:24:52 -07:00 |
|
Raphael
|
61d0485e3d
|
changing readme
|
2010-08-17 16:22:29 -07:00 |
|
ilya
|
5e95650ae3
|
DG IZ logger info
|
2010-08-17 16:11:25 -07:00 |
|