nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/conversations
History
Juan Manuel Azambuja 1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
2013-03-11 20:10:55 -03:00
..
_conversation.haml fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08:00
_show.haml Merge branch 'develop' into diaspora_with_sprites 2013-03-11 20:10:55 -03:00
index.haml Move Javascript to the asset pipeline 2012-03-27 18:07:44 -07:00
index.mobile.haml Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser 2012-12-08 14:59:01 +01:00
new.haml fix XSS vulnerability in conversations#new, closes #4010 2013-02-26 19:09:30 +01:00
show.haml MS DG update copyright 2011-09-14 11:23:12 -07:00
show.js.erb added a id and a autoscroll to first unread message in conversation (Fix: #3216) 2013-02-11 16:15:01 +01:00