Commit graph

434 commits

Author SHA1 Message Date
Raphael
05e6dada58 Fixing deploy friending 2010-07-16 09:59:06 -07:00
maxwell
65deaba558 MS IZ hcard, emptyfiles, routesw 2010-07-15 18:36:07 -07:00
Raphael
89cf2db10e fixing db seed 2010-07-15 15:47:27 -07:00
Raphael
fd18ac6c4b Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption 2010-07-15 13:06:46 -07:00
maxwell
99446d82c4 MS IZ more fixes 2010-07-15 10:30:51 -07:00
maxwell
f97218c005 MS IZ cleanup of pubsub stuff 2010-07-15 10:24:41 -07:00
maxwell
892eec1959 MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :( 2010-07-15 09:32:13 -07:00
Raphael
c82f41e740 Merging in master 2010-07-14 12:16:24 -07:00
maxwell
1b63fbbec7 DG MS added pubsub gem, added hub to message queue 2010-07-14 11:01:28 -07:00
ilya
8d525f2d4f fixed warzombie 2010-07-13 11:27:05 -07:00
maxwell
06eec9204a DG MS; person request is now request. refactoring as well. user verbiage for request actions 2010-07-08 18:28:39 -07:00
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
ilya
0587688d18 DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler 2010-07-06 02:15:49 -04:00
maxwell
2b2864b78d now its just a message for ie 6, 7 2010-07-01 17:12:21 -07:00
maxwell
8e94fc5b4f added mean message 2010-07-01 17:05:14 -07:00
ilya
5285753486 IZ warzombie route, the method is in the dsashboard controller 2010-07-01 13:28:17 -04:00
maxwell
46ab63de36 added will pagination action. 2010-06-28 21:56:58 -07:00
maxwell
ec01e2c016 Comments now working, but no AJAX, need to refresh to see them 2010-06-25 22:15:41 -07:00
maxwell
f696ffc3a6 fixed up some views, but some stuff feels like it broke 2010-06-21 16:46:19 -07:00
maxwell
63866a8128 playing 2010-06-18 23:47:42 -07:00
maxwell
d4bf2f539d DG MS; removed signup link and route 2010-06-18 10:48:37 -07:00
danielvincent
02137b9fb9 DG MS; receive hook working. 2010-06-17 18:29:56 -07:00
danielvincent
43207aeb41 pending: resolving post action in queue 2010-06-16 23:12:23 -07:00
maxwell
9e89b2e0a7 DG MS did some basic work on the dashboard controller and some super basic fallback partial view 2010-06-15 21:08:29 -07:00
danielvincent
45c926f790 DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs 2010-06-15 11:09:47 -07:00
maxwell
1a1887f77f DG MS completed bookmark story 2010-06-14 20:20:19 -07:00
maxwell
960db53b9b MS IZ DG completed crud for friend 2010-06-14 13:12:17 -07:00
maxwell
29c6f9fa0f DG, MS, IZ; status messages now functional 2010-06-13 22:11:16 -07:00
maxwell
28ba205ef3 blerg rspec cache sux 2010-06-13 21:08:17 -07:00
maxwell
1029fd5854 made devise routes slightly more intutive. chore completed MS 2010-06-13 16:28:48 -07:00
danielvincent
eaeafd3240 added authentication via devise 2010-06-12 21:56:50 -07:00
maxwell
e068707158 added nifty templates, and started a user model. session model is next 2010-06-12 15:26:37 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00