benel/Tire-a-part — pull request #148 by FlorianBruniaux (2014-06-13 11:02:18+00:00)
Title: Test feature 68

This branch contains :

1 a merge of current benel/Tire-a-part/master and benel/Tire-a-part/feature-68-dashboard with corrections of conflicts etc.

2 feature-68 test

3 Modif of templates/activity_html.html :

add "Compter" button
click event on "Exporter" and "Compter" ( $('#id').on('click', function(){}) )

4 Change Capybara.default_wait_time default value (2s) to 4s
rq: minimum value = 3.5s