Commit graph

11943 commits

Author SHA1 Message Date
LeSim
c29ddbe404
Merge pull request #4413 from betagouv/dev
2019-10-16-01
2019-10-16 11:18:04 +02:00
LeSim
b235e7f403
Merge pull request #4412 from betagouv/add_web3_web4
Add web3 and web4
2019-10-16 11:06:32 +02:00
simon lehericey
3c5eaed2f3 Add web3 and web4 2019-10-16 10:58:54 +02:00
LeSim
8debd07b84
Merge pull request #4406 from betagouv/add_name_to_groupe_instructeur_list
Ajoute une colonne dans la table procédure qui contiendra le label de la liste de routage
2019-10-16 10:36:41 +02:00
simon lehericey
6389a29f60 Add procedure routing criteria name 2019-10-16 10:30:55 +02:00
Pierre de La Morinerie
0a423f3e80
2019-10-15-01 (#4409)
2019-10-15-01
2019-10-15 15:38:58 +02:00
Pierre de La Morinerie
dec5cd58e4
[Instructeur] Améliore le dropdown de changement d'état d'un do… (#4401)
Instructeur : amélioration du menu de changement d'état d'un dossier
2019-10-15 13:35:48 +02:00
Pierre de La Morinerie
db0fede521 views: improve the state button
- Turn the "accepted" infos into standard dropdown sections
- Display the justificatif even if there is no motivation
2019-10-15 12:48:14 +02:00
Pierre de La Morinerie
dd57953b76 views: refactor the state button
Now that all states have a dropdown, we can simplify the code.

This also brings the "Repasser en instruction" action for all states
(including when no attestation or motivation is present).
2019-10-15 12:48:14 +02:00
Pierre de La Morinerie
07f75ff20e views: fix missing attestation link
- Fix the missing link to see attestations (see #4400)
- Fix the "Repasser en instruction" wording being confusing for
  accepted state
- Add lot of tests
2019-10-15 12:48:14 +02:00
Pierre de La Morinerie
e3d61a8303
[Instructeur] Improve attestation preview (#4404)
Instructeur : la prévisualisation de l'attestation est plus simple
2019-10-15 12:48:06 +02:00
Pierre de La Morinerie
0e5f66c5ba views: make the "Voir l'attestation" UI simpler
Instead of adding a button, just turn the "attestation" text into a link
2019-10-15 12:41:37 +02:00
Pierre de La Morinerie
0064c2c610 views: tell an attestation will be sent only if it is true
Previously the message stating "an attestation will be sent" was
displayed even when the attestation was disabled.
2019-10-15 12:41:37 +02:00
LeSim
17d8167390
Merge pull request #4405 from betagouv/improve-avis-layout
avis: improve layout and wording
2019-10-15 10:50:01 +02:00
Pierre de La Morinerie
e0571a8ae3 avis: improve layout and wording 2019-10-14 16:03:08 +02:00
Keirua
940b28b482
Merge pull request #4398 from betagouv/dev
2019-10-09-01
2019-10-09 10:58:24 +02:00
Pierre de La Morinerie
51c194e253
Refactoring : in tasks, replace puts by rake_puts (#4397)
Refactoring : in tasks, replace `puts` by `rake_puts`
2019-10-09 10:17:09 +02:00
Pierre de La Morinerie
669f21d1d8 tasks: replace puts by rake_puts
It avoids tasks logs to clutter the tests output.
2019-10-08 16:54:57 +02:00
Pierre de La Morinerie
fed723cc77
ChampsPolicy: allow instructeurs to access private annotations (#4396)
Instructeur : corrige l'utilisation des cartes dans les annotations privées (#4388)
2019-10-08 15:13:15 +02:00
Pierre de La Morinerie
c2e82e4145 champ_policy: allow instructeurs to access private annotations
Fix #4388
2019-10-08 14:34:12 +02:00
Pierre de La Morinerie
a20b6b73a2 policies: rename "Scope" to "ApplicationScope"
For clarity.
2019-10-08 14:28:26 +02:00
LeSim
e1c046f4d8
Merge pull request #4393 from betagouv/remove_simple_form
Supprime la gem 'simple_form'
2019-10-08 14:00:16 +02:00
simon lehericey
f31c184b56 [fix #1537] Remove simple_form gem 2019-10-08 11:08:35 +02:00
simon lehericey
785b8fd78f Remove simple form from mail_templates 2019-10-08 10:57:35 +02:00
LeSim
c4ed341847
Merge pull request #4391 from betagouv/dependabot/bundler/rubyzip-1.3.0
Bump rubyzip from 1.2.2 to 1.3.0
2019-10-08 10:36:18 +02:00
dependabot[bot]
eba1825a03
Bump rubyzip from 1.2.2 to 1.3.0
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.2...v1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-08 08:19:56 +00:00
LeSim
13f4e2c3fb
Merge pull request #4390 from betagouv/admin_active
Corrige la notion d'administrateur actif
2019-10-08 10:14:35 +02:00
simon lehericey
725798da6a [fix #4361] Update user table sign_in 2019-10-08 10:09:16 +02:00
simon lehericey
0c15326df6 User: inactive user have never signed_in 2019-10-08 10:09:16 +02:00
LeSim
b1bc7a2642
Merge pull request #4387 from betagouv/small_optims
Small optims
2019-10-08 10:06:47 +02:00
simon lehericey
3e0f1b9c66 User: eager load instructeur and administrateur to remove 2 db requests per http request 2019-10-08 09:53:40 +02:00
simon lehericey
5143d341ec Admin: 1 query for crips 2019-10-08 09:53:40 +02:00
Paul Chavard
b52dfebfca
Merge pull request #4368 from tchak/auto-link
Auto-link valeur des champs
2019-10-07 21:37:49 +02:00
Paul Chavard
e7ed408e08 Auto-link valeur des champs
closes #2865
2019-10-07 21:20:24 +02:00
Pierre de La Morinerie
d92cf6617a
Ajout de template d'issues (#4389)
Ajout de modèles par défaut lors de la création d'une issue
2019-10-07 17:34:45 +02:00
Pierre de La Morinerie
cfa42343bc Ajout de template d'issues
Les templates d'issues sont affichés lorsque on clique sur le bouton "New issue" dans GitHub.

Deux objectifs :

- **Améliorer nos rapports de bugs interne** : nous encourager à décrire le problème des utilisateurs (plutôt que juste la solution proposée).
- **Améliorer les issues des contributeurs externes** : encourager les contributeurs à créer des issues claires (plutôt que des tableaux Excels imbitables).
2019-10-07 17:33:36 +02:00
Pierre de La Morinerie
03616b9709
Bump some javascript dependencies (#4344)
Mise à jour des dépendances Javascript
2019-10-07 15:49:14 +02:00
Paul Chavard
2c486b8fe2 Bump some javascript dependencies 2019-10-07 15:40:27 +02:00
Keirua
83c84e0514
Merge pull request #4381 from Keirua/feat/4058-instructeur-accepte-instruction
[fix #4058] instructeur peut passer accepte → instruction
2019-10-07 15:18:42 +02:00
clemkeirua
053cc5cfc5 [fix #4058] instructeur peut passer accepte → instruction 2019-10-07 15:17:33 +02:00
Paul Chavard
e0a8aff393
Merge pull request #4385 from Keirua/feat/remove-flipflop-zip
Suppression du feature flag `download_as_zip`
2019-10-03 12:07:38 +02:00
Keirua
3aac1acbef
Merge pull request #4384 from betagouv/dev
2019-10-03-01
2019-10-03 11:07:15 +02:00
clemkeirua
d3063c0b63 remove download_as_zip feature flag 2019-10-03 10:48:24 +02:00
Keirua
3c3bd981de
Merge pull request #4376 from Keirua/fix-merci-cant-modify
Fix de vocabulaire pour les dossiers non modifiables
2019-10-02 10:39:58 +02:00
clemkeirua
d8bc73b972 fix wording 2019-10-01 15:32:03 +02:00
clemkeirua
49cc3d4ba5 merci: ne pas afficher qu'un dossier peut être modifié si pas possible 2019-10-01 15:32:03 +02:00
Keirua
d3664d8dec
Merge pull request #4370 from betagouv/fix-4369-admin-UX
Add "Continuer" button 👉
2019-10-01 10:36:49 +02:00
Chaïb Martinez
d71ab9a7a8 Add "continuer" button 👉
[fix #4369]

Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-10-01 10:26:42 +02:00
Keirua
e3061cfe07
Merge pull request #4375 from betagouv/minor-change
Minor change
2019-10-01 10:24:58 +02:00
Chaïb Martinez
19590d9814 add "sortir" link
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-10-01 10:16:02 +02:00