Commit graph

1211 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
a9109f8b2b Nouvelle organisation de la page récapitulatif 2015-09-24 10:17:59 +02:00
Tanguy PATTE
e0cb736542 rename start controller into siret controller and change error handling 2015-09-23 16:56:30 +02:00
Tanguy PATTE
78e86f00ea [#884] add user 2015-09-23 10:02:01 +02:00
Xavier J
cb2786bb33 [#876] New home page and disabled liste démarche and cargo
Bugs know : can not access at the page "Détails de votre projet" => "demarche" is null
2015-09-21 11:36:26 +02:00
Tanguy PATTE
fe3f235860 include philippe notes 2015-09-02 17:34:13 +02:00
Tanguy PATTE
0eb699d6b9 refactor description controller 2015-08-18 10:43:36 +02:00
Tanguy PATTE
f28e3ccbd3 clean view 2015-08-17 13:31:51 +02:00
Tanguy PATTE
b2853d909f remove useless assets files 2015-08-13 15:55:26 +02:00
Xavier J
c02f5c320a Styles des bouttons input type file 2015-08-11 15:10:14 +02:00
Xavier J
b5b83e939a First Commit 2015-08-10 11:05:06 +02:00