Xavier J c4e0e6b402 Merge branch 'develop' into leaflet_freedraw ... # Conflicts: # db/schema.rb		2015-11-19 17:29:23 +01:00
..
controllers	Add search feature for gestionnaire backoffice	2015-11-17 18:21:03 +01:00
decorators	Add on information entreprise :	2015-11-16 11:23:29 +01:00
factories	add api_carto on back office and recapitulative page	2015-11-19 16:47:56 +01:00
features	Add search feature for gestionnaire backoffice	2015-11-17 18:21:03 +01:00
lib/siade	Add on information entreprise :	2015-11-16 11:23:29 +01:00
models	Add search feature for gestionnaire backoffice	2015-11-17 18:21:03 +01:00
services	[bis] force login_with_france_connect at false when connection devise user	2015-10-07 14:19:16 +02:00
support	Add on information entreprise :	2015-11-16 11:23:29 +01:00
views	Merge branch 'develop' into leaflet_freedraw	2015-11-19 17:29:23 +01:00
rails_helper.rb	fix datepicker and test it	2015-08-24 11:42:06 +02:00
spec_helper.rb	Nouvelle organisation de la page récapitulatif	2015-09-24 10:17:59 +02:00