Commit graph

10 commits

Author SHA1 Message Date
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
Xavier J
ea0b64a9dc Correction teste view 2015-09-24 10:42:14 +02:00
Xavier J
a9109f8b2b Nouvelle organisation de la page récapitulatif 2015-09-24 10:17:59 +02:00
Tanguy PATTE
5772b99d42 move controller into users folder 2015-09-23 19:20:03 +02:00
Tanguy PATTE
d034176fe3 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop
Conflicts:
	app/views/dossiers/_infos_dossier.html.haml
2015-09-22 15:02:04 +02:00
Tanguy PATTE
5ca014587a [#883] move admin part in backoffice 2015-09-22 15:00:59 +02:00
Xavier J
7443d2feef delete "Modification localisation" in page "recapitulatif" 2015-09-22 14:09:32 +02:00
Tanguy PATTE
a7e6931303 style check 2015-08-20 16:59:15 +02:00
Tanguy PATTE
3c57643f76 add database cleaner
add factory girl
fix tests
rename dossier_pdf into piece_jointe
rename ref_piece_jointe into content
2015-08-13 15:56:58 +02:00
Xavier J
b5b83e939a First Commit 2015-08-10 11:05:06 +02:00