10 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
danielvincent	f6303b8fff	reshare dropdown looks nicer. fixed user menu to drop down on click	2010-10-19 16:16:46 -07:00
danielvincent	c5affa07e8	tweaked reshare button	2010-10-08 16:19:51 -07:00
danielvincent	9ac13ccb3e	fixed reshare a bit	2010-10-08 15:47:06 -07:00
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
Dorian	e792344c0e	Use improved whitespace:scrub_gratuitous_newlines	2010-09-26 12:52:39 -04:00
Dorian	6ffc03a4c9	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
danielvincent	b9be543ef6	DG IZ; reshare redirects to specific page	2010-09-22 15:32:11 -07:00
danielvincent	474cf77708	DG IZ; reposting now works. redirects to a template missing page, though.	2010-09-22 15:05:51 -07:00