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 |
|
Florian Staudacher
|
2c7f2d6fbb
|
Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment
[ci skip]
Conflicts:
Changelog.md
|
2012-12-07 17:47:19 +01:00 |
|
movilla
|
491c2a537c
|
Add feature contact pod admin
|
2012-12-06 15:26:49 +01:00 |
|
Flaburgan
|
aee6068412
|
Resize deletelabel and ignoreuser images to align them
|
2012-12-02 13:20:24 +01:00 |
|
movilla
|
c9b58c9ff6
|
Add My Activity icon mobile
|
2012-10-26 22:47:43 +02:00 |
|
movilla
|
75402bdfa0
|
Add icons search & contacts mobile
|
2012-08-21 16:50:37 +02:00 |
|
danielgrippi
|
5b2716d2ef
|
MS DG; move images to assets
|
2012-03-27 18:07:22 -07:00 |
|