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
|
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 |
|
Tanguy PATTE
|
5b9acf3875
|
[#878] add liste of dossier in backoffice
|
2015-09-22 11:56:14 +02:00 |
|
Tanguy PATTE
|
44173a17fb
|
add login for gestionnaire
|
2015-09-22 10:15:12 +02:00 |
|