Mathieu Magnin
3b5b57f3c5
Merge branch 'dev'
2018-06-19 18:02:50 +02:00
gregoirenovel
42133f5b85
Merge pull request #2126 from betagouv/fix_select2_overflow
...
Fix select2 overflow (1 line changed 🚀 )
2018-06-19 18:01:19 +02:00
Mathieu Magnin
071e234150
Fix select2 overflow
2018-06-19 17:52:16 +02:00
gregoirenovel
cee12a1081
Merge branch 'dev'
2018-06-19 16:46:25 +02:00
gregoirenovel
076f48629e
Merge pull request #2099 from betagouv/contact-infos
...
Affiche les informations du service en bas du formulaire du dossier
2018-06-19 16:42:31 +02:00
Pierre de La Morinerie
c4057a0807
dossier: display user infos on edit page
2018-06-19 16:27:53 +02:00
Pierre de La Morinerie
c1db26b2e1
service: add explanation about contact infos
2018-06-19 16:23:43 +02:00
Pierre de La Morinerie
755600acf4
layout: move the landing footer to its own file
2018-06-19 16:23:43 +02:00
Pierre de La Morinerie
60475d0165
factories: add parenthesis around method arguments
2018-06-19 16:01:35 +02:00
Pierre de La Morinerie
d394555d8b
Merge pull request #2112 from betagouv/frederic/fix_1421-move_type_specific_code_to_type_de_champ
...
#1421 move type specific code to typed champ classes
2018-06-19 15:25:31 +02:00
Frederic Merizen
e99931527b
[ #1421 ] Move pays to PaysChamp
2018-06-19 15:20:01 +02:00
Frederic Merizen
0239f936d7
[ #1421 ] Move departements to DepartementChamp
2018-06-19 15:20:01 +02:00
Frederic Merizen
5b59bce0b6
[ #1421 ] Move regions to RegionChamp
2018-06-19 15:20:01 +02:00
Frederic Merizen
95666238ea
[ #1421 ] Move piece justificative error code to piece justificative champ
2018-06-19 15:20:01 +02:00
Frederic Merizen
6af27a7190
[ #1421 ] Move same_hour / same_minute to typed champ
2018-06-19 15:20:01 +02:00
Frederic Merizen
41734092b2
[ #1421 ] Move type specific for_export code to typed champs
2018-06-19 15:20:01 +02:00
Frederic Merizen
ee8616fb97
[ #1421 ] Move type specific to_s implementations to typed champs
2018-06-19 15:20:01 +02:00
Frederic Merizen
c2f199c5aa
[ #1421 ] Move piece justificative specific validation to PieceJustificativeChamp
2018-06-19 15:20:01 +02:00
Frederic Merizen
c690d3819e
[ #1421 ] Move type-specific before_save to typed champs
2018-06-19 15:20:01 +02:00
Mathieu Magnin
fac9c6cf47
Merge pull request #2120 from betagouv/dev
...
MEP 2016-06-19-01
2018-06-19 14:37:19 +02:00
gregoirenovel
75bdb8c4bc
Merge pull request #2119 from betagouv/ui-fixes
...
UI fixes
2018-06-19 13:57:01 +02:00
Pierre de La Morinerie
426e61777c
dossier: make the "Save changes" button title more meaningful
2018-06-19 13:46:43 +02:00
Pierre de La Morinerie
a4382ac198
dossiers: asterisque
-> astérisque
2018-06-19 13:46:43 +02:00
Pierre de La Morinerie
c0da0ba52c
publish-modal: fix the textfield vertical alignement
2018-06-19 13:46:43 +02:00
Frederic Merizen
69ae3fc341
Merge pull request #2114 from betagouv/frederic/fix_1568-nouvel_apercu_procedure
...
fix #1568 nouvel aperçu procédure
2018-06-19 12:47:46 +02:00
Frederic Merizen
bdece939c8
[ #1568 ] Inline partial that is only used in one view
2018-06-19 12:42:46 +02:00
Frederic Merizen
521aec6af9
[ #1568 ] Remove old previsualisation code
2018-06-19 12:42:46 +02:00
Frederic Merizen
fd10310cbf
[ Fix #1568 ] Use new procedure preview
2018-06-19 12:42:46 +02:00
Frederic Merizen
f614e88a99
Merge pull request #2098 from betagouv/fred/support_tooling
...
Support script to change procedure ownership
2018-06-19 12:26:38 +02:00
Frederic Merizen
14ef163a13
Support script to change procedure ownership
2018-06-19 12:14:17 +02:00
Mathieu Magnin
150cc4a636
Merge pull request #2102 from betagouv/dossier_deletion_done_right
...
Dossier deletion done right
2018-06-19 11:50:00 +02:00
Mathieu Magnin
ae6e3e345e
Task to unhide dossiers with instruction commencee
2018-06-19 10:05:00 +02:00
Mathieu Magnin
89f82ba92e
Move email sending in delete method
2018-06-19 10:05:00 +02:00
Mathieu Magnin
e05fb2d0ae
Allow dossier deletion if instruction has not started
2018-06-19 10:05:00 +02:00
Mathieu Magnin
e588195001
Merge pull request #2108 from betagouv/pimp-checkboxes
...
Pimp checkboxes
2018-06-19 10:04:23 +02:00
Pierre de La Morinerie
3ba5d654ba
editable_champs: move the label near the checkbox
2018-06-18 18:12:11 +02:00
Mathieu Magnin
43bbbacd59
Merge pull request #2087 from kemenaran/default-config-files
...
Ajoute les fichiers de configuration par défaut à `/config`
2018-06-18 14:16:46 +02:00
Pierre de La Morinerie
2cfa1b441d
config: add default config files to the source
2018-06-18 13:13:59 +02:00
Mathieu Magnin
b652e93e2e
Merge branch 'dev'
2018-06-18 11:26:09 +02:00
Mathieu Magnin
c4031b7dc4
Merge pull request #2079 from betagouv/frederic/fix_2068-french_mails
...
[Fix #2068 ] Use mail templates from application rather than devise
2018-06-18 10:53:26 +02:00
Frederic Merizen
78fa6945cb
[ #2068 ] Use official French word for mail
2018-06-18 10:42:04 +02:00
Frederic Merizen
354c76e26f
[ #2068 ] Remove duplicate devise translations
2018-06-18 10:42:04 +02:00
Frederic Merizen
dd4e6eaa11
[ #2068 ] Add missing devise translations
2018-06-18 10:42:04 +02:00
Frederic Merizen
bae7a2dd3c
[ Fix #2068 ] Use mail templates from application rather than devise
...
`default template_path:` was the documented way, but wasn’t working
(and there was no hint in the source code of Devise that it could
work)
Therefore, let’s override `template_paths` instead and stop worrying
2018-06-18 10:42:03 +02:00
Mathieu Magnin
41dbd9d599
Merge pull request #2111 from betagouv/no-seed
...
deploy: don't seed the database
2018-06-18 10:26:23 +02:00
Pierre de La Morinerie
15511d0863
deploy: don't seed the database
...
The database should be seeded only when deploying on a fresh new
environment – like a local setup or a review app.
Persistent testing and production environment shouldn't be seeded.
2018-06-15 12:28:18 +02:00
LeSim
849a093709
Merge pull request #2103 from betagouv/manager_gestionnaire_button
...
Manager: can reinvite a gestionnaire
2018-06-14 17:19:18 +02:00
simon lehericey
eee41cbf39
Manager: can reinvite a gestionnaire
2018-06-14 16:41:10 +02:00
Mathieu Magnin
9797b11b45
Merge pull request #2097 from betagouv/fix-publish-tooltip
...
Correction de l'affichage du tooltip de publication
2018-06-13 13:54:27 +02:00
Pierre de La Morinerie
0bef35946f
procedure: make sentence shorter
...
Before: "Affectez des accompagnateurs à votre procédure.Affectez un
service à votre procédure.
After: "Affectez des accompagnateurs et un service à votre procédure."
2018-06-13 11:59:40 +02:00