Raphael
|
9f9395bc9c
|
visible_person_by_id should check against self.person.id
|
2010-08-17 19:51:29 -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 |
|
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 |
|
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
|
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 |
|
Raphael
|
26a892ab4c
|
putting email verification back in
|
2010-08-17 16:43:54 -07:00 |
|
Raphael
|
ba83cb9d29
|
Index on email
|
2010-08-17 16:24:52 -07:00 |
|
Raphael
|
88cb7aaa8b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 14:52:17 -07:00 |
|
ilya
|
fd539926c2
|
DG IZ; changed variable 'c' to 'comment'
|
2010-08-17 13:59:58 -07:00 |
|
Raphael
|
063164fea2
|
comma
|
2010-08-17 13:59:57 -07:00 |
|
Raphael
|
0fdb337076
|
Confirmable
|
2010-08-17 13:57:45 -07:00 |
|
ilya
|
b5c6bbd1df
|
DG IZ; moved commenting methods into User (from Person).
|
2010-08-17 13:56:52 -07:00 |
|
Raphael
|
771c594814
|
Take out pivotal only for a second
|
2010-08-17 13:49:18 -07:00 |
|
Raphael
|
e6768cb5c8
|
helper method
|
2010-08-17 13:21:29 -07:00 |
|
Raphael
|
1d6e132a9f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 13:07:26 -07:00 |
|
Raphael
|
d5c608c7ae
|
Removing welcome home line
|
2010-08-17 13:07:11 -07:00 |
|
Raphael
|
842b321dfa
|
User email checking, routes working again
|
2010-08-17 13:02:42 -07:00 |
|
ilya
|
2a90e59f1e
|
DG IZ the group should view the posts for the group (and yourself) w
|
2010-08-17 12:22:14 -07:00 |
|
ilya
|
2af41a0ea9
|
DG IZ; posts_for :group method in User
|
2010-08-17 12:14:02 -07:00 |
|
Raphael
|
ccbbf40584
|
validation lambda out to method
|
2010-08-17 11:48:59 -07:00 |
|
Raphael
|
015940b60e
|
Pass to the lambda
|
2010-08-17 11:45:47 -07:00 |
|
ilya
|
4f8b8ad3c5
|
DG IZ saving the post
|
2010-08-17 11:03:31 -07:00 |
|
Raphael
|
453cb06691
|
changing settings and deploy scripts, validating email
|
2010-08-17 11:01:30 -07:00 |
|
ilya
|
7316c6073c
|
DG IZ local person bug
|
2010-08-17 10:58:50 -07:00 |
|
ilya
|
0af6f7b0e5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:48:47 -07:00 |
|
ilya
|
5dff3369ad
|
DG IZ; removed puts statements.
|
2010-08-17 10:48:40 -07:00 |
|
ilya
|
a9c9619a54
|
DG IZ; posting from a user includes adding to the many posts association in said user
|
2010-08-17 10:43:18 -07:00 |
|
Raphael
|
72559cbce1
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:37:18 -07:00 |
|
Raphael
|
50919ef491
|
Requesting now searches the local server by email for a matching person.
|
2010-08-17 10:37:09 -07:00 |
|
ilya
|
5761d5db36
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:35:37 -07:00 |
|
ilya
|
dea6551374
|
DG IZ; moved post() into User from Person.
|
2010-08-17 10:35:25 -07:00 |
|
Raphael
|
e32315b6c6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:25:11 -07:00 |
|