DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
13270 commits 4 branches 1166 tags 84 MiB
Commit graph

13270 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Chavard
b48e7813d2 Put watermark code behind a feature flag 2020-11-25 16:19:06 +01:00
Paul Chavard
371179dc5b Watermark titres identite 2020-11-25 16:19:06 +01:00
Paul Chavard
cce0edb654
Merge pull request #5761 from betagouv/dev 
2020-11-25-01
 2020-11-25 11:15:39 +01:00
Paul Chavard
708cc20b95
Merge pull request #5760 from tchak/fix-graphql-upload 
[GraphQL] fix attachment upload
 2020-11-25 11:03:01 +01:00
Paul Chavard
cac981cf42 fix warning with ruby 2.7 2020-11-25 10:46:34 +01:00
Paul Chavard
00ef56db10 [GraphQL] fix attachment upload 
- `identify` will return `true` sometime
 2020-11-25 10:46:20 +01:00
LeSim
6ee2bec997
Merge pull request #5755 from adullact/5754_allow_CGU_LEGAL_URLS_to_be_configured_in_ENV_file 
#5754 - Allow CGU URL and Legal Notice URL to be configured in .env file
 2020-11-23 17:06:25 +01:00
Fabrice Gangler
d3caf30bf3 allow CGU URL and Legal Notice URL to be configured in .env file 
Refs: #5754
 2020-11-20 22:11:42 +01:00
Paul Chavard
b29d467538
Merge pull request #5751 from betagouv/dev 
2020-11-18-01
 2020-11-18 15:46:08 +01:00
Paul Chavard
daa4cd0280
Merge pull request #5745 from betagouv/totp-change-label 
add specific totp label for dev env
 2020-11-17 17:16:14 +01:00
Christophe Robillard
6f3bf48d30 add specific totp label for dev env 2020-11-17 15:33:13 +00:00
Paul Chavard
935e35d0fe
Merge pull request #5748 from betagouv/remove-dossier-operation-logs-foreign-key 
Remove foreign key dossier  on dossier operations logs
 2020-11-17 16:32:15 +01:00
kara Diaby
d9dea779ea Remove foreign key dossier on dossier operations logs 2020-11-17 16:02:53 +01:00
LeSim
5f3cc9daa3
Merge pull request #5741 from tchak/better-error-on-graphql-file-upload 
[GraphQL] add better errors when attachments are not properly used
 2020-11-17 16:00:56 +01:00
Paul Chavard
b897e0cc1c [GraphQL] add better errors when attachments are not properly used 2020-11-17 12:40:14 +01:00
krichtof
67c15026b3
Merge pull request #5747 from betagouv/dev 
2020-11-16-01
 2020-11-16 18:17:12 +01:00
krichtof
68b849c827
Merge pull request #5744 from betagouv/idp-provider 
fix saml entity id
 2020-11-16 17:53:11 +01:00
Christophe Robillard
f368255f91 fix saml entity id 2020-11-16 15:01:16 +01:00
krichtof
3ae6d7be99
Merge pull request #5740 from betagouv/idp-provider 
DS devient fournisseur d'identité SAML pour Sendinblue
 2020-11-16 12:30:19 +01:00
Christophe Robillard
d91e9b372f add sendinblue login link to manager 2020-11-16 12:19:54 +01:00
Christophe Robillard
9347951cea act as an saml identity provider 2020-11-16 12:19:54 +01:00
Paul Chavard
e1857042e4
Merge pull request #5739 from betagouv/dev 
2020-11-12-01
 2020-11-12 17:16:39 +01:00
Paul Chavard
f30ac39ffb
Merge pull request #5738 from tchak/fix-graphql-n+1 
Fix champ->type_de_champ n+1
 2020-11-12 15:59:26 +01:00
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