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

13786 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kara Diaby
a5751943b8
Merge pull request #6693 from betagouv/fix/6638 
ETQ Instructeur, je veux voir les documents que j'ai joins à une demande d'avis
 2021-11-30 14:43:01 +01:00
Kara Diaby
ffcae81249 change locales 2021-11-30 14:27:58 +01:00
Kara Diaby
9d9ac54689 tests 2021-11-30 14:27:58 +01:00
Kara Diaby
f1525a798f Avis : display introduction file to experts 2021-11-30 14:27:58 +01:00
Pierre de La Morinerie
84886ac379
Merge pull request #6680 from betagouv/fill-both-instructeur-bypass-login-token 2021-11-30 13:45:42 +01:00
Pierre de La Morinerie
103502931a tasks: populate Instructeur.bypass_email_login_token again 
The task was run once in April 2021, but the new features enabled since
have not been synchronized.
 2021-11-30 13:41:25 +01:00
Pierre de La Morinerie
28dfc6a1ba manager: save bypass_email_login_token to both column and feature 2021-11-30 13:41:25 +01:00
Pierre de La Morinerie
8e683977d9
Merge pull request #6473 from betagouv/validate-empty-repetitions 2021-11-30 13:38:15 +01:00
Pierre de La Morinerie
99c77046d2 models: improve error message for invalid champs 
Avoid prepending the message with 'Draft revision '
 2021-11-30 13:34:41 +01:00
Pierre de La Morinerie
b86dec8251 views: prevent procedure publication on validation error 2021-11-30 13:34:41 +01:00
Pierre de La Morinerie
9db62178d2 views: display revision errors on the procedure dashboard 2021-11-30 13:34:41 +01:00
Pierre de La Morinerie
52b0fbf9b7 models: validate repetitions on publishing 2021-11-30 13:34:41 +01:00
Pierre de La Morinerie
48133c2595 models: don't save the procedure before the state transition 
Otherwise a validation error occurs here instead of on save.
 2021-11-30 13:34:41 +01:00
Pierre de La Morinerie
93124195fc specs: refactor procedure_creation_spec.rb 
- Improve wording of specs description
- Remove publication test (duplicate of procedure_publish_spec.rb)
 2021-11-30 13:34:41 +01:00
Pierre de La Morinerie
8e69a9883b specs: avoid using french in procedure_publish_spec.rb 2021-11-30 13:34:41 +01:00
LeSim
ca31a4c837
Merge pull request #6697 from betagouv/ruby_3_missing_gem 
Ajoute une gem manquante avec ruby 3
 2021-11-30 12:10:43 +01:00
simon lehericey
ab6d97d1ef add rexml 
rexml gems are now bundled gems
https://github.com/Shopify/bootsnap/issues/325
 2021-11-30 12:04:33 +01:00
LeSim
3b216ea7ce
Merge pull request #6675 from betagouv/ruby_3 
Ruby 3
 2021-11-30 11:39:37 +01:00
simon lehericey
c4cde500ce fix acsv 2021-11-30 09:42:45 +01:00
simon lehericey
5a0fb6237f 😭 AASM does not support keyword arguments 
https://github.com/aasm/aasm/issues/672
 2021-11-30 09:42:45 +01:00
simon lehericey
7e76b35297 need bootsnap bump 2021-11-30 09:42:45 +01:00
simon lehericey
b9a009da12 ruby 3.0.3 2021-11-30 09:42:45 +01:00
Pierre de La Morinerie
eb0c54f3a8
Merge pull request #6682 from betagouv/bye-bye-new-administrateur 2021-11-30 08:53:44 +01:00
Pierre de La Morinerie
184a401182 app: rename new_administrateur to administrateurs 2021-11-30 08:49:38 +01:00
LeSim
5736521f52
Merge pull request #6692 from betagouv/fix_redirection_in_manager 
Dans le manager, redirige correctement sur après avoir mergé des utilisateurs
 2021-11-29 15:31:02 +01:00
simon lehericey
a0c0520502 avoid redirection to a deleted user 2021-11-29 15:27:17 +01:00
Kara Diaby
8e2122cb62
Merge pull request #6691 from betagouv/fix-delete-dossier-by-user 
Fix delete dossier by user
 2021-11-29 14:35:56 +01:00
Kara Diaby
c75a9b6271 tests 2021-11-29 14:30:17 +01:00
Kara Diaby
23677956f3 modify controller 2021-11-29 11:34:31 +01:00
Paul Chavard
6037c22a75
Merge pull request #6687 from betagouv/drop_feedbacks_table 
Supprime la table obsolete feedbacks
 2021-11-27 13:05:39 +03:00
simon lehericey
956d957dad Drop unused feedbacks table 
Its foreign key prevent some user to be destroyed
 2021-11-26 16:20:24 +01:00
Kara Diaby
feed725f10
Merge branch 'production' into main 2021-11-26 15:16:51 +01:00
Kara Diaby
530069b94d
Merge pull request #6685 from betagouv/US/fix-user-dossiers-traites 
hotfix(scoping): try to avoid requesting archived: false when using termine scope
 2021-11-26 15:15:11 +01:00
Martin
cf82c030e8 hotfix(scoping): try to avoid requesting archived: false when using termine scope, use state_termine instead 2021-11-26 15:09:53 +01:00
mfo
abb7fad79a
Merge pull request #6674 from betagouv/6647-etq-usager-je-souhaiterai-que-les-statistiques-en-ligne-prennent-en-compte-tous-les-dossiers-meme-supprimes 
6647 - ETQ usager je souhaite que les statistiques en ligne prennent en compte tous les dossiers meme les supprimes
 2021-11-26 13:40:43 +01:00
Martin
970e43efb8 feat(stats#index): update Stat model to also query DossierDeleted in stats computation 
tech(question): discard_and_keep_track! ; are we really keeping track with default_scope { kept } ?

feat(stats): add DeletedDossier in Stat computations

Revert "tech(question): discard_and_keep_track! ; are we really keeping track with default_scope { kept } ?"

This reverts commit d1155b7eeaaf1a9f80189e59667e109541fcb089.

feat(stats): support deleted_dossiers for last_four_months_hash and cumulative_hash. extract sanitize query & merge hashes in methdos

clean(rubocop): lint with rubocop

Update db/migrate/20211126080118_add_index_to_deleted_at_to_deleted_dossiers.rb

Co-authored-by: LeSim <mail@simon.lehericey.net>

fix(rubocop): avoid uneeded allocation

fix(migration): add concurrent index with expected synthax

fix(brakeman): add ignore message since group date_trunc evaluation is used by only ourself
 2021-11-26 13:29:40 +01:00
Kara Diaby
a6ab0f01fa
Merge pull request #6683 from betagouv/main 
2021-11-26-01
 2021-11-26 10:11:22 +01:00
Kara Diaby
783b0ed9f0
Merge pull request #6628 from betagouv/feat/6536 
ETQ usager, je veux pouvoir supprimer les dossiers terminés
 2021-11-26 09:51:28 +01:00
Kara Diaby
67d331e788 modify locales fr and en 2021-11-26 09:45:13 +01:00
Kara Diaby
2103f09be1 layout 2021-11-26 09:45:13 +01:00
Kara Diaby
24ba7b6633 modify dossier projection service 2021-11-26 09:45:13 +01:00
Kara Diaby
fef7f79237 add route 2021-11-26 09:45:13 +01:00
kara Diaby
06540c1b93 tests 2021-11-26 09:45:13 +01:00
kara Diaby
eaac293da3 add a new tab traités on user dossiers 2021-11-26 09:45:13 +01:00
kara Diaby
a91960bd4f add hidden by user column on dossiers 2021-11-26 09:45:13 +01:00
mfo
ae88a36902
Merge pull request #6653 from betagouv/6580/etq-utilisateur-j-aimerais-fusionner-mes-comptes-fc-ds-avec-un-mail-de-confirmation 
6580 ETQ Utilisateur, j'aimerais fusionner mes comptes FC/DS avec un mail de confirmation
 2021-11-25 17:41:28 +01:00
Martin
fdf0f18fda fix(i18n): wrap text under i18n.t 
i18n(france_connect/*): replace wording with i18n

fix(lint): i18n key issue

secu(views/france_connect/particulier/merge.html.haml): sanitize france_connect_email just in case

fix(brakeman): sanitize FCI.email_france_connect when used with html_safe via an I18n.t, also add exception to brakeman
 2021-11-25 17:34:37 +01:00
Martin
febe890d28 fixup! Add confirmation by email when merging DC/FC accounts 2021-11-25 17:34:37 +01:00
Martin
8a315a4ac1 feat(UserMailer.france_connect_merge_confirmation): in addition to distance_of_time_in_words, add exact expiration date 2021-11-25 17:34:37 +01:00
Martin
21894d0a0a feat(france_connect/particulier#callback): in case the FC email exists as an DC account which is an instructor or and administrator, returns early to new_session_path so he can connect with this existing account 2021-11-25 17:34:36 +01:00