ilya
|
1e74acd9b0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 19:56:47 -07:00 |
|
ilya
|
6b7f0888d0
|
Testing ignore friend request on remote
|
2010-09-12 19:56:23 -07:00 |
|
Daniel Vincent Grippi
|
31df3cea11
|
friend pictures on group edit page should now display the default person image if friend's picture isn't present
|
2010-09-12 18:11:05 -07:00 |
|
Daniel Vincent Grippi
|
85944535dd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 17:57:51 -07:00 |
|
Raphael
|
a919c045ad
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 01:26:38 -07:00 |
|
ilya
|
9b07c780c3
|
the acceptance now works need to do the ignores and unfriend bucket
|
2010-09-11 23:31:43 -07:00 |
|
ilya
|
b1dcc4cf43
|
testing request acceptance on remote
|
2010-09-11 21:58:01 -07:00 |
|
Daniel Vincent Grippi
|
d5c623d03d
|
word change
|
2010-09-11 14:40:39 -07:00 |
|
maxwell
|
08233a74c5
|
MS added anohter logger so i can debug friend requests
|
2010-09-11 14:39:09 -07:00 |
|
Raphael
|
41726e6f87
|
Move deploy dir to deploy config yml
|
2010-09-11 14:04:27 -07:00 |
|
Daniel Vincent Grippi
|
e17500e702
|
missed one link...
|
2010-09-11 12:14:16 -07:00 |
|
Daniel Vincent Grippi
|
e72b558e19
|
fixed links in readme. added description used in our blog.
|
2010-09-11 12:13:47 -07:00 |
|
Daniel Vincent Grippi
|
c60c8039ac
|
made a quick set of instructions in the readme
|
2010-09-11 12:10:20 -07:00 |
|
Daniel Vincent Grippi
|
db5d000757
|
made a sticky request link on the bottom of every page
|
2010-09-11 12:09:55 -07:00 |
|
Daniel Vincent Grippi
|
7fefdd3753
|
minor cleanup
|
2010-09-11 08:59:25 -07:00 |
|
Daniel Vincent Grippi
|
c43d61e068
|
deploy_config now referencing master instead of salmon branch
|
2010-09-11 07:54:24 -07:00 |
|
Daniel Vincent Grippi
|
1092c7b8d1
|
moved manage to be its own tab on right
|
2010-09-11 07:53:45 -07:00 |
|
Daniel Vincent Grippi
|
266a896bde
|
mtweaking comments in stream
|
2010-09-10 23:55:33 -07:00 |
|
Daniel Vincent Grippi
|
95765139d6
|
link color less morbid.
|
2010-09-10 23:37:16 -07:00 |
|
Daniel Vincent Grippi
|
9c7e0e3bcb
|
minor sass tweaks
|
2010-09-10 23:16:46 -07:00 |
|
Raphael
|
ebd4bea5de
|
Adding a log statement to zombiefriends
|
2010-09-10 18:57:08 -07:00 |
|
Raphael
|
d9bb850b5b
|
pass group not id into send_friend_request
|
2010-09-10 17:00:27 -07:00 |
|
Raphael
|
17be027738
|
redirect to root instead of search
|
2010-09-10 16:52:28 -07:00 |
|
Raphael
|
b704704334
|
People index now works when there is a non-friend on the page
|
2010-09-10 16:49:09 -07:00 |
|
Raphael
|
04883f914f
|
Remove unused webhooks methods
|
2010-09-10 16:43:31 -07:00 |
|
Raphael
|
dd166921a4
|
Salmon friend retractions
|
2010-09-10 16:38:40 -07:00 |
|
Raphael
|
6afaf73c30
|
Merge branch 'salmon' of github.com:diaspora/diaspora
|
2010-09-10 16:27:13 -07:00 |
|
Raphael
|
ab6d631a27
|
White space in user file, deleting net/curl as unused
|
2010-09-10 16:25:19 -07:00 |
|
maxwell
|
98e882b2f0
|
MS reloading friend_request.person
|
2010-09-10 16:19:51 -07:00 |
|
Raphael
|
4922ebd84c
|
Finish removing encryption from retractions
|
2010-09-10 16:14:37 -07:00 |
|
Raphael
|
c170726f6c
|
Merge branch 'master' of github.com:diaspora/diaspora into salmon
|
2010-09-10 16:04:30 -07:00 |
|
Raphael
|
a44d40168a
|
Encryption removed from everything other than comments, most irrelevant specs removed
|
2010-09-10 16:04:09 -07:00 |
|
Daniel Vincent Grippi
|
0c5ab4f20e
|
undo for now
|
2010-09-10 15:44:36 -07:00 |
|
Daniel Vincent Grippi
|
ef6ce98c12
|
DG IZ alert on dragging a request, trying to check
|
2010-09-10 15:41:58 -07:00 |
|
Daniel Vincent Grippi
|
d3a8e27833
|
DG IZ; selector fix
|
2010-09-10 15:37:59 -07:00 |
|
Daniel Vincent Grippi
|
b4e3ea3937
|
another little fix
|
2010-09-10 15:33:16 -07:00 |
|
Daniel Vincent Grippi
|
9fd8cfcc99
|
DG IZ added the same structure as groups
|
2010-09-10 15:31:00 -07:00 |
|
Daniel Vincent Grippi
|
8afb590128
|
small fix
|
2010-09-10 15:28:11 -07:00 |
|
Daniel Vincent Grippi
|
4770616a26
|
DG IZ; small fix
|
2010-09-10 15:19:04 -07:00 |
|
Daniel Vincent Grippi
|
82a31228fa
|
DG IZ; requests bar added to group/edit
|
2010-09-10 15:07:55 -07:00 |
|
Daniel Vincent Grippi
|
136eb61b02
|
DG IZ; groups = relations. now you can rename groups in the manage relation page
|
2010-09-10 14:52:11 -07:00 |
|
Daniel Vincent Grippi
|
f70ade6705
|
DG IZ; moved info on the person show page
|
2010-09-10 13:52:12 -07:00 |
|
Raphael
|
cab8610bea
|
Actually use salmon to push comments
|
2010-09-10 10:38:16 -07:00 |
|
Raphael
|
aa1f3c6438
|
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
|
2010-09-10 10:31:23 -07:00 |
|
Raphael
|
68dc74e0b7
|
Tests pass again, use id => in retraction.perform
|
2010-09-09 18:15:30 -07:00 |
|
Raphael
|
7448684358
|
Return results of queries
|
2010-09-09 17:56:21 -07:00 |
|
Raphael
|
222847ca92
|
Using methods that exist can be helpful
|
2010-09-09 17:54:33 -07:00 |
|
Raphael
|
e9377a681c
|
Don't use push_to_groups for retractions
|
2010-09-09 17:52:35 -07:00 |
|
Raphael
|
2b1724c42f
|
Pass id to groups_with_post
|
2010-09-09 17:44:33 -07:00 |
|
Raphael
|
8b09d8107c
|
Add encryptable to profiles
|
2010-09-09 17:43:07 -07:00 |
|