Xavier J 285d7c6fa0 Merge branch 'develop' into france_connect ... # Conflicts: # db/schema.rb		2015-10-08 16:54:21 +02:00
..
controllers	Merge branch 'develop' into france_connect	2015-10-08 16:54:21 +02:00
decorators	fix test	2015-09-24 16:54:14 +02:00
factories	Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop	2015-09-24 10:56:12 +02:00
features	Merge branch 'develop' into france_connect	2015-10-08 16:54:21 +02:00
lib/siade	style check	2015-08-20 17:30:17 +02:00
models	[#915] Revu de code Ok	2015-10-08 11:26:12 +02:00
services	[bis] force login_with_france_connect at false when connection devise user	2015-10-07 14:19:16 +02:00
support	remove blank lines	2015-09-22 10:16:06 +02:00
views	activation page carte for procedure with db attribut use_api_carto is true	2015-09-28 18:55:16 +02: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