Commit graph

13697 commits

Author SHA1 Message Date
Paul Chavard
e74c32446e Fix champ->type_de_champ n+1 2020-11-12 15:48:31 +01:00
Kara Diaby
10093f9150
Merge pull request #5737 from betagouv/feat/5730
feat/5730 - add new columns to deleted dossiers
2020-11-12 12:33:26 +01:00
kara Diaby
06f6cf7771 add new columns to deleted dossiers 2020-11-12 12:18:59 +01:00
Keirua
edcb2868a7
Merge pull request #5736 from betagouv/dev
2020-11-12-01
2020-11-12 09:56:50 +01:00
Keirua
fd766fcf04
Merge pull request #5735 from betagouv/revert-counters
Revert counters display in Instructeur::ProceduresController::show
2020-11-12 09:48:04 +01:00
clemkeirua
dae65c49f6 revert counters display
in Instructeur::ProceduresController::show, we recently used a grouped query for counters

for some reason, this grouped query in procedure#dossiers_count_for_instructeur
gives incorrect results.
I keep this method as is for now (instructeurs are complaining) and hotfix the controllers
2020-11-12 08:15:00 +00:00
Keirua
4339690316
Merge pull request #5734 from betagouv/france-connection-auth-date
fix broken nil values in france_connect_information
2020-11-12 09:13:43 +01:00
clemkeirua
64c964bf5e fix broken nil values in france_connect_informatio 2020-11-11 15:40:44 +01:00
Keirua
c96a5a8de7
Merge pull request #5732 from betagouv/dev
2020-11-11-01
2020-11-11 10:27:15 +01:00
LeSim
f0f6fea8c5
Merge pull request #5698 from betagouv/feat/5675
feat/5675 - add an api token verification for api entreprise
2020-11-09 20:40:18 +01:00
kara Diaby
bc0f77978f add an api token verification for api entreprise 2020-11-09 16:58:24 +01:00
Keirua
a9d22a74bd
Merge pull request #5727 from betagouv/fix-access-to-flipper-dj
Add access to super admins to delayed_job and flipper
2020-11-09 09:09:33 +01:00
clemkeirua
fc690df554 add access to super admins to delayed_job and flipper 2020-11-09 07:48:15 +00:00
Keirua
36b9aa7efa
Merge pull request #5722 from tchak/bump-graphql-timeout
GraphQL: bump timeout to 10 sec
2020-11-06 15:12:21 +01:00
Paul Chavard
20cdefad63 GraphQL: bump timeout to 10 sec 2020-11-06 12:00:00 +01:00
Kara Diaby
7762d9fa28
Merge pull request #5713 from betagouv/feat/5701-fix
Feat/5701 fix - Ajoute les informations France Connect
2020-11-05 19:51:53 +01:00
kara Diaby
c033ef0910 Ajoute a l'information de connexion France Connect dans les informations du dossier ainsi que sur la demande usager 2020-11-05 19:30:13 +01:00
kara Diaby
4b2e3b5be7 Revert "Merge pull request #5710 from betagouv/revert-5705-feat/5701"
This reverts commit aae77c77b0, reversing
changes made to 4c2c5c630c.
2020-11-05 19:30:13 +01:00
krichtof
984b1519bf
Merge pull request #5726 from betagouv/dev
2020-11-05-03
2020-11-05 19:19:43 +01:00
krichtof
70f30560f0
Merge branch 'master' into dev 2020-11-05 19:07:30 +01:00
krichtof
ab62547622
Merge pull request #5725 from betagouv/fix-refacto-superadmin-rake
fix superadmin rake
2020-11-05 19:05:58 +01:00
Christophe Robillard
2ee5b1f6cb fix superadmin rake 2020-11-05 18:56:03 +01:00
krichtof
2a48118fd9
Merge pull request #5724 from betagouv/dev
2020-11-05-02
2020-11-05 18:36:58 +01:00
krichtof
398ec7d99a
Merge branch 'master' into dev 2020-11-05 18:34:49 +01:00
krichtof
e5a5e43de7
Merge pull request #5723 from betagouv/5673-2FA
fix refacto super_admin
2020-11-05 18:03:52 +01:00
Christophe Robillard
0e43b5e5c0 fix refacto super_admin 2020-11-05 17:51:38 +01:00
krichtof
42ddaf05f8
Merge pull request #5721 from betagouv/dev
2020-11-05-01
2020-11-05 16:40:10 +01:00
krichtof
5fbc975f6a
Merge pull request #5719 from betagouv/5673-2FA
Authentification 2FA pour accéder au manager
2020-11-05 16:19:23 +01:00
Christophe Robillard
5562e65bf3 refacto: rename administration to super_admin 2020-11-05 16:03:55 +01:00
Christophe Robillard
a88172eb01 configure otp_secret_key secret 2020-11-05 16:03:55 +01:00
Christophe Robillard
efd8ec85e8 recover superadmin password or reset otp 2020-11-05 16:03:55 +01:00
Christophe Robillard
8d23f6ae99 remove useless redirection for manager sign_in and out
The manager alias for signin causes layout problems
2020-11-05 16:03:55 +01:00
Christophe Robillard
2a0ebd062a enable 2FA for manager
when trying to access manager, if superadmin did'nt enable otp, he/she is redirected to a page to enable 2FA. When superadmin is enabling 2FA, he has to to scan a qrcode with the 2FA application client. And afterwards, the superadmin has to log in with email, password and OTP code.
2020-11-05 16:03:55 +01:00
Christophe Robillard
3fdb045356 create a superadmin account
rake task create a superadmin account, and send
reset password instructions
2020-11-05 16:03:55 +01:00
Christophe Robillard
305ccdc0cd add recoverable and two_factor stragegy for administration 2020-11-05 16:03:55 +01:00
Christophe Robillard
6c2eb22960 remove github authentication for manager 2020-11-05 16:03:55 +01:00
Keirua
331159b767
Merge pull request #5718 from betagouv/dev
2020-11-04-01
2020-11-04 17:49:50 +01:00
Keirua
29cfdfbe91
Merge pull request #5714 from betagouv/fix-counters
Correction du compteur de dossiers à suivre
2020-11-04 17:13:01 +01:00
clemkeirua
30dfe7fbd0 fix a_suivre 2020-11-04 11:07:53 +01:00
LeSim
2528aec0c6
Merge pull request #5712 from betagouv/dev
2020-10-30-02
2020-10-30 18:36:20 +01:00
LeSim
aae77c77b0
Merge pull request #5710 from betagouv/revert-5705-feat/5701
Revert "feat 5701 - Ajoute l'information lorsqu'un usager s'authentifie via France Connect"
2020-10-30 18:31:21 +01:00
Kara Diaby
f78e0ced3a
Revert "feat 5701 - Ajoute l'information lorsqu'un usager s'authentifie via France Connect" 2020-10-30 18:28:08 +01:00
Kara Diaby
999c6d9682
Merge pull request #5709 from betagouv/dev
2020-10-30-01
2020-10-30 18:06:42 +01:00
Kara Diaby
4c2c5c630c
Merge pull request #5705 from betagouv/feat/5701
feat 5701 - Ajoute l'information lorsqu'un usager s'authentifie via France Connect
2020-10-30 17:37:35 +01:00
kara Diaby
e6c1a20329 Ajoute l'information lorsqu'un usager s'authentifie via France Connect 2020-10-30 17:28:54 +01:00
LeSim
18d0a657a7
Merge pull request #5708 from betagouv/remove_rack_mini_profiler_from_prod
Remove rack_mini_profiler from prod
2020-10-30 17:21:45 +01:00
simon lehericey
d82d1132c2 Remove rack_mini_profiler from prod as it could show env var and force us to allow unsafe_eval and script in csp 2020-10-30 17:08:31 +01:00
Kara Diaby
da371be9e2
Merge pull request #5707 from betagouv/fix-titre-identite
fix / Modifie la description dans le champ titre identité
2020-10-30 15:52:51 +01:00
kara Diaby
7d157eac12 Modifie la description dans le champ titre identité 2020-10-30 14:17:09 +01:00
LeSim
ac1c53f8f5
Merge pull request #5704 from betagouv/retry_503_in_social_attestation
cherche a télécharger l'attestation sociale tous les jours pendant 5 jours
2020-10-28 17:05:36 +01:00