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
|
0417c53a4c
|
changing branch back to master
|
2010-08-16 15:36:08 -07:00 |
|
Raphael
|
3a591b0713
|
Merging in friend-refactor...
|
2010-08-16 15:35:14 -07:00 |
|
ilya
|
16a4cbc4e2
|
DG IZ redirect to requests on error
|
2010-08-16 15:21:45 -07:00 |
|
Raphael
|
6bb8c52dc4
|
Syntax error in requests
|
2010-08-16 15:16:29 -07:00 |
|
ilya
|
7e7b71efd4
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-16 15:08:36 -07:00 |
|
ilya
|
33ed838b79
|
DG IZ added an error message on request delete
|
2010-08-16 15:08:05 -07:00 |
|
Raphael
|
2e3066d82d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-16 15:04:20 -07:00 |
|
Raphael
|
b0537e2f34
|
Comments pushing in the right directions
|
2010-08-16 15:04:09 -07:00 |
|
ilya
|
4a36df29e5
|
DG IZ now the links are of button style
|
2010-08-16 14:59:23 -07:00 |
|
ilya
|
92aa72447f
|
DG IZ fixed the css in selector
|
2010-08-16 14:57:30 -07:00 |
|
ilya
|
373321beef
|
DG IZ made the selector box going to the right thing by passing only the id
|
2010-08-16 14:52:59 -07:00 |
|
ilya
|
97e5468cea
|
adding the user to the correct group
|
2010-08-16 14:46:15 -07:00 |
|
ilya
|
6a3eb97fd4
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 14:43:13 -07:00 |
|
ilya
|
b1c29083df
|
changed the link data-method
|
2010-08-16 14:34:16 -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
|
e2d5bf909f
|
Call right method in dev_utilities, clear junk out of comments helper
|
2010-08-16 12:45:31 -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
|
d7a9c3c087
|
Take out another couple friends.first and replace with friend_by_id
|
2010-08-16 12:18:36 -07:00 |
|
Raphael
|
4f22222b30
|
Splitting accept_friend_request into two methods
|
2010-08-16 12:10:23 -07:00 |
|
ilya
|
2bc9d0156d
|
2 arguments in the hidden field
|
2010-08-16 11:59:13 -07:00 |
|
Raphael
|
b37b8303d3
|
Check for friending yourself in requests helper
|
2010-08-16 11:55:32 -07:00 |
|
ilya
|
9df38199ab
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 11:50:51 -07:00 |
|
Raphael
|
00a9bd820b
|
Parser confused :(
|
2010-08-16 11:50:43 -07:00 |
|
ilya
|
122da43058
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 11:50:04 -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 |
|
ilya
|
114dfe9b41
|
seting the numbers again
|
2010-08-16 11:46:18 -07:00 |
|
ilya
|
c1f314ff89
|
removed friending from seed
|
2010-08-16 11:41:39 -07:00 |
|
ilya
|
121d186486
|
branch in deploy
|
2010-08-16 11:40:21 -07:00 |
|
ilya
|
0ee03afe1d
|
DG IZ selector box on request page
|
2010-08-16 11:39:33 -07:00 |
|
Raphael
|
2c1a67eb0f
|
Take thin stop out of stop_thin
|
2010-08-16 11:30:37 -07:00 |
|
Raphael
|
4c731bf818
|
special-casing local webfinger
|
2010-08-16 11:29:14 -07:00 |
|
Raphael
|
6ae4c31e05
|
Person show should be scoped through user
|
2010-08-16 11:18:52 -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 |
|