Raphael
|
20bc88c0bf
|
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
|
2010-08-17 20:19:29 -07:00 |
|
Raphael
|
48756e77f3
|
Friend_by_id changed to visible_person_by_id
|
2010-08-17 19:32:42 -07:00 |
|
Raphael
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
ilya
|
2614cb5add
|
DG IZ; find_all_by instead of find_by
|
2010-08-17 18:37:08 -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 |
|
ilya
|
f15b3c46b2
|
DG IZ; reverted to before removing latest message methods
|
2010-08-17 17:40:48 -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
|
ba83cb9d29
|
Index on email
|
2010-08-17 16:24:52 -07:00 |
|
ilya
|
5e95650ae3
|
DG IZ logger info
|
2010-08-17 16:11:25 -07:00 |
|
ilya
|
f70cf4a60a
|
DG IZ first group for now, added logging statements
|
2010-08-17 16:09:55 -07:00 |
|
ilya
|
87bc9dad1d
|
DG IZ added group id to the action hash
|
2010-08-17 15:27:12 -07:00 |
|
ilya
|
fd539926c2
|
DG IZ; changed variable 'c' to 'comment'
|
2010-08-17 13:59:58 -07:00 |
|
ilya
|
b5c6bbd1df
|
DG IZ; moved commenting methods into User (from Person).
|
2010-08-17 13:56:52 -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 |
|
ilya
|
4f8b8ad3c5
|
DG IZ saving the post
|
2010-08-17 11:03:31 -07:00 |
|
ilya
|
0af6f7b0e5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:48:47 -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 |
|
Raphael
|
2c1c5df281
|
Moved search specs, renamed method
|
2010-08-17 10:24:59 -07:00 |
|
danielvincent
|
7e5ace7cbc
|
minor cleanup in models
|
2010-08-16 22:44:22 -07:00 |
|
ilya
|
1d92d11841
|
DG IZ; user refs are incremented as well as decremented for Posts
|
2010-08-16 20:39:24 -07:00 |
|
ilya
|
74c70d9410
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/models/user.rb
spec/lib/diaspora_parser_spec.rb
|
2010-08-16 18:18:30 -07:00 |
|
ilya
|
b5594ad6bc
|
DG IZ; post user refs started (permissions)
|
2010-08-16 18:11:23 -07:00 |
|
Raphael
|
eae4053902
|
Encryption removed from callbacks, except retractions sort of. verification is in user.receive
|
2010-08-16 17:23:54 -07:00 |
|
Raphael
|
fbee1aabb1
|
Special casing comments from people that you are not friends with so it accepts them
|
2010-08-16 16:32:20 -07:00 |
|
Raphael
|
3ff4387cd8
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-16 16:22:55 -07:00 |
|
Raphael
|
ad07521e07
|
Made a few more tests pass
|
2010-08-16 16:22:46 -07:00 |
|
ilya
|
b3d8f59c77
|
removed many posts association within group model
|
2010-08-16 15:51:31 -07:00 |
|
Raphael
|
3a591b0713
|
Merging in friend-refactor...
|
2010-08-16 15:35:14 -07:00 |
|
Raphael
|
b0537e2f34
|
Comments pushing in the right directions
|
2010-08-16 15:04:09 -07:00 |
|
Raphael
|
fa2e621b0f
|
Syntax error
|
2010-08-16 14:24:30 -07:00 |
|
Raphael
|
e4af2ccb1f
|
Rename send_comment to dispatch_comment, simplify it
|
2010-08-16 14:22:14 -07:00 |
|
Raphael
|
71aaa9240c
|
only socket if the object isn't yours
|
2010-08-16 14:18:08 -07:00 |
|
Raphael
|
b463958f0d
|
Check ownership on the comment's post
|
2010-08-16 14:06:52 -07:00 |
|
Raphael
|
deeb4832c1
|
Error: insufficient parenthases
|
2010-08-16 14:02:26 -07:00 |
|
Raphael
|
1f40ea23b6
|
logging is awesome
|
2010-08-16 13:58:05 -07:00 |
|
Raphael
|
91b0a1e8f9
|
PAAAARSER
|
2010-08-16 13:51:49 -07:00 |
|
Raphael
|
f8e2e6bf2d
|
Infinite loops are the best
|
2010-08-16 13:49:48 -07:00 |
|
Raphael
|
598c646b07
|
Hack to get comments working for now
|
2010-08-16 12:56:02 -07:00 |
|
Raphael
|
1f0ca49ce5
|
url, not user.url
|
2010-08-16 12:29:26 -07:00 |
|
Raphael
|
fb8d3b3e85
|
Check for local person before destroying accepted request
|
2010-08-16 12:26:15 -07:00 |
|
Raphael
|
4f22222b30
|
Splitting accept_friend_request into two methods
|
2010-08-16 12:10:23 -07:00 |
|
Raphael
|
00a9bd820b
|
Parser confused :(
|
2010-08-16 11:50:43 -07:00 |
|
Raphael
|
a8b402636a
|
Shorten ensure_bson
|
2010-08-16 11:47:23 -07:00 |
|