nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/layouts
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
..
_header.html.haml Make the tag autocomplete on the getting started page less broken 2011-08-09 18:55:34 -07:00
application.html.haml Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 2011-08-20 14:40:56 -05:00
application.mobile.haml Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 2011-08-20 14:40:56 -05:00
notifier.html.erb fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
notifier.text.haml fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
popup.html.haml nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00