Commit graph

7 commits

Author SHA1 Message Date
Steffen van Bergerem
bcd43cbfee Don't show hovercards for current user in comments 2013-06-09 12:31:18 +02:00
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
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
embs
e7daa978e3 Show timestamp when hovering on comment time-ago string. Closes #4042 2013-03-08 00:33:19 -03:00
Asphyxia
f2c67b0d8a Overflow comment textarea 2013-01-24 22:52:14 -03:00
Jonne Haß
beb32ce91f hovercards everywhere (comments, likes, top left sidebar stream summary thingy...)
Say a word if you think it's getting too much...
2013-01-01 22:59:12 +01:00
Jonne Haß
3dbbbbe979 bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes 2012-09-12 21:22:34 +02:00
Renamed from app/assets/templates/comment.jst.hbs (Browse further)