14 commits

Author	SHA1	Message	Date
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	8751503aa4	header on public explain fancybox	2010-10-19 16:28:45 -07:00
danielvincent	f6303b8fff	reshare dropdown looks nicer. fixed user menu to drop down on click	2010-10-19 16:16:46 -07:00
Raphael	1fd3aeabd9	Add or later to license notice	2010-10-07 16:25:34 -07:00
danielvincent	577b5545bf	comment blocks slide	2010-09-28 11:50:13 -07:00
danielvincent	14ad24ba7e	visual tweaks on header. moved upload a file button to header on album#show	2010-09-19 14:27:20 -07:00
Raphael	708e9f88a5	Spell our own name right	2010-09-15 17:56:18 -07:00
Raphael	aa3ebe372c	License notices replaced	2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi	94765906e0	forgot licenses on javascript files.	2010-09-13 14:43:24 -07:00
Daniel Vincent Grippi	266a896bde	mtweaking comments in stream	2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi	1c2bfa64a1	cleaned login page resources	2010-09-08 23:30:08 -07:00
Raphael	e714e0d457	Comment sets now pop open on receiving a new comment	2010-08-25 18:00:53 -07:00
Raphael	f8d63052d4	Remove stream lives from ready block	2010-08-25 13:52:59 -07:00
Raphael	17636f4fd2	View modifications, refactored stream javascript to another file	2010-08-25 13:51:16 -07:00