Commit graph

33 commits

Author SHA1 Message Date
Sarah Mei
e414b1c553 Fix some comment specs (still one failing). Remove warning from receive spec. 2010-10-21 06:45:15 -07:00
Raphael
bef6d76bfd Refactor specs a little more 2010-10-20 17:53:09 -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
Raphael
43dd95147e Starting to remove database-cleaner 2010-10-19 23:29:58 -07:00
ilya
0896052b80 remote comment spec, which passed surprisingly, the comment contains the person 2010-10-12 15:31:54 -07:00
ilya
ee2d134cb0 receiving spec is green 2010-10-11 19:20:00 -07: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
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
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
2dd2f38442 Attempting to make comments from unknown users save 2010-08-26 19:15:22 -07:00
ilya
21f70c643d DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing 2010-08-18 16:15:10 -07:00
Raphael
ad07521e07 Made a few more tests pass 2010-08-16 16:22:46 -07:00
maxwell
a45d852f30 MS IZ request specs now PASS 2010-08-10 17:36:25 -07:00
Raphael
91b42ac0e2 Specs now mostly pass again, one is failing 2010-08-09 18:06:09 -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
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
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
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -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
e696ef7023 comments now go go go and are tested RS MS 2010-06-30 16:24:44 -07:00
maxwell
fcdba64828 pushing to test comment passing 2010-06-30 13:54:09 -07:00
maxwell
ec01e2c016 Comments now working, but no AJAX, need to refresh to see them 2010-06-25 22:15:41 -07:00