Commit graph

260 commits

Author SHA1 Message Date
maxwell
cc04d4e08d MS DG; more tests pass after making person have many people 2010-08-05 13:25:31 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
Maxwell Salzberg
66f66b85a6 MS added test, things still seem broken though 2010-07-24 23:21:02 -07:00
maxwell
416f128ba8 MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00
Raphael
40435d6891 Commented out tests that require internets to function 2010-07-17 13:20:06 -07:00
maxwell
31629f8115 MS fixed webfinger spec regression 2010-07-16 23:11:23 -07:00
maxwell
f34e033bce MS IZ getting the profile 2010-07-16 21:59:40 -07:00
maxwell
a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	Gemfile
2010-07-16 21:33:57 -07:00
Raphael
2d5d3a2f2d commit more often 2010-07-15 13:29:21 -07:00
Raphael
fd18ac6c4b Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption 2010-07-15 13:06:46 -07:00
maxwell
f97218c005 MS IZ cleanup of pubsub stuff 2010-07-15 10:24:41 -07:00
Raphael
c82f41e740 Merging in master 2010-07-14 12:16:24 -07:00
Raphael
335f202e2b RS, IZ; Profiles are now embedded 2010-07-14 11:22:44 -07:00
maxwell
1b63fbbec7 DG MS added pubsub gem, added hub to message queue 2010-07-14 11:01:28 -07:00
maxwell
48adc9ebc1 DG MS; person object now properly stored with request object save 2010-07-09 14:07:35 -07:00
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00
maxwell
1fa2dfd6eb DG MS cleaning up friend request 2010-07-08 12:05:06 -07:00
maxwell
6293f9f585 socket is now a controller 2010-07-08 10:17:41 -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
bf0afeede0 i really have no clue why this works nwow 2010-07-07 16:41:42 -07:00
Raphael
2db3366ef4 RS, MS; test FILES are now in EM run blocks, tests are in next_ticks 2010-07-07 16:04:31 -07:00
maxwell
cc603a7943 autotest for rafi 2010-07-07 15:27:44 -07:00
danielvincent
24af7753fe DG IZ; fixed failing dashboard controller spec 2010-07-02 10:27:41 -07:00
maxwell
4d65cfab09 MS^2 Added the friends panel to application layout 2010-06-25 19:22:05 -07:00
ilya
c0167a445a RS, IZ; Ended spec pollution, fixed up blog spec 2010-06-25 18:04:09 -04: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
fb7ed9e0e7 DG MS pushing a small show page fix 2010-06-23 15:25:46 -07:00
Raphael
0ff87037cb Added inheritance spec to user 2010-06-23 11:28:53 -07:00
maxwell
989949a8c9 added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y 2010-06-22 15:14:55 -07:00
danielvincent
a1361da770 DG IZ; friend and owner now require a real name 2010-06-21 15:56:40 -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
Raphael Sofaer
ed26c82be4 RS, IZ; merged day's commits 2010-06-15 21:41:39 -07:00
maxwell
b8e2fd018f fixed dashboard test 2010-06-15 21:10:59 -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
4da68fc4b1 fixed merge error 2010-06-15 12:28:21 -07:00
ilya
a46b0479f4 IZ merge conflicts 2010-06-15 14:59:35 -04:00
ilya
653392f738 IZ factories in controller specs as well as bookmark 2010-06-15 14:56:32 -04: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
4532c39e93 DG MS; Status messages have owner field; defaults to user 2010-06-14 17:13:07 -07:00
maxwell
1f73c2351e DG MS IZ; Status message renders to and from xml; Friend model in place 2010-06-14 16:20:57 -07:00
maxwell
960db53b9b MS IZ DG completed crud for friend 2010-06-14 13:12:17 -07:00
maxwell
f6e662a3fa moved redirect commitment to cucumber, delivering stories 2010-06-14 11:41:15 -07:00
maxwell
0ff541ba43 fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS 2010-06-14 11:05:55 -07:00
maxwell
29c6f9fa0f DG, MS, IZ; status messages now functional 2010-06-13 22:11:16 -07:00
maxwell
85e6eb2132 added stray local files 2010-06-13 21:22:52 -07:00
maxwell
28ba205ef3 blerg rspec cache sux 2010-06-13 21:08:17 -07:00
maxwell
865d7d18cb user login now drops to a dashboard page 2010-06-13 20:00:31 -07:00
maxwell
1029fd5854 made devise routes slightly more intutive. chore completed MS 2010-06-13 16:28:48 -07:00
maxwell
c84c99f993 created the rspec runner so you dont have to worry about cleaning mongoid every run completed chore MS 2010-06-13 16:12:32 -07:00
maxwell
3fd7f2719b added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster 2010-06-13 15:46:40 -07:00
danielvincent
f9f12860b2 fixed spec bug 2010-06-12 22:04:21 -07:00
danielvincent
eaeafd3240 added authentication via devise 2010-06-12 21:56:50 -07:00
danielvincent
8ecaf240e6 user session model authenticates against users 2010-06-12 19:51:54 -07:00
maxwell
e068707158 added nifty templates, and started a user model. session model is next 2010-06-12 15:26:37 -07:00