Commit graph

62 commits

Author SHA1 Message Date
Raphael
d5a4de58b3 User#post is now like a future controller, Photo#instantiate no longer saves 2010-11-02 19:16:02 -07:00
maxwell
4de89df4dc MS IZ setting the diaspora handle in photo instantiate 2010-11-02 18:32:02 -07:00
maxwell
3baa8b4552 IZ MS two pending photo specs now pass 2010-11-02 16:49:40 -07:00
Raphael
20d5daafbc Two pending specs on photo serialization for Max and Ilya 2010-11-02 16:41:53 -07:00
maxwell
19bbf8ce4d IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive 2010-11-02 12:38:30 -07:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
Raphael
99eb25762d Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
danielvincent
a7df1bca68 photos do not require an album. uploading files on a user's photos#index page will post to all aspects. 2010-10-29 10:38:17 -07:00
Sarah Mei
14fedf5369 GAHHH STOP EMAILING ME (specs pass)
Also, added attr_protected to Photo#person and Photo#person_id.
2010-10-29 00:59:26 -07:00
Raphael
512f40eac2 attr_accessible on Post 2010-10-28 15:50:19 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 1481056af2.
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'"
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
maxwell
e7f764ffeb attack vector where you take posts from valid (unknown) diaspora people is now fixed 2010-10-20 00:42:33 -07:00
Raphael
74ec629b01 user_friending_spec passes again 2010-10-19 23:29:59 -07:00
Raphael
52f7350f78 Fix a couple more specs 2010-10-19 23:29:59 -07:00
ilya
a068ee532d almost all green 2010-10-12 11:17:29 -07:00
Raphael
c30155e9a1 Remove outdated photo spec 2010-10-10 15:04:57 -07:00
Sarah Mei
899d82b766 Fix 1 of 2 pending photo specs. 2010-10-08 02:15:07 -06:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Stephen Caudill
821643deb9 Use the new style of spec_helper require 2010-09-25 11:27:59 -04:00
Raphael
950c6a7cab Merge branch '1.9.2' into HEAD
Conflicts:
	app/models/photo.rb
2010-09-24 14:36:00 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
b05d106aed Remove user_refs from Person, put pendings in the broken photo specs 2010-09-13 12:16:43 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
00f8a3e628 removed ensure_bson in user. added to_id method to String and ObjectID classes 2010-08-25 17:11:57 -07:00
Raphael
41aa8ed10e Specs pass again, need to make albums have a group 2010-08-24 17:12:27 -07:00
ilya
5cae2b21b1 RS, IZ fixed the url for the image 2010-08-18 18:06:13 -07:00
ilya
76b4b55e98 Added spec for remote photo url setting to photos 2010-08-18 17:39:38 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -07:00
Raphael
39c96bfd04 Changing to a smaller pic in the tests 2010-08-18 16:00:06 -07:00
Raphael
4a4686ce6e refactored signature validation got specs passing 2010-08-17 23:21:00 -07:00
Raphael
eae4053902 Encryption removed from callbacks, except retractions sort of. verification is in user.receive 2010-08-16 17:23:54 -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
0f596af5c4 Refactored message_queue getting, fixed retraction spec 2010-08-06 13:13:00 -07:00
danielvincent
dae8f26692 DG MS; fixed most photo specs 2010-08-05 11:56:37 -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
Raphael
b8ae6b44a2 RS; Image filename is now the Photo model id 2010-08-02 10:05:34 -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
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -07:00
ilya
41c358d53c Storing in phototest 2010-07-22 11:43:59 -07:00
ilya
24f8b33f2f Tests all pass! 2010-07-22 11:36:36 -07:00