Commit graph

507 commits

Author SHA1 Message Date
Tanguy PATTE
40310da378 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-24 11:17:29 +02:00
Tanguy PATTE
23d11976a2 add validation presence user for dossier 2015-09-24 11:17:17 +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
Tanguy PATTE
a91380182d force user login on commentaire 2015-09-24 10:34:01 +02:00
Tanguy PATTE
5772b99d42 move controller into users folder 2015-09-23 19:20:03 +02:00
Tanguy PATTE
8c549bf27b [#887] afficher la liste des dossiers à l'utilisateur 2015-09-23 12:04:57 +02:00
Tanguy PATTE
78e86f00ea [#884] add user 2015-09-23 10:02:01 +02:00