gregoirenovel
80fda3f414
Merge branch 'dev'
2018-11-22 09:26:28 +01:00
gregoirenovel
75777e7af8
Merge pull request #3036 from betagouv/simplify
...
Simplify
2018-11-22 02:05:51 +01:00
gregoirenovel
d0ec53a494
Move accessibilite to the root controller
2018-11-22 02:00:54 +01:00
gregoirenovel
82d764e340
Move tour_de_france to the root controller
2018-11-22 02:00:54 +01:00
gregoirenovel
4a8b56cded
Remove an unneeded slash
2018-11-22 02:00:54 +01:00
gregoirenovel
be08e5a248
Move a route to a better position
2018-11-22 02:00:54 +01:00
gregoirenovel
d1c509696f
Merge pull request #3037 from betagouv/remove-unicorn
...
Remove any reference to unicorn now that we run on puma
2018-11-22 02:00:49 +01:00
gregoirenovel
8eaec4de6a
Remove any reference to unicorn now that we run on puma
2018-11-22 01:56:29 +01:00
gregoirenovel
4c313a6c45
Merge pull request #3034 from betagouv/remove-useless-file
...
Remove a useless file
2018-11-22 01:56:25 +01:00
gregoirenovel
dffd132564
Remove a useless file
2018-11-22 01:51:55 +01:00
gregoirenovel
b160ca151e
Merge pull request #3035 from betagouv/remove-dead-route
...
Remove a dead route
2018-11-22 01:51:35 +01:00
gregoirenovel
455e7ef364
Remove a dead route
2018-11-22 01:47:29 +01:00
gregoirenovel
2d0c042805
Merge pull request #3038 from betagouv/remove-relics
...
Remove relics (unused PDF files)
2018-11-22 01:47:23 +01:00
gregoirenovel
2003f2394d
Remove unused PDF files
2018-11-22 01:43:07 +01:00
gregoirenovel
f9f45eb413
Merge pull request #3030 from betagouv/fix-324
...
[Fix #324 ] Convert the last text email to html
2018-11-22 01:42:54 +01:00
gregoirenovel
5b24d116d9
[ Fix #324 ] Convert the last text email to html
2018-11-22 01:38:21 +01:00
gregoirenovel
80c863c39c
Merge pull request #3031 from betagouv/fix-463
...
[Fix #463 ] Use l instead of I18n.l in views
2018-11-22 01:37:55 +01:00
gregoirenovel
5c5175d37c
[ Fix #463 ] Use l instead of I18n.l in views
2018-11-22 01:33:10 +01:00
gregoirenovel
d2ed6c4eb7
Merge pull request #3040 from betagouv/improve-folder-naming
...
Properly name a font folder
2018-11-22 01:32:59 +01:00
gregoirenovel
b986e43f4d
Properly name a font folder
2018-11-22 01:27:53 +01:00
gregoirenovel
22a9ca46da
Merge pull request #3022 from betagouv/fix-3015-conversion-tracking
...
Fix 3015 conversion tracking
2018-11-21 18:39:22 +01:00
Chaïb Martinez
0e8d235800
Add some params to track forms submissions
2018-11-21 18:25:47 +01:00
Mathieu Magnin
289daf04a4
Merge pull request #3024 from betagouv/dev
...
MEP 2018-11-21-01
2018-11-21 16:53:23 +01:00
Mathieu Magnin
b0da4144bd
Merge pull request #3023 from betagouv/cancel-cleanup
...
Cancel cleanup
2018-11-21 16:32:53 +01:00
Mathieu Magnin
167aff30f4
Cancel cleanup
2018-11-21 16:28:02 +01:00
gregoirenovel
37215c4f1e
Merge pull request #2885 from betagouv/fix-2212-seo
...
MAJ du robots.txt pour bloquer l'indexation de certaines pages.
2018-11-21 15:12:49 +01:00
Chaïb Martinez
ae30a1b41c
MAJ du robots.txt pour bloquer l'indexation de certaines pages.
2018-11-21 15:05:39 +01:00
gregoirenovel
98df9ba07f
Merge pull request #3020 from betagouv/cleanup-releases-after-deploy
...
Cleanup releases after deploy
2018-11-21 14:39:37 +01:00
Mathieu Magnin
88b8c190f5
Cleanup releases after deploy
2018-11-21 14:35:00 +01:00
gregoirenovel
fc6fcb6f19
Merge pull request #3010 from betagouv/fix-3008
...
[Fix #3008 ] Soft delete demarche button in manager
2018-11-21 14:34:37 +01:00
Mathieu Magnin
3ce9dd39af
[ Fix #3008 ] Soft delete demarche button in manager
2018-11-21 14:29:42 +01:00
gregoirenovel
53699e71d9
Merge pull request #3012 from betagouv/fix-manager-width-bug
...
Fix width in manager procedure detail
2018-11-21 14:29:25 +01:00
Mathieu Magnin
5c2fe50319
Fix width in manager procedure detail
2018-11-21 14:24:09 +01:00
gregoirenovel
4c1388ef81
Merge pull request #3019 from betagouv/fix-3016
...
[Fix #3016 ] Do not crash if PJ has no extension
2018-11-21 14:23:34 +01:00
Mathieu Magnin
7c1768e5bb
[ Fix #3016 ] Do not crash if PJ has no extension
2018-11-21 14:15:45 +01:00
Paul Chavard
f1d2def8c8
Merge pull request #3018 from tchak/fix-carte-champs
...
Fixes on champs Carte
2018-11-21 13:34:47 +01:00
Paul Chavard
c99ef811b6
Do not save error json in database
2018-11-21 13:03:01 +01:00
Paul Chavard
49c872fb97
Fail fast if passed champ_id is invalid
2018-11-21 13:03:01 +01:00
Paul Chavard
b596956761
Merge pull request #3017 from betagouv/fix-missing-host-in-email-assets
...
config: fix email assets not having the full URL domain prepended
2018-11-21 13:02:48 +01:00
Pierre de La Morinerie
ac9a87f27b
config: fix email assets not having the full URL domain prepended
...
When sending emails, the mailer doesn't have access to the request
host. It needs to infer it by itself.
For this we need two settings:
- action_mailer.default_url_options, to generate urls to routes
- action_mailer.asset_host, to generate full urls to assets
Only the first one of these settings was set in production.
Fix #2518
2018-11-21 12:30:00 +01:00
Pierre de La Morinerie
37af20b236
Merge pull request #3011 from betagouv/fix-mailer-tests
...
mailers: fix dossier mailer spec
2018-11-20 17:51:10 +01:00
Pierre de La Morinerie
f983bc68e2
mailers: fix dossier mailer spec
2018-11-20 17:45:50 +01:00
gregoirenovel
eeb11ff3b3
Merge branch 'dev'
2018-11-20 15:01:14 +01:00
gregoirenovel
dde43141ef
Merge pull request #3004 from betagouv/fix-new-message-footer
...
Corrige le lien direct vers la messagerie dans l'email "Vous avez un nouveau message"
2018-11-20 14:58:13 +01:00
Pierre de La Morinerie
38b5c77ad3
mailers: use notification layout for 'new answer' email
...
Fix #2224
2018-11-20 14:46:31 +01:00
Pierre de La Morinerie
a5f9be00e0
mailers: add preview URL to all previewable mailers
2018-11-20 14:46:31 +01:00
Pierre de La Morinerie
f2eaf66a9a
mailers: add missing previews for notification emails
2018-11-20 14:46:31 +01:00
Pierre de La Morinerie
e5303fd986
mailers: streamline the NotificationMailer
...
Notifications are now only for demarche-templated emails.
2018-11-20 14:46:31 +01:00
Paul Chavard
1d1a15bf70
Merge pull request #3003 from tchak/fix-instructeurs-list
...
Fix instructeurs list filter
2018-11-20 14:32:30 +01:00
Paul Chavard
7ba9624a3f
Fix instructeurs list filter
...
fix #3002
2018-11-20 14:27:32 +01:00
