Commit graph

6112 commits

Author SHA1 Message Date
gregoirenovel
98a3ce038b Merge branch 'dev' 2018-09-07 12:23:54 +02:00
gregoirenovel
9c9e4b096d
Merge pull request #2528 from tchak/instructeur-published-drafts
Instructeur published drafts and better info on show page
2018-09-07 12:23:27 +02:00
Paul Chavard
5dadaa1a8d Show brouillon tag on procedure names in user and instructeur lists 2018-09-07 11:21:50 +01:00
Paul Chavard
23017f4b17 Show better lien information on procedure page 2018-09-07 11:21:07 +01:00
Paul Chavard
23170f54c0 Instructeur should see published drafts 2018-09-07 11:20:16 +01:00
gregoirenovel
eb25c7b22d
Merge pull request #2531 from betagouv/ameliorations-messagerie
Améliorations à la messagerie
2018-09-07 12:03:55 +02:00
Pierre de La Morinerie
1da0321c26 messagerie: never display full sender email
See #2307
2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
353ab812fc messagerie: fix 'Invité' label in message sender 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
211674435e messagerie: better format message dates 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
fe13871380 messagerie: add explanation for usagers 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
21dc9f8109 messagerie: improve success message 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
a6aac28b66 messagerie: move "Send" button to the right 2018-09-07 12:02:26 +02:00
Pierre de La Morinerie
6cd88db853 messagerie: make "Send" button primary 2018-09-07 12:02:26 +02:00
Paul Chavard
3f113fd170
Merge pull request #2526 from betagouv/tabs
Tabs
2018-09-07 10:58:37 +01:00
gregoirenovel
9c6a66ae75 Change the route for DossierController#modifier
If we submit the form, and there’s an error, the
URL would be `/dossiers/:id`, therefore
`dossier_path(dossier)`, so the Résumé tab would
be active, not the messagerie tab. This change
prevents this behaviour.
2018-09-07 11:30:00 +02:00
gregoirenovel
038cabfae3 The Demande tab should be active when we’re editing the demande 2018-09-07 11:30:00 +02:00
gregoirenovel
ee4d71a3f4 dynamic_tab_item now handles url arrays 2018-09-07 11:30:00 +02:00
gregoirenovel
59e809f029 active_tab_item → dynamic_tab_item 2018-09-07 11:06:26 +02:00
gregoirenovel
3604ee5453
Merge pull request #2524 from betagouv/new-dossier-improvements
New dossier improvements
2018-09-07 11:04:10 +02:00
gregoirenovel
095166e38f Add original states restoration after some tests
To avoid failing tests
2018-09-07 10:31:39 +02:00
gregoirenovel
23405efd3a Mutualize some code in #update_dossier_and_compute_errors 2018-09-07 10:19:10 +02:00
gregoirenovel
6fe1f912c8 Refactor DossiersController#update
Nested ifs are heavier but easier to understand
as related conditions are visually grouped
2018-09-07 10:19:10 +02:00
gregoirenovel
230bf22b77 Redactor DossierController#update_brouillon 2018-09-07 10:19:10 +02:00
gregoirenovel
f5debfef46 DossierController#draft? → #save_draft? 2018-09-07 10:19:10 +02:00
gregoirenovel
87e59e2bfb Streamline DossierController#update_brouillon and #update 2018-09-07 10:19:10 +02:00
gregoirenovel
1341074325 Add DossierController#update 2018-09-07 10:19:10 +02:00
gregoirenovel
cd46ee06e1 Add DossierController#modifier 2018-09-07 10:19:10 +02:00
gregoirenovel
338ffb8b50 DossierController#update → #update_brouillon 2018-09-07 10:19:10 +02:00
gregoirenovel
5ac8117c69 DossierController#modifier → #brouillon 2018-09-07 10:19:10 +02:00
gregoirenovel
d9feae4df0 Merge branch 'dev' 2018-09-07 10:11:04 +02:00
Pierre de La Morinerie
075a28d36a
Merge pull request #2533 from betagouv/frederic/fix_1372-bump_spreadsheet_architect
[Fix #1372] Bump spreadsheet architect and axlsx
2018-09-06 18:16:06 +02:00
Frederic Merizen
cbd390218d [Fix #1372] Bump spreadsheet architect and axlsx
This allows us to bump rubyzip to a version that is free of CVE-2017-5946
2018-09-06 17:56:57 +02:00
Pierre de La Morinerie
450553a14a
Merge pull request #2532 from tchak/do-not-trigger-invalid-errors-on-path-fields
Do not triger validation errors on path field on description page
2018-09-06 17:08:25 +02:00
Paul Chavard
f1c1eb573c Do not triger validation errors on path field on description page 2018-09-06 15:48:11 +01:00
Pierre de La Morinerie
93ca12ffb3
Merge pull request #2527 from tchak/add-remote-input-event-support
Patch remote ujs handler with debounced input support
2018-09-06 16:32:39 +02:00
Paul Chavard
8c8e7f3ef3 Patch remote ujs handler with debounced input support 2018-09-06 15:09:02 +01:00
gregoirenovel
adadfa6a2f
Merge pull request #2525 from tchak/fix-a11y-page
Fix contact_link tag rendering on a11y page
2018-09-06 15:26:37 +02:00
Paul Chavard
fb883e2ebc Fix contact_link tag rendering on a11y page 2018-09-06 14:15:58 +01:00
gregoirenovel
529389accc Merge branch 'dev' 2018-09-06 12:54:33 +02:00
Pierre de La Morinerie
7932cd938f
Merge pull request #2523 from betagouv/fix-print
Fix dossier printing page
2018-09-05 16:26:07 +02:00
Pierre de La Morinerie
19908ede25 gestionnaire: fix dossier printing page
Fix the invalid template, and add tests.
2018-09-05 16:17:26 +02:00
gregoirenovel
8e47dc3b0b Merge branch 'dev' 2018-09-05 16:08:06 +02:00
gregoirenovel
9fdd528619
Merge pull request #2522 from betagouv/messages
Commentaires → Messages
2018-09-05 16:02:55 +02:00
gregoirenovel
088d1c74d3 Commentaires → Messages 2018-09-05 15:59:41 +02:00
gregoirenovel
55fe3ce660
Merge pull request #2521 from betagouv/demarches
Procédure → Démarche
2018-09-05 15:59:13 +02:00
gregoirenovel
00ecae5f93 Procédure → Démarche 2018-09-05 15:46:24 +02:00
gregoirenovel
fabfa7d5e6
Merge pull request #2419 from betagouv/template_notifications
Add layout for notifications mails
2018-09-05 15:45:56 +02:00
lucien mollard
b2f2e75f43 mailer: add layout for notifications emails 2018-09-05 15:31:08 +02:00
Pierre de La Morinerie
2a5a8cf621 mailer: fix typo in spec 2018-09-05 15:25:46 +02:00
Pierre de La Morinerie
d7dd027cb8 mailer: improve naming in specs 2018-09-05 15:25:46 +02:00