Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
ilya
|
3014c4d057
|
silly little thing
|
2010-09-12 23:22:20 -07:00 |
|
ilya
|
a738807cf4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 22:56:29 -07:00 |
|
ilya
|
0896efa5d6
|
now requests are called requested people, same css but less hacky selection
|
2010-09-12 22:54:53 -07:00 |
|
Daniel Vincent Grippi
|
897074c869
|
replace in comment websocket action replaces one or more number instead of just the first
|
2010-09-12 22:33:51 -07:00 |
|
Daniel Vincent Grippi
|
c133233155
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 22:17:48 -07:00 |
|
Daniel Vincent Grippi
|
4bf8bc9c0b
|
wrong key being sent in recieve method for posts (group_id => group_ids)
|
2010-09-12 22:17:39 -07:00 |
|
ilya
|
2800f9351c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 22:14:44 -07:00 |
|
Daniel Vincent Grippi
|
945a6ffbeb
|
added a logger in post
|
2010-09-12 22:11:01 -07:00 |
|
ilya
|
3bd686143f
|
need to send it without data
|
2010-09-12 22:10:50 -07:00 |
|
Daniel Vincent Grippi
|
31a746db2f
|
group_ids to string in post
|
2010-09-12 22:05:07 -07:00 |
|
ilya
|
d80ba7ca58
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 21:57:59 -07:00 |
|
ilya
|
593f620216
|
a tiny change should make the things fadeout
|
2010-09-12 21:57:15 -07:00 |
|
Daniel Vincent Grippi
|
1ee78c28b7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 21:47:11 -07:00 |
|
Daniel Vincent Grippi
|
cf48079446
|
group_ids must be converted to strings
|
2010-09-12 21:47:03 -07:00 |
|
ilya
|
94ce3b3666
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 21:34:52 -07:00 |
|
Daniel Vincent Grippi
|
1874ebe51d
|
forgot to map to group ids in retraction
|
2010-09-12 21:33:39 -07:00 |
|
ilya
|
370e2ef688
|
not displaying requests in the remove
|
2010-09-12 21:31:03 -07:00 |
|
Daniel Vincent Grippi
|
a3ec81add0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 21:24:49 -07:00 |
|
Daniel Vincent Grippi
|
62994f1660
|
retractions should now actually websocket again
|
2010-09-12 21:24:22 -07:00 |
|
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 |
|