Commit graph

7929 commits

Author SHA1 Message Date
gregoirenovel
b015d1ca27
Merge pull request #3075 from betagouv/improve-emails
Petites améliorations sur les emails de notification
2018-11-27 15:57:09 +01:00
Pierre de La Morinerie
ea8bc0c961 mailers: improve notification layout 2018-11-27 15:51:26 +01:00
gregoirenovel
904cfa38cf Merge branch 'dev' 2018-11-27 15:44:00 +01:00
Pierre de La Morinerie
3702b0967d mailers: ensure new_answer link is an actual a element 2018-11-27 15:42:09 +01:00
gregoirenovel
86d9d75118
Merge pull request #3009 from betagouv/remove-outdated-footer-in-emails
tasks: remove outdated footers in mail templates
2018-11-27 15:39:12 +01:00
Pierre de La Morinerie
4e801b188c tasks: remove outdated footers in mail templates
Fix #1863
2018-11-27 15:32:02 +01:00
gregoirenovel
68ce658836 Merge branch 'dev' 2018-11-27 14:59:23 +01:00
gregoirenovel
d8185da854
Merge pull request #3057 from pengfeidong/fix_3056_all_url_api_in_env
[Fix #3056] get url api in the environment variable
2018-11-27 14:52:50 +01:00
pedong
ef1c17beaa [Fix #3056] get url api in the environment variable 2018-11-27 14:47:10 +01:00
Mathieu Magnin
489cf7c855
Merge pull request #3073 from betagouv/fix-sentry-26
[Fix sentry-26] if file does not exist, filename should be nil
2018-11-27 14:29:08 +01:00
Mathieu Magnin
91115ea847 [Fix sentry-26] if file does not exist, filename should be nil 2018-11-27 14:10:43 +01:00
Paul Chavard
b53d7d5fef
Merge pull request #3060 from tchak/dossier-state-change-logs
Dossier state change logs
2018-11-27 13:02:46 +01:00
Paul Chavard
0f0ca2ec65 Lod dossier operations 2018-11-27 12:49:40 +01:00
Paul Chavard
85e3eb04f4 Add DossierOperationLog model 2018-11-27 12:49:40 +01:00
Paul Chavard
98d388b64d Use state change methods on dossier in dossier auto archive job 2018-11-27 12:49:40 +01:00
Paul Chavard
b5b6832be8 Use state change methods on dossier in dossier auto recieve job 2018-11-27 12:49:40 +01:00
Paul Chavard
a079eaea5c Add procedure gestionnaire_for_cron_job method 2018-11-27 12:49:40 +01:00
Paul Chavard
15b1499e5d Use state change methods on dossier in dossier controller 2018-11-27 12:49:40 +01:00
Paul Chavard
9843666bdc Implement state change methods on dossier 2018-11-27 12:49:40 +01:00
Paul Chavard
df06c81305
Merge pull request #3072 from tchak/fix-champ-cart-again
Make difference between error and empty geo json
2018-11-27 12:49:20 +01:00
Paul Chavard
febf625dd9 Make difference between error and empty geo json 2018-11-27 12:36:10 +01:00
Paul Chavard
d7b5030be9
Merge pull request #3071 from tchak/fix-champ-cart-again
Do not send error json to backend - it doesn’t need it and it creates bad data
2018-11-27 11:50:24 +01:00
Paul Chavard
f2e7feec1d Do not send error json to backend - it doesn’t need it and it creates bad data 2018-11-27 11:45:24 +01:00
gregoirenovel
3915d2a579
Merge pull request #3067 from betagouv/fix-mina-traces
deploy: require mina only for deployment tasks
2018-11-26 18:46:38 +01:00
Pierre de La Morinerie
af47ccda94 deploy: require mina only for deployment tasks
This fixes mina activating Rake traces, which pollutes the output
of rake tasks.
2018-11-26 12:09:35 +01:00
Mathieu Magnin
e1dc94e70d
Merge pull request #3053 from betagouv/fix-2929
[Fix #2929] Improve readability of invitation for avis
2018-11-23 13:38:52 +01:00
Mathieu Magnin
718a30639f [Fix #2929] Improve readability of invitation for avis 2018-11-23 13:18:36 +01:00
Frederic Merizen
ffa5cf87e3
Merge pull request #3055 from betagouv/dev
2018-11-23-01
2018-11-23 11:59:31 +01:00
gregoirenovel
0042ab5343
Merge pull request #3049 from pengfeidong/fix_1339_avis_public_affichier_prive
[fix #1339] avis affichier prive
2018-11-22 18:48:22 +01:00
pedong
0d02f5896e [Fix #1339] properly display avis confidentiality to experts 2018-11-22 18:38:31 +01:00
gregoirenovel
a713b76b07
Merge pull request #3052 from betagouv/re-enable-cleanup
Re-enable releases cleanup
2018-11-22 18:31:55 +01:00
Mathieu Magnin
804f0665e3 Re-enable releases cleanup 2018-11-22 18:26:18 +01:00
gregoirenovel
17fbd9e591
Merge pull request #3047 from betagouv/frederic/show_user_in_dossier_manager
Afficher l’usager dans la page dossier du manager
2018-11-22 15:44:56 +01:00
Frederic Merizen
ad991a2fe5 Show user on dossier page in manager 2018-11-22 15:27:01 +01:00
gregoirenovel
cbe83fb35b
Merge pull request #3033 from betagouv/fix-233
[Fix #233] Remove the champ_id column on commentaires
2018-11-22 13:54:20 +01:00
gregoirenovel
9bff7afabb [Fix #233] Remove the champ_id column on commentaires 2018-11-22 12:44:19 +01:00
gregoirenovel
a36a9bebad Merge branch 'dev' 2018-11-22 12:40:40 +01:00
gregoirenovel
e0cb8aef8e
Merge pull request #3043 from betagouv/prepare-deletion
Prepare for champ_id deletion
2018-11-22 12:32:24 +01:00
gregoirenovel
251bd635c2 Prepare for champ_id deletion 2018-11-22 12:27:48 +01:00
gregoirenovel
46312d0989 Merge branch 'dev' 2018-11-22 11:47:54 +01:00
gregoirenovel
633c30ed60
Merge pull request #3032 from betagouv/fix-110
[Fix #110] Remove any reference left to facades
2018-11-22 11:31:38 +01:00
gregoirenovel
e8c24c27e5 [Fix #110] Remove any reference left to facades 2018-11-22 11:25:55 +01:00
gregoirenovel
150b43f2e1
Merge pull request #3025 from tchak/fix-carto-migration-notifications
Fix notifications on dossiers with migrated carto
2018-11-22 11:25:48 +01:00
Paul Chavard
cf98e28178 Fix notifications on dossiers with migrated carto 2018-11-22 11:16:01 +01:00
Paul Chavard
4e1cc5cc99
Merge pull request #3029 from betagouv/fix-1698
[Fix #1698] Show the footer on the “Merci” page
2018-11-22 11:15:34 +01:00
gregoirenovel
55143b94fc [Fix #1698] Show the footer on the “Merci” page 2018-11-22 10:04:41 +01:00
Mathieu Magnin
84433222fb
Merge pull request #3028 from betagouv/fix-3027
[Fix #3027] Redirect to the demarches index after a demarche deletion
2018-11-22 10:03:37 +01:00
gregoirenovel
80fda3f414 Merge branch 'dev' 2018-11-22 09:26:28 +01:00
gregoirenovel
dc89c7f530 [Fix #3027] Redirect to the demarches index after a demarche deletion 2018-11-22 02:06:48 +01:00
gregoirenovel
75777e7af8
Merge pull request #3036 from betagouv/simplify
Simplify
2018-11-22 02:05:51 +01:00