DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
2082 commits 2 branches 1166 tags 85 MiB
Commit graph

402 commits

Author SHA1 Message Date
Xavier J
ccd9c0898d Fix test with cloud storage enabled 2016-09-16 15:40:30 +02:00
Xavier J
0c9fea1c14 User can invite other user to edit his dossier 2016-09-14 16:36:01 +02:00
Xavier J
60b94fc41b Specialize Invite object 2016-09-13 15:54:26 +02:00
Xavier J
c5035ca81e When gestionnaire follow an initiated dossier, this paste his state at 'updated' 2016-09-09 15:55:03 +02:00
Xavier J
62a0b84048 Filter by procedure is activated on route /backoffice/dossiers/procedure/:id 2016-09-08 16:21:54 +02:00
Xavier J
f03733f3ff Mail for receive dossier is now send. 2016-09-01 10:27:22 +02:00
Xavier J
12ebab66cc Administrateur can be param the acknowledgement of delivery mail object and body. 2016-08-31 16:07:11 +02:00
Guillaume Lazzara
fc99dc65d6 Send notification emails when a dossier is closed. 2016-08-25 18:02:56 +02:00
Guillaume Lazzara
0120ce2a32 Add an action to set a dossier as 'recu'. 2016-08-25 15:22:08 +02:00
Xavier J
5b0e01f117 delete filter procedure for gestionnaire 2016-08-22 16:36:25 +02:00
Xavier J
85e7af840a Add drop down list on type champ list 2016-08-09 16:21:39 +02:00
Xavier J
9487d47ef8 Add deposit date time on dossier table 2016-08-08 14:12:16 +02:00
Xavier J
480431ea01 Add on gestionnaire dossier view the private form 2016-08-08 12:52:30 +02:00
Xavier J
116dd0d94f Administrateur can be define private champs => same as typical champs 2016-08-03 18:19:56 +02:00
Xavier J
a37320bae9 Add lateral panel to configure dossier list in back office 2016-08-01 18:10:32 +02:00
Xavier J
21a18a536f Add total_commentaire in API Dossier and total_dossier on API Procedure 2016-07-22 15:06:30 +02:00
Xavier J
4e6d153893 Fix test 2016-07-22 12:25:23 +02:00
Xavier J
2ad816b6b3 Admin can be transfer a clone of a procédure at an other admin 2016-07-22 11:34:34 +02:00
Xavier J
7d0bcfc35f Delete utilisation of "nom_projet" attribut (no delete in database) 2016-07-19 16:10:50 +02:00
Xavier J
d26ae9539d An accompagnateur can be mark a dossier follow by us 2016-07-18 18:24:29 +02:00
Xavier J
9669fee7fe Add state attribut in API 2016-07-11 14:43:20 +02:00
Xavier J
721ea424ed Merge branch 'develop' of github.com:sgmap/tps into develop 
# Conflicts:
#	app/views/admin/procedures/_modal_publish.html.haml
 2016-06-30 14:17:33 +02:00
Xavier J
09c9d5ea76 async publication procedure 2016-06-30 12:33:43 +02:00
Guillaume Lazzara
582a368107 Code review related updates 2016-06-30 10:24:20 +02:00
Xavier J
575cbaa3e1 Fix route commencer and adapt feature test 2016-06-29 17:35:34 +02:00
Guillaume Lazzara
92a5100a09 Handle "réactiver" feature with permanent procedure url 2016-06-24 16:57:35 +02:00
Guillaume Lazzara
e5002dbb11 Introduce permanent and customizable procedure url 2016-06-24 16:41:44 +02:00
Xavier J
4355d4775a Add type de champ date 
Add hour and minute on UI for datetime
 2016-06-22 11:25:41 +02:00
Xavier J
1dcb29ec65 Add feature delete for draft procedure 2016-06-20 17:37:04 +02:00
Xavier J
86e26e520c Merge branches 'develop' and 'develop' of github.com:sgmap/tps into develop 2016-06-20 13:59:31 +02:00
Xavier J
cc8d2ef4ee New UI and UX for the dossier initialization 2016-06-20 13:57:57 +02:00
Guillaume Lazzara
7af7859334 Implement procedure cloning 2016-06-15 11:34:05 +02:00
Guillaume Lazzara
7fd2aa40ca Do not send notification email when comments cannot be saved. 2016-06-14 16:00:37 +02:00
Xavier J
866565495d Delete default description in dossier 2016-06-13 12:03:05 +02:00
Xavier J
d7eee773da Migrate API Entreprise INSEE V1 to V2 2016-06-13 10:13:37 +02:00
Guillaume Lazzara
2791988da2 Add draft/publish status for procedure. 2016-06-09 17:49:48 +02:00
Xavier J
e72487bb28 Merge branch 'develop' of github.com:sgmap/tps into develop 2016-06-09 12:08:25 +02:00
Xavier J
23ab25396f Add type champs "Address" plug at the BAN 2016-06-09 12:08:18 +02:00
Guillaume Lazzara
1551b7ce21 Add ordering feature on piece justificative view 2016-06-08 16:45:37 +02:00
Xavier J
69f9c52b02 Preview procedure logo on edit procedure page for admin 2016-06-06 18:25:51 +02:00
Xavier J
e6b5698008 Add previsualization formulaire page for administrateur 2016-06-06 17:40:32 +02:00
Xavier J
92fc5af61c Admin can add new Accompagnateur directly on the procedure 2016-05-26 16:44:10 +02:00
Xavier J
4d1cb9ecfe Connexion page is contextualized with procedure title and description when is access with link. 2016-05-26 15:59:50 +02:00
Xavier J
6005dccc2b Delete Archive feature for User on his Dossier 2016-05-25 14:08:02 +02:00
Xavier J
e973286766 Merge branch 'assign_to_procedure' into develop 
# Conflicts:
#	db/schema.rb
 2016-05-24 17:19:32 +02:00
Xavier J
1fcb33104d Administrateur can be assign accompagnateur on each of his procedure. 2016-05-24 16:39:39 +02:00
Guillaume Lazzara
63cf35a748 Add tests for siret with whitespaces 2016-05-24 15:43:05 +02:00
Guillaume Lazzara
9e3b1d73de Fix test according to remote_storage feature activation 2016-05-20 16:54:32 +02:00
Xavier J
1923f2aec1 Migrate Admin / Gestionnaire / Procédure gestion in database 2016-05-20 15:39:17 +02:00
Guillaume Lazzara
833d7790c2 Add support for remote OVH cloud storage 2016-05-13 16:08:51 +02:00
Xavier J
b15c2bbb2b New feature : User, Guest and Gestionnaire can be upload a document with theirs comments 2016-04-20 16:51:57 +02:00
Xavier J
900b377ae2 Final implement of clamav gem 2016-04-15 15:32:15 +02:00
Xavier J
6d5a3e6256 User and Guest can be upload new documents on our recapitulative dossier page. 2016-03-22 17:36:36 +01:00
Xavier J
eeaefdcc79 Add reference to user who upload a cerfa or a piece justificative 2016-03-17 17:33:38 +01:00
Xavier J
bb79aca58a Add historic for piece justificative 2016-03-17 14:50:10 +01:00
Xavier J
4b7e6426b3 Gestionnaire can have the history of cerfa updated on dossier show page 2016-03-16 15:34:35 +01:00
Xavier J
bd61a459fb Add verification on user dossier description for champs mandatory 2016-03-15 17:17:56 +01:00
Xavier J
26431ac528 Add column created_at on cerfa and piece_justificative 2016-03-14 17:30:22 +01:00
Xavier J
abfb6367d6 Active filter procedure on dossiers list backoffice 2016-03-14 16:49:12 +01:00
Xavier J
a612dc6021 Add features filter procedure for gestionnaire (not active on dossier list for now) 2016-03-14 14:23:09 +01:00
Xavier J
e944364929 Add Cerfa on API Show dossier 2016-03-14 11:10:02 +01:00
Xavier J
b49770f408 Add commentaires on API Show Dossier 2016-03-14 10:34:46 +01:00
Xavier J
f4de0b8431 - Add resize on wysihtml5 bootstrap 
- Add rich text on procedure description
- Ajust text on description dossier user form
 2016-03-02 15:21:45 +01:00
Xavier J
9c1268fdd5 Add statistiques API for dashboard 2016-02-29 15:15:44 +01:00
Xavier J
3e62dd01fb Pre-doc APIs 2016-02-26 14:16:17 +01:00
Xavier J
c971849312 Merge branch 'api-pie' into develop 2016-02-26 14:00:29 +01:00
Xavier J
4993abf5f2 Create fonction content_url to make public download link for cerfa and pj 2016-02-26 13:59:03 +01:00
Xavier J
16c72e7478 Complete API Dossier 2016-02-26 12:17:41 +01:00
Xavier J
56f9b2f71a Fix tests SIADE with apientreprise.fr base_path 2016-02-23 11:12:58 +01:00
Xavier J
2a6da54320 add gem api-pie 
Error : stack level too deep
 2016-02-22 19:42:47 +01:00
Xavier J
8cce06168c delete old tests 2016-02-22 15:22:28 +01:00
Xavier J
c339441510 new commentaires invitation tests 2016-02-22 15:22:06 +01:00
Xavier J
c37fb9bb20 redirect to sign_up link if user 's email on invitation as no account on the platform 2016-02-22 10:34:25 +01:00
Guillaume Lazzara
3777f6066e Code review: rewrite test 2016-02-19 16:59:39 +01:00
Xavier J
c2983e08b6 Don't access at user/sign_in/demi and gestionnaire/sign_in/demo on env production 2016-02-19 15:04:29 +01:00
Xavier J
000fadf501 downcase on email adresse for invite object 2016-02-16 16:53:46 +01:00
Xavier J
51c145d2ce Update landing page : 
- Release scrape on Github
- Add presentation video
- Add demonstration link for gestionnaire and user
 2016-02-16 12:01:39 +01:00
Xavier J
2b6a46f335 Delete FC Enterprise tests 2016-02-11 16:12:59 +01:00
Xavier J
b3a90376d4 associate user at his invite after sign up devise account 2016-02-09 15:47:36 +01:00
Guillaume Lazzara
6b7d3e0ac1 Add gestionnaire deletion feature 2016-02-09 12:24:05 +01:00
Xavier J
dcd943a4b5 Add tab Invitation on user dossier index view 2016-02-09 12:23:31 +01:00
Guillaume Lazzara
b58b0de8b0 Add gestionnaire management 2016-02-09 11:01:10 +01:00
Guillaume Lazzara
2a2aef34db Add gestionnaire administration panel. 2016-02-09 11:01:10 +01:00
Xavier J
bc41412b6b Test send email when gestionnaire invite user 2016-02-09 10:51:15 +01:00
Xavier J
e2a896d0b0 Gestionnaire can invite an email contact to participate at a dossier 2016-02-08 18:16:18 +01:00
Xavier J
d7dbd28507 fix test cerfa flag 2016-02-04 14:08:35 +01:00
Xavier J
01d71aa1cd Merge branch 'develop' into cerfa_flag 2016-02-04 11:03:49 +01:00
Guillaume Lazzara
e20de3dba9 First attempt 2016-02-02 18:37:38 +01:00
Xavier J
7a61786814 Active landing page 2016-02-01 17:16:00 +01:00
Xavier J
68bb4935e7 Fix bug enterprise's date_creation 2016-01-28 11:29:44 +01:00
Xavier J
2220c94ce9 Merge branch 'develop' of github.com:sgmap/tps into develop 2016-01-27 15:59:57 +01:00
Xavier J
5513504555 - Refactor code carte 
- Delete auto-comments when edit carte and description
 2016-01-27 15:48:27 +01:00
Tanguy PATTE
d449c34387 Merge branch 'develop' of github.com:sgmap/tps into develop 2016-01-27 14:37:24 +01:00
Xavier J
008ca19bef un-used files deleted 2016-01-26 16:47:13 +01:00
Tanguy PATTE
6d5f00deb9 Merge branch 'develop' of github.com:sgmap/tps into develop 
Conflicts:
	db/schema.rb
 2016-01-25 16:09:46 +01:00
Tanguy PATTE
dc5ac9807d start api to display dossier 
missing pj, fields, exercices
 2016-01-25 16:08:10 +01:00
Xavier J
c1ea10bd82 Add restriction on User's URL based on Dossier state 2016-01-25 15:54:21 +01:00
Xavier J
4d812220fd - Add FranceConnectInformation table to make safe FranceConnect pivot identity. 
- Adapt source code with the new table
 2016-01-21 17:06:09 +01:00
Tanguy PATTE
514918b2b8 parametrize pagination on dossier index api 2016-01-21 11:41:24 +01:00
Tanguy PATTE
f75f0e26d6 Merge branch 'develop' of github.com:sgmap/tps into develop 
Conflicts:
	db/schema.rb
 2016-01-20 15:50:13 +01:00
Tanguy PATTE
78bd982f97 Add API index on Dossier. 2016-01-20 15:48:46 +01:00
Xavier J
65ba614be2 Refactor function create in user dossier controller 2016-01-20 10:34:22 +01:00
Xavier J
a738128f4a Suppression de FCEntreprise 2016-01-19 17:40:45 +01:00
Xavier J
e8fd212d13 - Code review 
- Delete Mandataires sociaux adapter
- Add function to get mandataires sociaux in Enterprise Adapter
 2016-01-19 17:19:38 +01:00
Xavier J
e0d980e804 Delete on Factory Dossier :with_user 2016-01-18 17:18:04 +01:00
Xavier J
6a3525c7e2 Save Cadastre 2016-01-18 12:03:18 +01:00
Tanguy PATTE
0df5324891 Merge branch 'develop' of github.com:sgmap/tps into develop 
Conflicts:
	.gitignore
 2016-01-12 15:32:13 +01:00
Tanguy PATTE
c04627431c add module api carto in api procedure 2016-01-12 15:11:42 +01:00
Xavier J
5540a786db Disable FC Enterprise 2016-01-11 17:19:25 +01:00
Xavier J
24ace22245 Fix test carte controller 2016-01-07 11:47:52 +01:00
Xavier J
332eab3771 Check if France Connect User is a mandataire social of the enterprise 2016-01-06 14:17:08 +01:00
Xavier J
4961f39a71 Add check password to connect with france connect particulier whereas a TPS account have the same email adresse 2016-01-05 12:18:00 +01:00
Xavier J
02b7680083 Fix bug send email sign up user 2016-01-04 16:09:04 +01:00
Xavier J
9fb575ef8c Refactor procedure locked and retrieve management 2015-12-24 15:57:03 +01:00
Xavier J
de0acc0a22 Change URL for not found procedure 2015-12-24 15:22:30 +01:00
Xavier J
1a3aebe6ab Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-24 10:12:52 +01:00
Xavier J
9e0dfb593e Add FranceConnect Particulier 
Reactivate FranceConnect Entreprise
 2015-12-24 10:12:23 +01:00
Tanguy PATTE
3ea381413f Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-21 17:52:00 +01:00
Tanguy PATTE
f474c8e8e1 add api v1 procedure controller 2015-12-21 17:51:49 +01:00
Xavier J
c20f9a87e9 Front : Procedure can not be edited when at least one file with state other what draft is created by user 2015-12-21 14:40:28 +01:00
Xavier J
43779aafee Error 403 when admin would edit a procedure with at least one dossier 2015-12-21 12:02:53 +01:00
Xavier J
229973f14c Rename FranceConnect to FranceConnect::Entreprise 2015-12-18 12:01:26 +01:00
Xavier J
44554a9baa Send an email when user submitted his file 2015-12-17 10:09:44 +01:00
Tanguy PATTE
789ea308ee Merge branch 'develop' of github.com:sgmap/tps into develop 2015-12-15 16:49:58 +01:00
Tanguy PATTE
d2978c4656 add api token in administrator's profile page 2015-12-15 16:49:48 +01:00
Xavier J
b237d7c890 Send email when gestionnaire valide a dossier 2015-12-15 15:37:46 +01:00
Xavier J
a24ff681fc - Send email when gestionnaire write a new commentaire 
- Change url on mail => redirect on dossier recapitulative page
 2015-12-15 15:33:21 +01:00
Xavier J
4aedf72631 Send email when user create new account 2015-12-15 15:17:12 +01:00
Xavier J
a2a5d63c0d Display RNA information on partial dossier entreprise information 2015-12-11 12:36:44 +01:00
Xavier J
90a3b6763b sign_out all devises connect before sign_in an other 2015-12-09 15:10:11 +01:00
Xavier J
e9145b031f Change organisation sources for lib apicarto quartiersprioritaires 2015-12-08 16:02:35 +01:00
Xavier J
11596ade65 - QP not research if module_api_carto have not activated quartiers_prioritaires 
- Carte page is not accessible if module_api_cart have not activated use_api_carto
 2015-12-08 11:18:49 +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
92d57db91d - migrate page show to edit for procedure admin 
- create new page show for procedure admin
 2015-12-04 16:17:35 +01:00
Xavier J
afaa6a5ac9 - delete route '/users/siret' 
- delete route 'users/procedure'
- create route 'users/dossiers/new?procedure_id=:procedure_id'
- delete a part of unused code
- adapt demo page with new procedure URL
 2015-12-03 12:00:22 +01:00
Xavier J
851f4e830e - rename tests 2015-12-02 18:17:47 +01:00
Xavier J
3e55d7ba3b - Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user 
- Add routes 'uses/dossiers/?liste=xxx' to reach at file lists for user
 2015-12-02 18:03:52 +01:00
Xavier J
5cebb5b621 - Code review 
- Delete routes 'users/dossiers/a_traiter - en_attente - termine' for user
- Add routes 'uses/dossiers/?liste=xxx' to reach at file lists for user
 2015-12-02 16:52:09 +01:00
Xavier J
141e23a381 Code review 2015-11-30 17:03:36 +01:00
Xavier J
da49c633dc Add tabs on view list file for users 2015-11-30 14:48:37 +01:00
Xavier J
3eb990a611 Administrator can unarchived a procedure 2015-11-27 17:13:06 +01:00
Xavier J
7c3f322d6e Add tabs for administrateur procedures list 2015-11-27 16:23:02 +01:00
Xavier J
3fd7e6b6c0 Gestionnaire can't access to a archived file with direct URL 2015-11-27 15:09:16 +01:00
Xavier J
e9012d8164 User can see archived file in principal list 2015-11-27 15:04:44 +01:00
Xavier J
a79ecbba6d Add archive button on recapitulative page user dossier 2015-11-27 13:56:54 +01:00
Xavier J
dd09a38bbb User can begin a new dossier with a procedure archived 
Administrateur can see archived procedure
 2015-11-27 10:39:05 +01:00
Xavier J
833752161f Add button archive on procedure 2015-11-26 18:41:41 +01:00
Xavier J
5e3bc1472c Add pagination for administrateur procedure 2015-11-26 16:00:12 +01:00
Xavier J
eb5985efc4 - Save QP on database 
- Display on all Map (User and Gestionnaire)
 2015-11-25 17:05:14 +01:00
Xavier J
f4e63d40b0 Add QP on user carte 2015-11-25 10:26:55 +01:00
Xavier J
db346fb66f - create route /users/procedure/:procedure_id to replace /users/siret/?procedure_id= 
- /users/siret/ redirect to /users/procedure/
- siren can be past on the URL /users/siret and /users/procedure
 2015-11-20 18:14:52 +01:00
Tanguy PATTE
d6e4a76bf9 Merge branch 'develop' into refactor_type_de_xxx 
Conflicts:
	db/schema.rb
 2015-11-20 17:16:45 +01:00
Tanguy PATTE
17ca244a2f end delete type de piece justificative 2015-11-20 15:12:47 +01:00
Tanguy PATTE
1379d6d495 change PieceJustificativeController : 
replace edit by show
add update
 2015-11-20 13:54:56 +01:00
Xavier J
f92f0f46cc After create new procedure, admin is redirect to type de champ form 2015-11-20 10:54:07 +01:00
Tanguy PATTE
fde504b54d add move down for type de champ controller and refactor 2015-11-19 11:37:01 +01:00
Tanguy PATTE
0503e2f278 add move_up for type de champ controller 2015-11-18 19:03:51 +01:00
Tanguy PATTE
41c0ca27d9 refresh list when delete type de champ 2015-11-17 18:52:49 +01:00
Xavier J
9f34d20475 Add search feature for gestionnaire backoffice 2015-11-17 18:21:03 +01:00
Tanguy PATTE
5a422c75ac rename type_champs into type_champ and change links/routes for procedure : use show instead of edit 2015-11-17 10:23:05 +01:00
Tanguy PATTE
9942525984 link procedure to administrateur 2015-11-16 18:25:31 +01:00
Tanguy PATTE
2696a6098e remove useless test 2015-11-16 18:08:33 +01:00
Tanguy PATTE
a2f4281f21 refacto. 
split procedure into 3 screen
desactivate order place for type de champ
desactivate features test to rewrite them
use ajax instead of pure js to manage type de champ
 2015-11-16 16:16:08 +01:00
Xavier J
dd8bafab49 Add on information entreprise : 
- SIRET Siège social
	- Code naf
	- Code effectif
	- Numéro TVA intracommunautaire
	- Exercices
 2015-11-16 11:23:29 +01:00
Xavier J
19b76203c4 Creation three tabs for gestionnaire back office 2015-11-13 15:23:21 +01:00
Xavier J
0906d44ea8 Refactor TypeDeXxxx 2015-11-09 17:15:51 +01:00
Xavier J
f3d8645426 Rename TypeDeChamps to TypeDeChamp 2015-11-05 11:21:44 +01:00
Xavier J
519af34c82 Revu de code 2015-11-04 17:27:01 +01:00
Xavier J
6fbe735793 Save Champs value since description page 2015-11-03 16:16:39 +01:00
Xavier J
2050465a75 REFACTOR : remove column 'montant_projet', 'montant_aide_demande', 'date_previsionnelle', 'position_lat', 'position_lon' et 'ref_dossier_cart' of dossier table 2015-11-02 18:56:41 +01:00
Xavier J
8db705ec94 Revu de code OK 2015-11-02 16:36:52 +01:00
Xavier J
c454ea28ed REFACTOR: Change dossier state 'SubmitValidated' To 'Submitted' 2015-11-02 15:46:43 +01:00
Xavier J
285cee939a REFACTOR: Change dossier state 'Submitted' To 'Initiated' 2015-11-02 15:31:15 +01:00
Xavier J
c09fe8e7f6 REFACTOR: Change dossier state 'Processed' To 'Closed' 2015-11-02 15:00:28 +01:00
Xavier J
76d87c7f79 REFACTOR : Change dossier state 'Deposited' To 'SubmitValidated' 2015-11-02 11:52:39 +01:00
Xavier J
da8c166331 REFACTOR: Change dossier state 'Confirmed' To 'Validated' 2015-11-02 11:45:52 +01:00
Xavier J
4a05af89fc REFACTOR: Change dossier state 'Reply' To 'Replied' 2015-11-02 11:33:00 +01:00
Xavier J
c0733849d5 REFACTOR : Change dossier state 'Proposed' To 'Submitted' 2015-11-02 11:23:55 +01:00
Xavier J
afb11f429a Add button delete for TypeDeChamps and TypeDePieceJustificative on Procedure form 
+ refactor procedure.js
 2015-10-29 17:22:57 +01:00
Xavier J
71f9455e36 Back : Save TypeDePJ for a procedure 2015-10-28 18:09:47 +01:00
Xavier J
e673fe6ae2 Change updated method for type de champs' procedure 2015-10-28 15:08:23 +01:00
Xavier J
4eecba4ce1 Back : save types de champs for procedure OK 2015-10-28 11:53:16 +01:00
Xavier J
5c643c6373 FIX TEST 2015-10-26 18:08:41 +01:00
Xavier J
f4db1a16f8 - Change root route 
- Add RootController
 2015-10-26 16:10:38 +01:00
Xavier J
270d28f6da Add procedure edition functionality 2015-10-26 15:54:20 +01:00
Xavier J
c6ed98b978 protect page with check the owner's dossier 2015-10-09 17:33:33 +02:00
Xavier J
0bd43e538a add current_user_dossier function at UserController 2015-10-09 16:26:39 +02:00
Xavier J
3a06c0b870 secure description and carte page with only log user access 2015-10-09 14:43:19 +02:00
Xavier J
d53c43a7b0 Ajout du bouton traité pour les gestionnaires 2015-10-09 12:05:07 +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
728150b148 [#915] Revu de code Ok 2015-10-08 11:26:12 +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
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
Xavier J
a4661c932f done spec france connect controller 2015-10-06 17:06:37 +02:00