Commit graph

5747 commits

Author SHA1 Message Date
gregoirenovel
d9623ed9a0 Merge branch 'dev' 2018-08-31 15:50:01 +02:00
gregoirenovel
f13533ad01
Merge pull request #2495 from betagouv/deletion-warning
Improve deletion warning text
2018-08-31 15:48:38 +02:00
gregoirenovel
75ee41b7fa [Fix #2494] Improve deletion warning text 2018-08-31 15:41:51 +02:00
gregoirenovel
23e3409247
Merge pull request #2497 from tchak/fix-safari-js
Fix safari bug
2018-08-31 14:52:39 +02:00
Paul Chavard
72dded2a5a Fix safari bug
Fix #2452
2018-08-31 11:58:33 +01:00
gregoirenovel
e9304da275
Merge pull request #2496 from betagouv/pj-warning
Add a warning in the attachements part of the form
2018-08-31 10:56:34 +02:00
gregoirenovel
66af573ca4 Add a warning in the attachements part of the form 2018-08-31 00:10:16 +02:00
Frederic Merizen
acfbba69c6
Merge pull request #2492 from betagouv/frederic/fix-1946/show-retention-time-to-users
[#1946] Show data retention time in footer
2018-08-30 18:14:51 +02:00
Frederic Merizen
559d080ca6 [#1946] Show data retention time in footer 2018-08-30 18:03:01 +02:00
gregoirenovel
f0c3a47b1b Merge branch 'dev' 2018-08-30 16:28:42 +02:00
gregoirenovel
6c1aee7d63
Merge pull request #2488 from tchak/improve-contact-form
Improve contact form
2018-08-30 16:23:58 +02:00
Paul Chavard
4866f9724a Add support controller send_form tests 2018-08-30 15:16:35 +01:00
Paul Chavard
5d5a356ade Cleanup contact_link helper 2018-08-30 15:12:50 +01:00
Paul Chavard
8e88f2c27f Cleanup support controller tests 2018-08-30 15:12:50 +01:00
Paul Chavard
0c582197da Do not send messages to brouillon dossier 2018-08-30 15:12:50 +01:00
Paul Chavard
854bc62caa Fix class name 2018-08-30 15:12:50 +01:00
Paul Chavard
ea5248dde1 Flatten tags list, cast to array and remove blank elements 2018-08-30 15:12:50 +01:00
Paul Chavard
b60805a54c Use mailto in error message 2018-08-30 15:12:50 +01:00
Paul Chavard
441e123e8a Do not lose form content on errors 2018-08-30 15:12:50 +01:00
Paul Chavard
7ac4dc355f Add default dossier_id to contact form on dossier pages 2018-08-30 15:12:50 +01:00
gregoirenovel
a943856141
Merge pull request #2490 from betagouv/gestionnaire-to-instructeur
Rename the last “Gestionnaire” occurence in the UI to “Instructeur”
2018-08-30 14:50:33 +02:00
gregoirenovel
6a33c30812 Rename the last “Gestionnaire” occurence in the UI to “Instructeur” 2018-08-30 14:42:09 +02:00
gregoirenovel
70a939e867
Merge pull request #2489 from betagouv/instructeurs-fix
Fix case typos
2018-08-30 14:33:42 +02:00
gregoirenovel
c015365057 Fix case typos 2018-08-30 14:23:45 +02:00
Frederic Merizen
40997a8a82
Merge pull request #2487 from betagouv/frederic/fix_2486-faster_spreadsheet_export
Frederic/fix 2486 faster spreadsheet export
2018-08-30 14:19:22 +02:00
Frederic Merizen
7326065590 [fix #2486] Include all needed attributes on downloadable_sorted
to avoid N+1 select
2018-08-30 14:13:32 +02:00
Frederic Merizen
9403d4c042 [#2486] followers_gestionnaires should not be a method
To help activerecord caching
2018-08-30 14:13:32 +02:00
Frederic Merizen
37c45f0d29 [#2486] Always order champs
to help activerecord cache the champs collection
2018-08-30 14:13:32 +02:00
Paul Chavard
0e2b7ec6e1 try to fix after_party on deploy 2018-08-30 12:51:28 +01:00
gregoirenovel
ef10a378a4
Merge pull request #2475 from betagouv/improvements
Improvements
2018-08-30 13:27:05 +02:00
gregoirenovel
04c6a653da Unify the CSS filenames’ case 2018-08-30 13:16:14 +02:00
gregoirenovel
89af9c2b36 Remove extra blank lines 2018-08-30 13:16:14 +02:00
gregoirenovel
e60aa0c37b Use scopes when possible 2018-08-30 13:16:14 +02:00
gregoirenovel
47962ef795 Simplify route_authorization 2018-08-30 13:16:14 +02:00
gregoirenovel
bf9f3b40df Remove useless .to_s 2018-08-30 13:16:14 +02:00
gregoirenovel
de48dab031 Alignment 2018-08-30 13:16:14 +02:00
gregoirenovel
15d1b01a90 Code simplification 2018-08-30 13:16:14 +02:00
gregoirenovel
3f0e61d292 Remove from .gitignore a line that should be in a global .gitignore 2018-08-30 13:16:14 +02:00
Paul Chavard
1c65baf484
Merge pull request #2483 from tchak/after_party
Add after_party
2018-08-30 12:11:14 +01:00
Paul Chavard
c67f8dcaaa Add after_party 2018-08-30 11:54:54 +01:00
Paul Chavard
5339ee43f5
Merge pull request #2485 from betagouv/instructeur
accompagnateur → instructeur
2018-08-30 11:22:51 +01:00
gregoirenovel
e5df2e40bd Merge branch 'dev' 2018-08-30 10:41:19 +02:00
gregoirenovel
3662b82039 accompagnateur → instructeur 2018-08-29 23:09:08 +02:00
gregoirenovel
d8a91bf57f
Merge pull request #2484 from tchak/helpscout-webhook
Add helpscout webhook
2018-08-29 23:08:44 +02:00
Paul Chavard
5f12ea43a7 Add helpscout webhook 2018-08-29 21:41:14 +01:00
Frederic Merizen
92f87b1f92
Merge pull request #2339 from betagouv/frederic/migrate_nutriscore_dossiers
Migrate nutriscore dossiers from old procedure to new procedure
2018-08-29 19:54:35 +02:00
Frederic Merizen
580c6145d0 Migrate nutriscore dossiers from old procedure to new procedure 2018-08-29 19:40:02 +02:00
gregoirenovel
feb5105b18
Merge pull request #2474 from betagouv/improve-enums
Improve enums
2018-08-29 17:37:21 +02:00
gregoirenovel
4b071ecf06 Use enum to the fullest with Dossier.states 2018-08-29 17:31:08 +02:00
gregoirenovel
ee25bba38c Use enum to the fullest with Service.type_organismes 2018-08-29 17:31:08 +02:00