Frederic Merizen
|
f40a150ee3
|
Merge pull request #3202 from betagouv/fix-3195-modif-demande-admin
Fix 3195 modif demande admin et contact admin
|
2018-12-20 15:36:30 +01:00 |
|
Chaïb Martinez
|
0fe473b84e
|
Add 2 new categories in admin contact form
|
2018-12-20 15:29:49 +01:00 |
|
Chaïb Martinez
|
206f17be90
|
Add warning text in email field
|
2018-12-20 15:29:49 +01:00 |
|
Mathieu Magnin
|
1c11e6ad12
|
Merge pull request #3204 from betagouv/link-in-invitation-mails
Add html links in invitation mail templates
|
2018-12-20 15:28:12 +01:00 |
|
Mathieu Magnin
|
1dcc8303a6
|
Add html links in invitation mail templates
|
2018-12-20 15:01:04 +01:00 |
|
gregoirenovel
|
bc17fdacfa
|
Merge pull request #3201 from tchak/scope-ordered-types-de-champ
Order types de champ in scope
|
2018-12-20 14:58:03 +01:00 |
|
Paul Chavard
|
eb9edc1cee
|
Order types de champ in scope
|
2018-12-20 14:14:15 +01:00 |
|
gregoirenovel
|
bf8fa41020
|
Merge pull request #3199 from betagouv/clean-emails
Clean emails
|
2018-12-20 12:01:52 +01:00 |
|
gregoirenovel
|
af21618652
|
Improve the avis invitation email footer
|
2018-12-20 11:57:07 +01:00 |
|
maatinito
|
b72fd330b5
|
Use the layout's footer for the avis invitation email
|
2018-12-20 11:20:10 +01:00 |
|
maatinito
|
e554cc3644
|
Unify the emails' intro tag
|
2018-12-20 11:20:10 +01:00 |
|
maatinito
|
2de328da64
|
Unify the emails' intro sentence
|
2018-12-20 11:20:10 +01:00 |
|
maatinito
|
f51cdd0e48
|
Add a partial for the emails' signature
|
2018-12-20 11:20:10 +01:00 |
|
Paul Chavard
|
9247dad8e8
|
Merge pull request #3197 from betagouv/frederic/fix_3196-json_types_de_champ_options
Fix #3196 json types de champ options
|
2018-12-20 11:19:14 +01:00 |
|
Frederic Merizen
|
2a758d0759
|
[Fix #3196] Convert YAML to JSON
|
2018-12-19 23:17:55 +01:00 |
|
Frederic Merizen
|
36d6a43084
|
[#3196] Make TypeDeChamp#options compatible with raw JSON
instead of YAML inside a JSON string.
We still need to support the YAML form until the data has been migrated
|
2018-12-19 18:43:56 +01:00 |
|
Paul Chavard
|
06f3143e61
|
Merge pull request #3177 from tchak/champ-repetition-row
Add type de champ repetition models (with row)
|
2018-12-19 15:46:25 +01:00 |
|
Paul Chavard
|
5d1c24f3d8
|
Add type de champ repetition models (with row)
|
2018-12-19 15:31:11 +01:00 |
|
gregoirenovel
|
3977294613
|
Merge pull request #3186 from betagouv/remove-dead-code
Remove dead code
|
2018-12-19 15:27:18 +01:00 |
|
gregoirenovel
|
d92780b859
|
Merge branch 'dev'
|
2018-12-19 15:20:52 +01:00 |
|
gregoirenovel
|
df7e0a9881
|
Remove dead code
|
2018-12-19 14:59:15 +01:00 |
|
gregoirenovel
|
1a41a068ec
|
Merge pull request #3185 from betagouv/fix-586
Fix #586
|
2018-12-19 14:57:47 +01:00 |
|
gregoirenovel
|
abce867fb4
|
Enable the Rails/CreateTableWithTimestamps cop
|
2018-12-19 14:40:10 +01:00 |
|
gregoirenovel
|
8769e49e92
|
[Fix #586] Add timestamps to tables where they were missing
|
2018-12-19 14:40:10 +01:00 |
|
gregoirenovel
|
d2b730e2e8
|
Merge pull request #3182 from betagouv/rubocop
Rubocop
|
2018-12-19 14:39:07 +01:00 |
|
gregoirenovel
|
4b0e632abb
|
Enable the Style/ColonMethodCall cop
|
2018-12-19 13:56:10 +01:00 |
|
gregoirenovel
|
616e9305e9
|
Enable the Style/ClassCheck cop
|
2018-12-19 13:56:10 +01:00 |
|
gregoirenovel
|
fba8d97256
|
Enable the Stlye/BlockDelimiters cop
|
2018-12-19 13:56:10 +01:00 |
|
gregoirenovel
|
a8f700b572
|
Enable the Style/FormatString cop
|
2018-12-19 13:56:10 +01:00 |
|
gregoirenovel
|
621154fde4
|
Enable more cops
|
2018-12-19 13:56:10 +01:00 |
|
gregoirenovel
|
4c6f5a4d9f
|
Bump rubocop
|
2018-12-19 13:56:10 +01:00 |
|
gregoirenovel
|
aaa22c1a18
|
Merge pull request #3191 from betagouv/fix-email-templates-subjects
tasks: rename `--libellé procédure--` to `--libellé démarche--`
|
2018-12-19 13:55:58 +01:00 |
|
Pierre de La Morinerie
|
dfc5b9990d
|
tasks: rename --libellé procédure-- to --libellé démarche--
|
2018-12-19 13:37:59 +01:00 |
|
gregoirenovel
|
8a3a71c3ca
|
Merge pull request #3190 from pengfeidong/fix_3188_replace_a_to_link_to
[fix #3188] replace a to link_to in footer
|
2018-12-19 13:35:58 +01:00 |
|
pedong
|
09552ed9ff
|
[fix #3188] replace a to link_to in footer
|
2018-12-19 13:18:01 +01:00 |
|
gregoirenovel
|
8cac4dd2f5
|
Merge pull request #3183 from betagouv/fix-3136
Add Sendinbue subscribe form
|
2018-12-19 12:40:20 +01:00 |
|
gregoirenovel
|
85a20f9b28
|
Remove double spaces
|
2018-12-19 12:35:22 +01:00 |
|
Chaïb Martinez
|
408ee31595
|
Add Sendinbue subscribe form
Remove Mailjet newsletter subscribe popin
|
2018-12-19 12:35:22 +01:00 |
|
gregoirenovel
|
f9baae3859
|
Merge pull request #3189 from betagouv/frederic/block_adding_old_pjs
Encourager la création de champs PJ plutôt que de vieilles PJs
|
2018-12-19 12:35:14 +01:00 |
|
Frederic Merizen
|
d1cfe4468d
|
Encourager la création de champs PJ plutôt que de vieilles PJS
|
2018-12-19 11:57:23 +01:00 |
|
gregoirenovel
|
ae8c61830a
|
Merge pull request #3184 from betagouv/remove-tour-de-france-banner
Remove the Tour de France banner from the administration landing page
|
2018-12-19 11:07:32 +01:00 |
|
gregoirenovel
|
336ee6aba0
|
Remove the Tour de France banner from the administration landing page
|
2018-12-19 10:57:28 +01:00 |
|
gregoirenovel
|
549567a358
|
Merge branch 'dev'
|
2018-12-19 10:42:27 +01:00 |
|
Frederic Merizen
|
d2d24eacb6
|
Merge pull request #3176 from betagouv/frederic/drop-cellar
Drop CleverCloud Service for ActiveStorage
|
2018-12-19 10:40:06 +01:00 |
|
Frederic Merizen
|
832b4a61bc
|
Drop CleverCloud Service for ActiveStorage
|
2018-12-19 10:36:02 +01:00 |
|
gregoirenovel
|
5a30467594
|
Merge pull request #3147 from betagouv/clean-carto
Remove now useless carto tables
|
2018-12-19 10:32:58 +01:00 |
|
gregoirenovel
|
e69310fe07
|
ModuleApiCartoService → ApiCartoService
|
2018-12-19 10:29:11 +01:00 |
|
gregoirenovel
|
27f4d9421f
|
Remove now useless carto tables
|
2018-12-19 10:29:11 +01:00 |
|
Paul Chavard
|
766f0401db
|
Merge pull request #3181 from betagouv/cleanup
Cleanup
|
2018-12-19 09:58:08 +01:00 |
|
gregoirenovel
|
129df93fb1
|
Add a blank line to ease readability
|
2018-12-18 22:49:27 +01:00 |
|