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
|
6eeac88c95
|
fix user path and add test full user path
|
2015-09-24 10:30:29 +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 |
|