Commit graph

5 commits

Author SHA1 Message Date
Xavier J
af610a4a04 - Revu de la page dossier côté gestionnaire
- Ajout des boutons de changement d'état gestionnaire
2015-09-24 16:51:14 +02:00
Tanguy PATTE
46211816ed fix tests 2015-09-24 12:04:44 +02:00
Xavier J
f20f561e6c Fix liens page description et recapitulatif 2015-09-24 11:37:18 +02:00
Tanguy PATTE
3f11e09937 fix tests 2015-09-24 11:20:04 +02:00
Xavier J
8693f4194c Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop
Conflicts:
	app/views/users/recapitulatif/show.html.haml
	spec/features/recapitulatif_page/_commentaires_flux_spec.rb
	spec/features/recapitulatif_page/show_page_spec.rb
2015-09-24 10:56:12 +02:00