Commit graph

8094 commits

Author SHA1 Message Date
LeSim
1d84ec7496
Merge pull request #3297 from pengfeidong/fix_1238_previsualization_attestation
[fix #1238] add previsualization attestation for gestionnaire
2019-01-22 15:09:24 +01:00
pedong
6103176a78 [fix #1238] add previsualization attestation for gestionnaire 2019-01-22 14:54:24 +01:00
Pierre de La Morinerie
f00736d7b5
Merge pull request #3311 from betagouv/dev
2019-01-21-01
2019-01-21 15:40:52 +01:00
Pierre de La Morinerie
3cc423283c
Merge pull request #3293 from betagouv/page-de-garde
Ajout d'une page de garde pour les démarches
2019-01-21 14:57:52 +01:00
Pierre de La Morinerie
bb753ce23e commencer: redirect to the procedure page after sign-in and sign-up 2019-01-21 14:45:38 +01:00
Pierre de La Morinerie
016e5f2e6f commencer: add an independant page 2019-01-21 14:45:38 +01:00
LeSim
bd77f82df0
Merge pull request #3304 from betagouv/task_to_fixup_autoreceive_data
[#3268] Rake task to correct bad follows and logs
2019-01-21 14:23:06 +01:00
simon lehericey
45db2d8e5a [#3268] Rake task to correct bad follows and logs 2019-01-21 14:17:17 +01:00
Pierre de La Morinerie
01f63c25e9
Merge pull request #3303 from betagouv/frederic/clarify_blocked_attestation
Explain to administrateur why the attestation cannot be deactivated
2019-01-21 14:14:34 +01:00
Frederic Merizen
a5b29dde97 Explain to administrateur why the attestation cannot be deactivated 2019-01-21 13:46:49 +01:00
Paul Chavard
6a9b024a6f
Merge pull request #3307 from tchak/fix-new-champs-editor
Fix champs editor on old procedures
2019-01-20 14:06:43 +01:00
Paul Chavard
174b01ecd4 Fix champs editor on old procedures 2019-01-18 14:53:14 +01:00
Paul Chavard
6d8eaaa7c9
Merge pull request #3305 from philemon95/patch-2
Update new.html.haml
2019-01-18 11:53:51 +01:00
philemon95
b69d10876b
Update new.html.haml
entendu parlé -> entendu parler
2019-01-18 11:12:20 +01:00
Frederic Merizen
d1c36a3945
Merge pull request #3276 from betagouv/frederic/2180-migrate_old_type_pj_to_new_type_champ_pj
Migration PJ => champ PJ en cas de clonage de la procédure
2019-01-17 17:52:16 +01:00
Frederic Merizen
d01270eff2 [#2180] Do not double-expose migrated type PJ as type champ PJ 2019-01-17 17:47:08 +01:00
Frederic Merizen
63519f04c8 [#2180] Expose migrated types PJ as legacy type PJ in dossier API 2019-01-17 17:47:08 +01:00
Frederic Merizen
bf23abdfe3 [#2180] Expose migrated PJs as legacy PJs in dossier API 2019-01-17 17:47:08 +01:00
Frederic Merizen
5f74ae1545 [#2180] Do not double-expose migrated type PJs as champs in procedure API 2019-01-17 17:47:08 +01:00
Frederic Merizen
082255b489 [#2180] Expose migrated types PJ as legacy types PJ in procedure API 2019-01-17 17:46:56 +01:00
Frederic Merizen
5e37400834 [#2180] Only retain old PJ API when cloning for same admin 2019-01-17 17:40:40 +01:00
Frederic Merizen
d1c0418c89 [#2180] Refactor - extract local variable 2019-01-17 17:40:40 +01:00
Frederic Merizen
530079e464 [#2180] Make sure that old_pj is kept through successive clones 2019-01-17 17:40:40 +01:00
Frederic Merizen
8cb509d192 [#2180] Keep information that this type de champ was cloned from a PJ 2019-01-17 17:40:40 +01:00
Frederic Merizen
651fd6149b [#2180] When cloning a procedure, convert types de PJ to types de champ PJ 2019-01-17 17:40:40 +01:00
Pierre de La Morinerie
33f7773a23
Merge pull request #3286 from betagouv/fix-2423
[Fix #2423] Allow Usager to delete brouillon from dossiers#index
2019-01-17 17:35:07 +01:00
Mathieu Magnin
b1efe57403 [Fix #2423] Allow Usager to delete brouillon from dossiers#index 2019-01-17 17:30:37 +01:00
Paul Chavard
83bba82c76
Merge pull request #3301 from tchak/fix-js-error
Only initialize champs editor if is present on page
2019-01-17 16:46:40 +01:00
Paul Chavard
d45273e117 Only initialize champs editor if is present on page 2019-01-17 16:29:30 +01:00
Pierre de La Morinerie
00244effdb
Merge pull request #3294 from tchak/cleanup-feature-flag
Enable support_form and champ_siret for all
2019-01-17 15:22:48 +01:00
Paul Chavard
6036d7906f Enable champ_siret for all 2019-01-17 15:17:48 +01:00
Paul Chavard
9136c9dfa0 Enable support_form for all 2019-01-17 15:17:48 +01:00
Pierre de La Morinerie
a144da5718
Merge pull request #3299 from betagouv/dev
2018-01-17-01
2019-01-17 15:07:32 +01:00
Pierre de La Morinerie
579dbe05b2
Merge pull request #3289 from betagouv/Fix-3235-correctif-sendinblue-automation
Fix 3235 correctif sendinblue automation
2019-01-17 15:02:42 +01:00
Chaïb Martinez
51877c2247 Minor sendinblue tracking change 2019-01-17 14:52:18 +01:00
Chaïb Martinez
72ec0a98f7 Minor sendinblue tracking change 2019-01-17 14:52:18 +01:00
Mathieu Magnin
c6b76f0dae
Merge pull request #3296 from betagouv/fix-icon-alignment
Fix icon vertical alignement in buttons
2019-01-17 14:31:17 +01:00
Mathieu Magnin
f9768825a2 Fix icon alignement in buttons 2019-01-17 14:27:12 +01:00
Mathieu Magnin
feb340697a
Merge pull request #3287 from betagouv/improve-publish-draft
Improve publish draft
2019-01-17 14:25:45 +01:00
Mathieu Magnin
0e6b5678ad Fix tests 2019-01-17 14:04:59 +01:00
Mathieu Magnin
306632f169 Add Test et publication on tab title 2019-01-17 14:04:59 +01:00
Mathieu Magnin
8e1b3515be Add démarche en test on dossiers#show 2019-01-17 14:04:58 +01:00
Mathieu Magnin
910d471d86 If archived_at & published_at equal nil (tests procedures), then use created_at order 2019-01-17 14:04:58 +01:00
Mathieu Magnin
a4ddec6dff Wording : Démarche en brouillon => Démarche en test 2019-01-17 14:04:58 +01:00
Mathieu Magnin
2ce6d01aec Procedure has a default generated path when created 2019-01-17 14:04:58 +01:00
Mathieu Magnin
2355cdeeae Demarches Actives -> Publiées 2019-01-17 14:04:58 +01:00
Pierre de La Morinerie
a92a07c018
Merge pull request #2993 from tchak/new-champs-editor
New champs editor
2019-01-17 11:57:58 +01:00
Paul Chavard
f0cda2ca13 Test new champs editor 2019-01-17 11:20:31 +01:00
Paul Chavard
41c9b21509 Use new editor 2019-01-17 11:20:31 +01:00
Paul Chavard
0d35295d4e New champs editor 2019-01-17 11:20:31 +01:00