flaburgan
|
1833edfd67
|
Add actions to contacts/index.html page
|
2013-11-12 19:10:00 -08:00 |
|
flaburgan
|
3df0fdc09b
|
Improve the management of the contacts visibility settings in an aspect
|
2013-11-07 12:55:35 -08: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 |
|
Fabián Rodríguez
|
f590abb343
|
fix 3682, use correct image path for padlocks
|
2012-11-15 18:17:15 -02:00 |
|
danielgrippi
|
ee6932a3f7
|
added title to padlock on aspect edit pane
|
2011-03-09 12:15:23 -08:00 |
|