Commit graph

77 commits

Author SHA1 Message Date
Xavier J
20a41ef172 Use gem bootstrap-wysihtml5 on textarea 2016-02-18 11:56:54 +01:00
Xavier J
7a61786814 Active landing page 2016-02-01 17:16:00 +01:00
Xavier J
8ca2b53775 Merge branch 'franceconnect_local' into develop
# Conflicts:
#	app/assets/javascripts/application.js
2016-01-29 11:43:31 +01:00
Xavier J
9daeafbad3 Footer 2016-01-28 17:16:37 +01:00
Xavier J
a161c1dcc4 Test to used franceconnect sources in local 2016-01-28 12:10:25 +01:00
Xavier J
88ae6a74ab Fix franceconnect kit integration 2016-01-12 10:03:05 +01:00
Xavier J
bbb06a235d Change Button FranceConnect Connection 2016-01-11 17:38:16 +01:00
Xavier J
a7af7e4a9f Add FranceConnect Kit 2016-01-11 17:05:21 +01:00
Tanguy PATTE
cf99b30349 change banner for admin 2015-12-14 17:27:14 +01:00
Xavier J
8755ce2ab1 add euro flag to procedure object 2015-12-10 16:09:21 +01:00
Xavier J
f65c383623 Merge branch 'api_carto_dynamique' into develop 2015-12-09 11:16:28 +01:00
Xavier J
c2fbb246e7 beta tag 2015-12-08 18:34:43 +01:00
Xavier J
0e3bec7f9f Administrateur can be select dynamically the activation of api carto modules 2015-12-08 10:11:58 +01:00
Xavier J
833752161f Add button archive on procedure 2015-11-26 18:41:41 +01:00
Xavier J
2eb01bdf42 Add paginate for user dossiers 2015-11-26 12:29:34 +01:00
Tanguy PATTE
52133c0f43 add button save for pj and type de champ 2015-11-20 17:12:36 +01:00
Xavier J
e678216ca8 Logo france connect navbar 2015-10-08 12:11:01 +02:00
Xavier J
4ee7c5872c New connexion page view 2015-10-07 18:14:10 +02:00
Xavier J
72506df419 new home page connexion 2015-10-06 18:33:01 +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
Xavier J
a9109f8b2b Nouvelle organisation de la page récapitulatif 2015-09-24 10:17:59 +02:00
Tanguy PATTE
78e86f00ea [#884] add user 2015-09-23 10:02:01 +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
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