Commit graph

273 commits

Author SHA1 Message Date
Raphael
aebe7b97c0 DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
Raphael
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00
Raphael
73a6cd911b DG, RS; User person delegation fixed 2010-08-09 10:46:02 -07:00
Raphael
7076097ee4 RS, IZ; The tests are green. 2010-08-06 16:56:13 -07:00
Raphael
4350e17656 RS, IZ; removed lots of putses, fixed up request, parser, retractions 2010-08-06 16:01:39 -07:00
Raphael
f2e327d908 User factory now works 2010-08-06 13:27:42 -07:00
Raphael
0f596af5c4 Refactored message_queue getting, fixed retraction spec 2010-08-06 13:13:00 -07:00
Raphael
5b14c4822c RS, IZ; webhooks spec should use user.post 2010-08-06 12:19:40 -07:00
Raphael
62e6ea0756 Error rescue in parser now is specific to not a real type error 2010-08-06 12:14:51 -07:00
Raphael
d130b82e42 RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns? 2010-08-06 11:52:33 -07:00
Raphael
6449d20687 Working on devise mocking in helper specs 2010-08-06 11:19:40 -07:00
Raphael
b5cbfab36e RS, IZ; Comment spec now passes 2010-08-05 19:01:45 -07:00
maxwell
5d924dadf4 MS DG; 19 failing specs left 2010-08-05 17:16:51 -07:00
maxwell
7a1011c46c DG MS; webhook specs fixed 2010-08-05 15:41:32 -07:00
maxwell
5e6d0c1153 Merge branch 'master' of github.com:diaspora/diaspora_rails into
friend-refactor, also fixed more specs

Conflicts:
	app/models/person.rb
	app/models/user.rb
	spec/factories.rb
2010-08-05 15:13:05 -07:00
maxwell
cc04d4e08d MS DG; more tests pass after making person have many people 2010-08-05 13:25:31 -07:00
danielvincent
67d4aea1db DG MS; fixed album specs 2010-08-05 12:00:23 -07:00
danielvincent
dae8f26692 DG MS; fixed most photo specs 2010-08-05 11:56:37 -07:00
Raphael
bb66e87905 RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00
danielvincent
4827953bec DG MS; person specs are now passing. retraction on unfriend is now uncommented 2010-08-05 10:29:30 -07:00
danielvincent
42c0b82068 one failing test in Person. i have no idea. 2010-08-04 23:54:15 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
danielvincent
f2d7f35b84 unfriend still not removing association from bad_friend 2010-08-04 20:29:54 -07:00
danielvincent
c92a225556 DG MS; user-person relationship done. bunch of failing stuff. 2010-08-04 19:22:14 -07:00
Raphael
b8a2e8ecdf RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific 2010-08-04 16:13:32 -07:00
Raphael
e2c0ae2cee Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
b7fb844fdf more cleanup on Diaspora::OStatusParser 2010-08-04 00:57:46 -07:00
danielvincent
2938341b54 removed parse_ from every method name in Diaspora::OStatusParser 2010-08-04 00:47:29 -07:00
danielvincent
c5ace3069d diaspora module correctly loads everything (lazy) 2010-08-04 00:41:23 -07:00
Raphael
74691228d3 RS, IZ; All relevant controllers now create with user.post 2010-08-02 16:32:52 -07:00
Raphael
9fe37b1d8c RS, IZ; Cleaned up user spec, started to add current_user.post 2010-08-02 16:16:23 -07:00
Raphael
8432db34b3 RS; Fixed profile marshalling spec, now CI should pass! 2010-08-02 12:52:13 -07:00
Raphael
ac45960bbf Fixed album spec, condensed traversing tests to halve the time of the spec (It was reading the photos from disk on every spec) 2010-08-02 12:33:36 -07:00
Raphael
b8ae6b44a2 RS; Image filename is now the Photo model id 2010-08-02 10:05:34 -07:00
maxwell
6aa1fa1826 DG MS profiles send? who knows... 2010-07-29 15:53:38 -07:00
Raphael
3376057c33 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 13:58:49 -07:00
Raphael
f4bace85b3 No more key deletion in specs, parser included correctly 2010-07-29 12:45:43 -07:00
danielvincent
11a099914c on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited. 2010-07-29 11:07:44 -07:00
Raphael
9750684e61 Maybe because diasporaparser was moved out to a different file? 2010-07-29 10:10:17 -07:00
maxwell
049361ea15 MS profiles should send, need to just make the parser now 2010-07-28 18:32:00 -07:00
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -07:00
maxwell
bda87bbeab MS switched request new links to just the request link 2010-07-26 18:13:20 -07:00
Maxwell Salzberg
66f66b85a6 MS added test, things still seem broken though 2010-07-24 23:21:02 -07:00
maxwell
b797704a14 MS small pointless webhooks refactor 2010-07-24 16:11:32 -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
311a60f7b7 MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller 2010-07-23 21:16:36 -07:00
ilya
4eccf63fef Can't upload to other people's album 2010-07-23 16:26:05 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00