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

10 commits

Author SHA1 Message Date
zhitomirskiyi
917d1838de MS IZ specs are green 2010-10-25 18:55:51 -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
b395208a51 DG MS; added more stuff to importer. 2010-10-13 16:42:27 -07:00
maxwell
2c40fa5ebf DG MS; spec for clean_aspects 2010-10-13 13:32:22 -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
danielvincent
0315869a24 all specs should pass again after merge 2010-10-13 09:43:58 -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