11 commits

Author	SHA1	Message	Date
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	360891496e	Check that time serializes correctly post-parse, not on string equality	2010-10-19 17:09:52 -07:00
maxwell	d61a227fc7	posts now serialize their created_at time	2010-10-14 16:49:08 -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
danielvincent	8720dfa950	DG MS; made test slower. posts now export correctly.	2010-10-12 15:33:08 -07:00
danielvincent	2e8bba1a04	MS DG adding more to exporter and importer	2010-10-12 11:34:13 -07:00
maxwell	0541833c18	stop the file include madness. using File.join and Rails.root for includes everywhere I could	2010-10-10 11:54:08 -07:00
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
danielvincent	7a3d168123	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-07 14:17:22 -07:00