diaspora/app/views/photos
danielgrippi 1f5edb1d92 Merge branch 'private_messages'
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
..
_index.html.haml visual fixes on people/show. contact count on aspect filters. contact list searches again. 2011-01-08 13:11:54 -08:00
_new_photo.haml add onAllComplete event to fileupload.js; hide mention helper during upload 2011-02-27 12:44:56 -05:00
_new_profile_photo.haml wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -08:00
_photo.haml posts now have authors instead of people 2011-03-01 18:05:05 -08:00
edit.html.haml killed albums 2010-11-04 10:17:19 -07:00
show.html.haml posts now have authors instead of people 2011-03-01 18:05:05 -08:00
show.mobile.haml added in link to search page 2011-01-24 12:22:18 -08:00