ilya
|
f5811df5b7
|
DG IZ; added info text to add new friend button
|
2010-08-18 11:59:20 -07:00 |
|
Raphael
|
5e439bdb28
|
Ensure_bson on groups_with_person
|
2010-08-18 11:56:11 -07:00 |
|
Raphael
|
b7d648e173
|
Validate presence of name on group
|
2010-08-18 11:54:44 -07:00 |
|
Raphael
|
4cd46abaac
|
render nothing at the top
|
2010-08-18 11:48:32 -07:00 |
|
Raphael
|
10aef7a0a3
|
Begin rescue on publics controller to make the post for nonexistent user error more readable
|
2010-08-18 11:46:28 -07:00 |
|
ilya
|
4d86933f4a
|
DG IZ; user's visible posts method queries group objects for their posts
|
2010-08-18 11:40:02 -07:00 |
|
Raphael
|
d640c0672f
|
switch deploy branch to actually be one we are working on
|
2010-08-18 10:56:09 -07:00 |
|
ilya
|
055c222fc2
|
DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial
|
2010-08-18 10:53:43 -07:00 |
|
ilya
|
b0088c73d8
|
DG IZ; user's own post gets referenced in group model
|
2010-08-18 10:37:33 -07:00 |
|
Raphael
|
1685e0c28b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
|
2010-08-18 10:13:25 -07:00 |
|
Raphael
|
045878de64
|
call ensure_bson once in visible_person_by_id and group_by_id
|
2010-08-18 10:12:22 -07:00 |
|
Raphael
|
b99a86e6bd
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
|
2010-08-18 10:10:20 -07:00 |
|
Raphael
|
9a188fd9f0
|
Don't try to unsocket albums
|
2010-08-18 10:08:38 -07:00 |
|
Raphael
|
36f8289522
|
Fixing retractions on albums, adding back remove_from_view
|
2010-08-18 10:03:37 -07:00 |
|
danielvincent
|
2409fd3f20
|
user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self
|
2010-08-18 02:40:53 -07:00 |
|
Raphael
|
539316a235
|
Removing posts relation from person
|
2010-08-17 23:50:07 -07:00 |
|
Raphael
|
98a0a3032a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 23:28:00 -07:00 |
|
Raphael
|
42cc1da9f6
|
Removing posts array from person
|
2010-08-17 23:27:17 -07:00 |
|
ilya
|
501bcdd197
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 23:25:33 -07:00 |
|
ilya
|
c501707f80
|
DG IZ posts_for to visible posts
|
2010-08-17 23:24:42 -07:00 |
|
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 |
|