Commit graph

893 commits

Author SHA1 Message Date
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00
maxwell
6293f9f585 socket is now a controller 2010-07-08 10:17:41 -07:00
maxwell
58ed75a289 MS socket now works in the server, but I can't figure out how to mock this stuff 2010-07-07 22:20:15 -07:00
maxwell
a35892428c Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-07 20:09:27 -07:00
maxwell
947f1a60e7 RS MS added url for for the socket controller 2010-07-07 18:59:32 -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
maxwell
cc603a7943 autotest for rafi 2010-07-07 15:27:44 -07:00
danielvincent
c27bc09e75 fixed user image bug 2010-07-01 16:35:44 -07:00
danielvincent
c0a744b2ce owner picture selector in application helper 2010-07-01 15:34:35 -07:00
maxwell
fcbe8e42a0 RS MS slightly less explosive end if you call real name on someone that doesn't have a profile 2010-06-29 20:54:53 -07:00
maxwell
36b5a90d34 MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works 2010-06-28 17:35:38 -07:00
ilya
25198a7e86 IZ, RS; Moved XML parser to lib 2010-06-28 15:56:46 -04:00
Maxwell Salzberg
2bbfcb0bb1 putting debug in for master so I can check deployed servers out 2010-06-26 14:16:19 -07:00
maxwell
6467f943da MS^2 Comments serialize and deserialize properly 2010-06-25 22:49:53 -07:00
maxwell
e4e2d52bcb reverting typos 2010-06-25 22:29:36 -07:00
maxwell
0d700046c4 MS^2 Object parser can handle comments 2010-06-25 22:29:08 -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
64c1d99b8c MS found the stupid nil. from here, i have 33 failures. 2010-06-24 22:20:09 -07:00
ilya
81157190ac RS, IZ, Merged from master 2010-06-23 20:19:25 -04:00
ilya
8829714e2d RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant 2010-06-23 20:17:44 -04:00
maxwell
9fa26f020e DG MS; clicking on a person's name redirects to that person's post stream 2010-06-23 14:32:51 -07:00
maxwell
663b99924f Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-23 01:26:06 -07:00
maxwell
60fa7e3ac4 view stuffs 2010-06-23 01:26:00 -07:00
Maxwell Salzberg
e6e1c22b07 DG; webhooks apply incoming posts to current friends with a silent fail on no match 2010-06-23 01:20:56 -07:00
maxwell
3064d208eb added firefox websocket stuffs, only loads if it is not safari or chrome 2010-06-22 14:31:16 -07:00
maxwell
f696ffc3a6 fixed up some views, but some stuff feels like it broke 2010-06-21 16:46:19 -07:00
maxwell
a0417d13af fixed merge with master 2010-06-21 14:38:38 -07:00
danielvincent
06271d5821 added dumb partial switcher function in dashboard controller 2010-06-21 14:23:59 -07:00
maxwell
655dd64a54 websockets work 2010-06-21 14:12:05 -07:00
maxwell
5286b6be69 DG MS; require XML root node; added header to XML (not yet required) 2010-06-18 18:03:13 -07:00
maxwell
34df8fa946 DG MS; resolved unknown types going to receive handler. only post objects are inputted 2010-06-18 16:47:34 -07:00
maxwell
c430aaff18 DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml 2010-06-18 14:35:51 -07:00
danielvincent
02137b9fb9 DG MS; receive hook working. 2010-06-17 18:29:56 -07:00
Raphael Sofaer
ed26c82be4 RS, IZ; merged day's commits 2010-06-15 21:41:39 -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
Raphael Sofaer
c4b931c309 IZ RS getting remote messages (not yet done) 2010-06-15 18:41:54 -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
danielvincent
d70cf5b7a7 DG RS; fixed newest messages bug in view. moved to helper. 2010-06-15 10:11:28 -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
85e6eb2132 added stray local files 2010-06-13 21:22:52 -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