Commit graph

14176 commits

Author SHA1 Message Date
simon lehericey
c76d1043fa add cnaf champ 2021-10-12 14:27:20 +02:00
simon lehericey
354735ace4 add champ value_json jsonb column 2021-10-12 14:27:20 +02:00
simon lehericey
d68129b34d add cnaf type de champ 2021-10-12 14:26:40 +02:00
simon lehericey
b69dafc3d4 CNAF in lowercase 2021-10-12 14:26:40 +02:00
simon lehericey
17a2b5dc53 fix a strange encoding error 2021-10-12 14:26:40 +02:00
simon lehericey
05e127af4b corrige une locale 2021-10-12 14:26:40 +02:00
Pierre de La Morinerie
d1035c05b6
Merge pull request #6533 from betagouv/move-logging-class
Nettoyage : déplacement de la classe ActiveJobLogSubscriber en dehors des initializers (#6533)
2021-10-12 11:51:35 +02:00
Pierre de La Morinerie
0b02fce5e4 jobs: move ActiveJobLogSubscriber out of initializers
This is a class of its own, it doesn't need to be in the initializers.
2021-10-12 11:40:19 +02:00
LeSim
8179c609e0
Merge pull request #6535 from betagouv/fix_merge
Corrige une erreur lors de la fusion de compte dans le manager
2021-10-12 11:39:17 +02:00
simon lehericey
7c65571fca add case when the old_expert or old_instructeur is nil 2021-10-12 11:04:06 +02:00
simon lehericey
ec8ccad465 typo 2021-10-12 11:03:34 +02:00
LeSim
d3f8ba2516
Merge pull request #6534 from betagouv/main
2021-10-11-01
2021-10-11 10:20:46 +02:00
LeSim
ba7f75bcac
Merge pull request #6519 from betagouv/super_admin_change_instructeur_email
ETQ Super Admin je veux changer le mail d'un instructeur (#6515)
2021-10-07 16:01:39 +02:00
simon lehericey
d7e621d167 beef up the merge methods 2021-10-07 15:51:31 +02:00
simon lehericey
77d14d4a60 forbid admin merge yet 2021-10-07 15:51:31 +02:00
simon lehericey
5009c583ea Add notice when merging account 2021-10-07 15:51:31 +02:00
simon lehericey
a480b31eb5 merge expert 2021-10-07 15:51:31 +02:00
simon lehericey
136f29524e merge instructeur 2021-10-07 15:51:31 +02:00
simon lehericey
9a6a53349f simple cases when the preexisting targeted account does not have instructeur or profile profile 2021-10-07 15:51:31 +02:00
simon lehericey
c56199e8f7 spec cleaning 2021-10-07 15:51:31 +02:00
simon lehericey
195583c0bd Enable manager specs 2021-10-07 15:51:31 +02:00
Paul Chavard
3244e7cbb3
Merge pull request #6530 from tchak/feat-become-administrateur
feat(manager): add become administrateur button in manager (with 24h expiration)
2021-10-07 15:42:35 +02:00
Kara Diaby
c65345b0f1
Merge pull request #6531 from betagouv/main
2021-10-07-01
2021-10-07 11:34:30 +02:00
Paul Chavard
4a947f9135 feat(manager): add become administrateur button in manager (with 24h expiration) 2021-10-07 11:32:12 +02:00
Kara Diaby
91fbd3e97b
Merge branch 'production' into main 2021-10-07 11:15:16 +02:00
Paul Chavard
05bf8bd655
Merge pull request #6528 from tchak/fix-discard-dossiers-procedures-jobs
Corrige les jobs de suppression de dossiers et démarches
2021-10-07 11:08:01 +02:00
Paul Chavard
70c33afcfe fix(avis): remove avis without dossier 2021-10-06 18:10:55 +02:00
Paul Chavard
9d5c5447c2 fix(dossier): do not attempt to destroy transfers when a dossier is destroyed
we had a dependent option on both sides of a relationship which created race conditions
2021-10-06 17:51:09 +02:00
Kara Diaby
f8a454d529
Merge pull request #6529 from betagouv/fix-layout-groupe-instructeurs
ETQ Administrateur je veux télécharger au format CSV tous les groupes instructeurs d'une démarche (EDIT)
2021-10-06 16:52:04 +02:00
kara Diaby
13883393eb modify layout 2021-10-06 16:41:08 +02:00
LeSim
a6d6d74a1a
Merge pull request #6525 from betagouv/dependabot/npm_and_yarn/url-parse-1.5.3
build(deps): bump url-parse from 1.5.1 to 1.5.3
2021-10-06 15:44:11 +02:00
dependabot[bot]
2d0985c58e
build(deps): bump url-parse from 1.5.1 to 1.5.3
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-06 13:33:02 +00:00
Paul Chavard
a8564628d3
Merge pull request #6527 from betagouv/main
2021-10-06-02
2021-10-06 12:11:31 +02:00
Paul Chavard
89a52d5210
Merge pull request #6524 from tchak/fix-no-log-on-dossiers-brouillons
fix(dossier): never write dossier logs on dossiers brouillons
2021-10-06 11:06:50 +02:00
Kara Diaby
d97f2a79f5
Merge pull request #6526 from betagouv/main
2021-10-06-01
2021-10-06 10:36:11 +02:00
Kara Diaby
c419ccfb06
Merge branch 'production' into main 2021-10-06 10:26:00 +02:00
Paul Chavard
d3c1941fbe fix(dossier): never write dossier log on dossiers brouillons 2021-10-05 17:56:51 +02:00
Kara Diaby
cf52e4bfc2
Merge pull request #6521 from betagouv/feat/6509
ETQ Administrateur, je souhaite exporter tous les groupes instructeurs d'une démarche au format CSV
2021-10-05 15:57:45 +02:00
kara Diaby
919d708ec4 tests 2021-10-05 15:37:30 +02:00
kara Diaby
e4b61eae21 layout 2021-10-05 15:37:29 +02:00
kara Diaby
177074bf32 css 2021-10-05 15:37:29 +02:00
kara Diaby
6251c3369b routes 2021-10-05 15:37:29 +02:00
kara Diaby
9c9eeb8e76 modify groupe instructeurs controller$ 2021-10-05 15:37:29 +02:00
Kara Diaby
5108b4f9d7
Merge pull request #6490 from betagouv/feat/6487
ETQ expert, je veux télécharger le dossier en pdf et ses pj
2021-10-05 15:13:08 +02:00
kara Diaby
0bd879ec9b modify pj service 2021-10-05 15:00:21 +02:00
kara Diaby
6ef5b5d474 modify downloable file 2021-10-05 15:00:21 +02:00
kara Diaby
cbedef996b tests 2021-10-05 15:00:21 +02:00
kara Diaby
6c82e40ddb routes 2021-10-05 15:00:21 +02:00
kara Diaby
bfee9c275c layout 2021-10-05 15:00:21 +02:00
kara Diaby
6d89d914e2 modify expert avis controller 2021-10-05 15:00:21 +02:00