nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3325 commits 4 branches 0 tags 121 MiB
Commit graph

413 commits

Author SHA1 Message Date
ilya
cbd3487705 moved the nailer to the end so setup of mailer doesnt mess with the communitcation 2010-10-22 12:00:14 -07:00
ilya
9a217d1fa8 MS IZ request acceptance email 2010-10-22 11:55:50 -07:00
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -07:00
ilya
80cd4761f3 started the new invitation email 2010-10-22 00:49:01 -07:00
Sarah Mei
669a7cabb2 Use diaspora gemset. Simplify rake runner. 2010-10-20 21:43:03 -07:00
Sarah Mei
560910b53d More cruisecontrol bits 2010-10-20 20:47:07 -07:00
Sarah Mei
73f0e17f5a Converting to cruisecontrol.rb 2010-10-20 20:39:13 -07:00
ilya
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -07:00
ilya
8fddb4ecf5 MS IZ added test concerning people in multiple aspects 2010-10-20 13:19:32 -07:00
ilya
992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/models/aspect_spec.rb
 2010-10-20 11:30:06 -07:00
Raphael
0758f9245f Clean up specs a little, fix unfriending 2010-10-20 10:28:08 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 09:39:32 -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
maxwell
e7f84f5434 fix hcard when parsing friend photo 2010-10-19 20:46:43 -07:00
ilya
e3ffd2ffe7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 18:26:06 -07:00
ilya
b31b2de6f5 MS IZ aspect add and delete for a person 2010-10-19 18:25:59 -07:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
maxwell
11925ded2b moving branches 2010-10-14 19:15:32 -07:00
maxwell
e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import 
Conflicts:
	app/controllers/users_controller.rb
 2010-10-13 23:09:48 -07:00
maxwell
a86d965079 DG MS; importer now takes params for username, password, and diaspora handle 2010-10-13 17:07:16 -07:00
maxwell
f04934cbae DG MS; ensure aspect post_ids are only for user 2010-10-13 16:54:18 -07:00
maxwell
b395208a51 DG MS; added more stuff to importer. 2010-10-13 16:42:27 -07:00
maxwell
637a79a99d DG MS; spec for clean_aspects 2010-10-13 13:28:10 -07:00
maxwell
55227f3f72 DG MS; filter_post method, aspect_clean method 2010-10-13 13:10:08 -07:00
Raphael
9a1590fa02 Move user module requires out to the user modules definition file 2010-10-13 11:18:06 -07:00
danielvincent
0315869a24 all specs should pass again after merge 2010-10-13 09:43:58 -07:00
danielvincent
59c3be41b3 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-13 09:21:27 -07:00
danielvincent
7ea3fe5bf1 MS DG; verifys implemented, but need more tests 2010-10-12 18:53:12 -07:00
danielvincent
92e5622247 DG MS; adding verification methods to importer. 2010-10-12 17:41:09 -07:00
ilya
9b249281a1 moved verify comment sig before any saving goes on 2010-10-12 16:01:36 -07:00
ilya
b53462ee93 Merge branch 'malicious_friend_refactor' of github.com:diaspora/diaspora 2010-10-12 15:55:02 -07:00
ilya
c00a70dde1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-12 15:54:37 -07:00
danielvincent
8720dfa950 DG MS; made test slower. posts now export correctly. 2010-10-12 15:33:08 -07:00
ilya
d8439c82ee going calling by webfinger only once 2010-10-12 12:21:57 -07:00
danielvincent
1d1ff7e330 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-12 11:34:31 -07:00
danielvincent
2e8bba1a04 MS DG adding more to exporter and importer 2010-10-12 11:34:13 -07:00
ilya
ee2d134cb0 receiving spec is green 2010-10-11 19:20:00 -07:00
danielvincent
948c5d9b02 DG MS; end of day. 2010-10-11 19:04:27 -07:00
ilya
03df0ff716 parser spec is green 2010-10-11 18:22:19 -07:00
Raphael
c8f864a69b Finish fixing move_private_key 2010-10-11 17:22:53 -07:00
danielvincent
b2f3074eb0 DG MS; scenario for importer spec 2010-10-11 17:00:42 -07:00
Raphael
a372ec33be fixing uninitialized constant in rake task 2010-10-11 16:36:34 -07:00
danielvincent
0f7807222b DG MS; cleaned up method 2010-10-11 11:38:08 -07:00
danielvincent
9162a4a168 DG MS; 404 show pages for objects that don't exist for given user 2010-10-11 11:32:20 -07:00
ilya
3887712115 slight refactor of receiving spec, wrote a spec that exposed malicious friend attack 
vector
 2010-10-09 21:34:53 -07:00
Sarah Mei
c646db956e CI does a proper export. FINALLY. 2010-10-08 21:13:13 -06:00