19 commits

Author	SHA1	Message	Date
Jonne Haß	e70e48d6ca	some refactoring regarding the law of demeter	2012-09-23 19:33:19 +02:00
Manuel Schölling	bdeae54c6c	Make Photos not inherit from Posts	2011-10-16 13:58:35 +02:00
danielgrippi	91e649977c	MS DG update copyright	2011-09-14 11:23:12 -07:00
Raphael Sofaer	efe79eb351	Fix stream on pages other than 1, rename raw_visible_posts to visible_posts	2011-04-13 14:35:20 -07:00
danielvincent	21fd546cd0	posts now have authors instead of people	2011-03-01 18:05:05 -08:00
Raphael	cbda6b8c58	58 failures with mysql	2010-12-21 17:14:52 -08:00
danielvincent	aa9966ea26	removed the word friend everywhere minus translation files	2010-11-12 20:22:55 -08:00
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	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	7ea3fe5bf1	MS DG; verifys implemented, but need more tests	2010-10-12 18:53:12 -07:00
danielvincent	2e8bba1a04	MS DG adding more to exporter and importer	2010-10-12 11:34:13 -07:00
danielvincent	948c5d9b02	DG MS; end of day.	2010-10-11 19:04:27 -07:00
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
danielvincent	0f5a09783d	positioning	2010-10-07 14:32:45 -07:00
danielvincent	09dad2d80f	DG MS; exporter includes comments. exporter spec	2010-10-07 14:10:14 -07:00
danielvincent	8a130a68aa	DG MS; xml exporter file added	2010-10-07 12:21:14 -07:00