diaspora/app/views/shared
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
..
_add_contact.html.haml
_add_remove_services.haml
_author_info.html.haml touched up photo show and status message show pages 2011-02-03 13:05:25 -08:00
_author_info.mobile.haml everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
_contact_list.html.haml iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
_invitations.haml fix link to facebox 2011-02-12 14:57:35 -08:00
_mail_signup_form.erb
_public_explain.haml added the post to services icon on every page added a manage icon and moved the RSS link to the public explain 2011-02-24 17:31:54 -08:00
_publisher.html.haml add onAllComplete event to fileupload.js; hide mention helper during upload 2011-02-27 12:44:56 -05:00
_publisher.mobile.haml some fixes to the translations of the mobile site 2011-01-27 18:20:25 +01:00
_reshare.haml
_stream.haml Use delegation in PostFake, use render => :collection in stream 2011-03-07 12:20:46 -08:00
_stream_element.html.haml added translations to all conversation/message views. tweaked css 2011-03-08 15:51:46 -08:00
_stream_element.mobile.haml posts now have authors instead of people 2011-03-01 18:05:05 -08:00