nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/shared
History
Dan Hansen 3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
2011-08-20 14:40:56 -05:00
..
_add_remove_services.haml
_aspect_dropdown.html.haml Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 2011-08-18 16:48:20 -07:00
_author_info.html.haml
_author_info.mobile.haml
_contact_list.html.haml moved facebook friend inviter/finder into contacts layout & re-added search 2011-08-12 17:05:01 -07:00
_contact_sidebar.html.haml moved facebook friend inviter/finder into contacts layout & re-added search 2011-08-12 17:05:01 -07:00
_donate.html.erb completed donate option 2011-07-29 11:33:30 -07:00
_footer.mobile.haml
_invitations.haml Move Facebook inviter view into the contacts layout, rather than a facebox 2011-08-12 17:05:01 -07:00
_mail_signup_form.erb
_public_explain.haml
_publisher.html.haml Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 2011-08-18 16:48:20 -07:00
_publisher.mobile.haml
_right_sections.html.haml dg rs; seed bob with facebook friends & fixed invitation view 2011-08-12 17:05:00 -07:00
_settings_nav.haml
_stream.haml
_stream_element.html.haml Fix syntax error in WSR, move tipsy from views into stream.js, fix stream element delete tipsy. 2011-08-14 17:45:50 -07:00
_stream_element.mobile.haml That fixes the mobile-interface for now 2011-07-28 21:45:42 +02:00