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 |
|
Raphael
|
f4d6a04f4f
|
Get objects by bson id
|
2010-08-16 11:46:36 -07:00 |
|
Raphael
|
4c731bf818
|
special-casing local webfinger
|
2010-08-16 11:29:14 -07:00 |
|
Raphael
|
99fb383dc0
|
BSONify ids in by_id methods
|
2010-08-16 11:13:00 -07:00 |
|
Raphael
|
eb793ea129
|
Took out a couple more references to User.owner
|
2010-08-16 11:07:18 -07:00 |
|
Raphael
|
3efa36587a
|
Took out a bunch of user.owner references
|
2010-08-16 11:01:58 -07:00 |
|
Raphael
|
26abc68236
|
Use group_by_id or friend_by_id, no querying on friends or groups
|
2010-08-16 10:50:38 -07:00 |
|
Raphael
|
0e67ef8d7e
|
Inspect the friend before calling unfriended by
|
2010-08-16 10:38:36 -07:00 |
|
Raphael
|
ad2d8f8b46
|
Specify id field in the query whose result is passed to unfriended_by
|
2010-08-16 10:37:07 -07:00 |
|
Raphael
|
e84b25b3f5
|
Log the xml again
|
2010-08-16 10:31:39 -07:00 |
|
ilya
|
053ed9176d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-16 10:00:25 -07:00 |
|
ilya
|
d0c02859e6
|
DG IZ got one more log statement in the user person retraction
|
2010-08-16 10:00:04 -07:00 |
|
danielvincent
|
f1f827120b
|
intentional failing test in user for tomorrow.
|
2010-08-15 21:03:19 -07:00 |
|
danielvincent
|
80b81c1ae1
|
comment now validates presence of text. also, removed unused method overriding ==.
|
2010-08-15 19:28:59 -07:00 |
|
ilya
|
22910ef4ce
|
Check retraction signature on person retraction
|
2010-08-13 19:09:55 -07:00 |
|
ilya
|
99c8869b8f
|
Removing a friend now deletes them from the group(s) they are in
|
2010-08-13 18:56:33 -07:00 |
|
ilya
|
ac40f7974e
|
RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend
|
2010-08-13 18:37:09 -07:00 |
|
ilya
|
bd271b7bec
|
RS, IZ; Refactored the user unfriend and unfriended_by
|
2010-08-13 17:33:26 -07:00 |
|
ilya
|
7bd1193c5e
|
RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions
|
2010-08-13 11:19:20 -07:00 |
|
ilya
|
1fcb033b68
|
RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass
|
2010-08-13 10:55:18 -07:00 |
|
ilya
|
23fc799b4d
|
Turning up logging on friend request receive
|
2010-08-13 10:04:33 -07:00 |
|
ilya
|
3d57fb7f78
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-13 09:47:29 -07:00 |
|