nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/conversations
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
..
_conversation.haml Correctly space unread and total message counts in conversations list 2011-08-07 04:06:26 +02:00
_show.haml Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00
index.haml touch up message inbox view 2011-07-06 00:38:25 -07:00
new.haml Issue #1431: Suggest when the first letter typed, not the third 2011-07-30 15:56:28 -03:00
show.haml fixed #992 2011-04-03 14:57:30 +02:00
show.js.erb Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 2011-08-20 14:40:56 -05:00