Commit graph

12579 commits

Author SHA1 Message Date
Tanguy PATTE
c2918d5cb3 Merge branch 'develop' into staging 2015-10-08 18:54:07 +02:00
Tanguy PATTE
a57b9852b2 change link to images 2015-10-08 18:53:41 +02:00
Tanguy PATTE
5b50beba26 Merge branch 'staging' of ssh://37.187.249.111:2200/opt/git/tps into staging 2015-10-08 18:35:15 +02:00
Tanguy PATTE
c54fea3ead add symlink for conf file handled by ansible 2015-10-08 18:33:39 +02:00
Xavier J
c1a01f30dd tests fix 2015-10-08 17:08:01 +02:00
Xavier J
285d7c6fa0 Merge branch 'develop' into france_connect
# Conflicts:
#	db/schema.rb
2015-10-08 16:54:21 +02:00
Xavier J
90e8866d37 FAKE changement libelle 2015-10-08 16:33:44 +02:00
Xavier J
5fd9b39889 FAKE pièce justificative fix test 2015-10-08 16:31:14 +02:00
Xavier J
42f43eebd7 Désactivation de l'obligation de dessin pour l'API carto 2015-10-08 16:26:54 +02:00
Xavier J
e63409ddfd FAKE pièce justificative 2015-10-08 16:07:01 +02:00
Xavier J
e678216ca8 Logo france connect navbar 2015-10-08 12:11:01 +02:00
Xavier J
728150b148 [#915] Revu de code Ok 2015-10-08 11:26:12 +02:00
Tanguy PATTE
a828c6259b Merge branch 'france_connect' of ssh://37.187.249.111:2200/opt/git/tps into france_connect 2015-10-08 11:23:14 +02:00
Tanguy PATTE
968aa92d77 [#920] prefill siret when user has a siret 2015-10-08 11:22:55 +02:00
Xavier J
4ee7c5872c New connexion page view 2015-10-07 18:14:10 +02:00
Tanguy PATTE
deb13673d7 Merge branch 'france_connect' of ssh://37.187.249.111:2200/opt/git/tps into france_connect
Conflicts:
	spec/controllers/france_connect_controller_spec.rb
2015-10-07 16:50:52 +02:00
Tanguy PATTE
afed93247d [#917] redirect to correct location after login with france connect 2015-10-07 16:49:42 +02:00
Xavier J
aeeb9406e9 add france connect logout process 2015-10-07 16:38:29 +02:00
Xavier J
9c6b9d408b [bis] force login_with_france_connect at false when connection devise user 2015-10-07 14:19:16 +02:00
Xavier J
35ef473f59 force login_with_france_connect at false when connection devise user 2015-10-07 14:18:55 +02:00
Tanguy PATTE
ddc1052daf update schema.rb 2015-10-07 12:03:56 +02:00
Tanguy PATTE
76e3b60f71 Merge branch 'france_connect' of ssh://37.187.249.111:2200/opt/git/tps into france_connect
Conflicts:
	spec/controllers/france_connect_controller_spec.rb
2015-10-07 12:03:14 +02:00
Tanguy PATTE
6dc891a320 fix siret retrieval from OpenIDConnect::ResponseObject::UserInfo 2015-10-07 12:01:05 +02:00
Xavier J
3d38f6fcdb add login_with_france_connect boolean at the FC connection 2015-10-07 11:24:07 +02:00
Tanguy PATTE
6db8efb078 Merge branch 'france_connect' of ssh://37.187.249.111:2200/opt/git/tps into france_connect 2015-10-07 10:30:00 +02:00
Tanguy PATTE
0a14fbd5dd add siret to user 2015-10-07 10:29:44 +02:00
Xavier J
72506df419 new home page connexion 2015-10-06 18:33:01 +02:00
Xavier J
d655b2319a Done test France Connect 2015-10-06 17:41:49 +02:00
Tanguy PATTE
f4e3ec1a72 add feature test on france connect 2015-10-06 17:22:06 +02:00
Xavier J
8445944b76 add spec for features France connect connection 2015-10-06 17:06:59 +02:00
Xavier J
a4661c932f done spec france connect controller 2015-10-06 17:06:37 +02:00
Tanguy PATTE
c57cb5b75d add test to france connect controller 2015-10-06 16:47:25 +02:00
Xavier J
b979c9df32 begin controler france connect test bad code params 2015-10-06 16:35:03 +02:00
Tanguy PATTE
2f21b42c07 add test to france connect controller 2015-10-06 16:17:15 +02:00
Xavier J
abe5d94ac5 test login FranceConnectController 2015-10-06 16:02:30 +02:00
Tanguy PATTE
bde99fff1b add test for france connect service 2015-10-06 12:00:54 +02:00
Xavier J
20cae835e6 begin spec client france connect service 2015-10-06 11:47:42 +02:00
Tanguy PATTE
5cb8f92a81 start test on france connect client 2015-10-06 11:32:57 +02:00
Xavier J
fd60692ade Intégration France Connect - sans les tests 2015-10-06 11:21:20 +02:00
Xavier J
d69fa36691 Remove .idea files 2015-10-05 16:44:54 +02:00
Tanguy PATTE
40d5802d4a start france connect 2015-10-05 16:42:29 +02:00
Xavier J
890d05ec69 Remove idea files 2015-10-05 10:32:03 +02:00
Xavier J
90baaebb13 Merge branch 'develop' into staging 2015-09-28 18:58:25 +02:00
Xavier J
0c2d1d70ff fix bug test 2015-09-28 18:58:10 +02:00
Xavier J
91e937c247 activation page carte for procedure with db attribut use_api_carto is true 2015-09-28 18:55:16 +02:00
Xavier J
464f68977a Merge branch 'develop' into staging 2015-09-28 11:02:43 +02:00
Xavier J
97cf5fc605 Les dossiers se soumettent automatiquement au récapitulatif. 2015-09-28 10:32:41 +02:00
Tanguy PATTE
7f91778027 Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop 2015-09-25 11:42:32 +02:00
Tanguy PATTE
7f83712449 [#894] display state for user 2015-09-25 11:42:20 +02:00
Xavier J
3dfac3d6f2 Merge branch 'develop' into staging 2015-09-25 11:17:00 +02:00