gregoirenovel
02a8693f7b
Merge pull request #2542 from betagouv/fix-feedbacks
...
FeedbacksController should inherit from UserController
2018-09-11 10:17:31 +02:00
gregoirenovel
05d2988f61
Format FeedbackController like the other controllers
2018-09-11 10:10:43 +02:00
gregoirenovel
d504af3216
FeedbacksController should inherit from UserController
2018-09-11 10:10:43 +02:00
Pierre de La Morinerie
c37e672112
Merge pull request #2538 from betagouv/improve-messagerie-css
...
Improve messagerie CSS
2018-09-11 10:06:36 +02:00
gregoirenovel
ce458764f1
from-me is only relevant when the message is in a messages-list
2018-09-08 10:12:28 +02:00
gregoirenovel
6a475981e3
The relative message width is only relevant in messages-list
2018-09-08 10:12:28 +02:00
gregoirenovel
afae82c5ba
Remove a useless import in messagerie.scss
2018-09-08 10:12:28 +02:00
gregoirenovel
7482b859d5
Extract the message class into its own file
2018-09-08 10:12:28 +02:00
gregoirenovel
a4367c0809
Extract some more CSS classes from .messagerie to .messagge
2018-09-08 10:12:28 +02:00
gregoirenovel
94e5f856d3
Extract some CSS in a .message class
2018-09-08 10:12:28 +02:00
gregoirenovel
e2091fabdf
Unscope .messages-list
2018-09-08 10:12:28 +02:00
gregoirenovel
5b7213816e
Merge pull request #2537 from tchak/dossier-link
...
Refactor dossier_link champ
2018-09-08 10:12:06 +02:00
Paul Chavard
b63038faca
Allow administrateur to try dossier info on aperçu page
2018-09-07 19:41:34 +01:00
Paul Chavard
f3333595a0
Drop text_summary endpoint
2018-09-07 19:41:34 +01:00
Paul Chavard
212dee1565
Drop unused js
2018-09-07 19:41:33 +01:00
Paul Chavard
c49db4b5a4
Add a champs/dossier_link endpoint and use it to fetch dossier info
2018-09-07 19:41:33 +01:00
Paul Chavard
e2a2748e79
Expose authenticated_logged_user! method
2018-09-07 17:11:19 +01:00
Paul Chavard
7e94f7778a
Disable csrf forgery protection in test environement
2018-09-07 17:11:19 +01:00
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
