Juan Manuel Azambuja
|
de7044c602
|
Fix select & deselect all aspects check image
|
2013-04-21 21:38:03 -03: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 |
|
David McMullin
|
f290bcf169
|
add tests so it doesn't break again
|
2012-11-25 17:38:19 +00:00 |
|
danielgrippi
|
039df8f879
|
fixed 14 cukes (all comments features)
|
2012-01-07 14:23:25 -08:00 |
|
Daniel Grippi
|
0d41c9c5f3
|
update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner)
|
2011-12-05 19:53:03 -08:00 |
|
danielgrippi
|
b46200224e
|
cukes are green again
|
2011-10-17 17:45:45 -07:00 |
|
Maxwell Salzberg
|
61ae843193
|
be super pedandic for travis in cukes
|
2011-10-16 23:19:08 -07:00 |
|
Gonzalo Rodriguez
|
6b5928ca09
|
Remember last selected aspects through the session
|
2011-10-09 02:24:53 -02:00 |
|
Gonzalo Rodriguez
|
7d6129b7f3
|
Clarify cucumber step definition
|
2011-10-08 18:31:04 -02:00 |
|
Gonzalo Rodriguez
|
dee0c06896
|
Adapt some cukes for the new aspect nav refactor
|
2011-10-01 04:49:05 -03:00 |
|