17 commits

Author	SHA1	Message	Date
danielvincent	ed4c253ea8	show pages now identify content with content creator. publisher now takes a local	2010-10-22 15:32:41 -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
danielvincent	b218a53bf7	fancyboxes have title bars now, kind of.	2010-10-19 14:06:44 -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
Ariel Zavala	9bdd11b383	Added localization to album views	2010-09-16 14:58:42 -04: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	aa5447f553	Albums are now created within a context	2010-09-13 19:39:51 -07:00
Daniel Vincent Grippi	2fae1049d9	silent comments in all views except the layout and session wall	2010-09-13 15:11:14 -07:00
Daniel Vincent Grippi	4c15b1a01c	added license to every single goddamn file. also, put one in the root dir.	2010-09-13 14:23:50 -07:00
Raphael	55c94c385c	fixed photos going through the websocket. added a spec to SocketsController	2010-08-25 16:08:44 -07:00
danielvincent	4e062c143b	new album partial has a title. album title is in italics in new photo partial	2010-08-09 21:29:19 -07:00
danielvincent	d4ac19e9ce	all form buttons are now using button definition in UI	2010-07-27 12:23:21 -07:00
danielvincent	dbc8f0112e	some misc design cleanup. album page toggle pending.	2010-07-27 12:12:25 -07:00
maxwell	301343ae01	DG MS added basic album support	2010-07-20 21:28:24 -07:00