Commit graph

15111 commits

Author SHA1 Message Date
LeSim
c62cddc389
Merge pull request #1938 from betagouv/fix_1922_can_add_annotations_to_a_procedure
Fix 1922 can add annotations to a procedure
2018-05-18 12:00:52 +02:00
simon lehericey
3cfffc2615 [fix #1922] add one annotation to a procedure 2018-05-18 11:48:19 +02:00
gregoirenovel
22bef7bf99 Merge branch 'dev' 2018-05-17 15:37:56 +02:00
Paul Chavard
684d57bd49
Merge pull request #1926 from tchak/add-aasm-state
Add aasm state
2018-05-17 14:07:51 +01:00
Paul Chavard
2b8ee92074 Add aasm_state to procedures 2018-05-17 14:46:48 +02:00
Paul Chavard
a8e7038ab5 Add aasm 2018-05-17 14:46:48 +02:00
Paul Chavard
919b68de5e
Merge pull request #1934 from tchak/no-mailjet-on-page-load
Remove external scripts from mailjet widget
2018-05-17 13:04:39 +01:00
Paul Chavard
da8ad1f3e2 Remove external scripts from mailjet widget 2018-05-17 13:27:27 +02:00
gregoirenovel
3f63853fe7
Merge pull request #1925 from betagouv/fix_1560_ds_logo_for_email
[fix #1560] update logo in mail
2018-05-16 09:14:24 +02:00
simon lehericey
95db5e5767 [fix #1560] update logo in mail 2018-05-15 12:27:28 +02:00
Paul Chavard
2a18061ee0
Merge pull request #1918 from tchak/procedure-en-test-migration
Procedure en test migration
2018-05-15 11:11:08 +02:00
Paul Chavard
32787d7431 Task to add test_started_at to all procedures 2018-05-15 11:00:20 +02:00
Paul Chavard
0c54220c2b Add test_started_at to procedures 2018-05-15 11:00:20 +02:00
gregoirenovel
1211157948
Merge pull request #1923 from betagouv/fix-1896
[Fix #1896] fix typo
2018-05-11 13:57:23 +02:00
Mathieu Magnin
748300fcf7 [Fix #1896] fix typo 2018-05-11 13:52:06 +02:00
gregoirenovel
18b3548389
Merge pull request #1920 from betagouv/frederic/fix_spurious_test
Make match order-insensitive
2018-05-10 13:48:56 +02:00
Frederic Merizen
f8273ca8ae Make match order-insensitive
to avoid spurious test failures
2018-05-10 12:10:47 +01:00
gregoirenovel
a11ad1e1b2
Merge pull request #1919 from betagouv/frederic/fix_1825-enable_archived_procedure_preview
[Fix #1825] Also show previews for archived procedures
2018-05-09 19:21:53 +02:00
Frederic Merizen
26f9ec0122 [Fix #1825] Also show previews for archived procedures 2018-05-09 18:28:41 +02:00
LeSim
949f3f30b9
Merge pull request #1914 from betagouv/fix_1913_force_ssl
[fix #1913] force ssl and secure cookies
2018-05-09 16:42:49 +02:00
simon lehericey
46ba728d8a [fix #1913] force ssl and secure cookies 2018-05-09 16:36:01 +02:00
LeSim
783f1f113e
Merge pull request #1917 from betagouv/frederic/fix_1833-default_to_new_procedure_from_existing
[Fix #1833] Default to create new procedure by cloning an existing one
2018-05-09 16:35:15 +02:00
Frederic Merizen
4308535450 [Fix #1833] Remove library button from new procedure from scratch screen 2018-05-09 16:16:43 +02:00
Frederic Merizen
93e068421b [#1833] New procedure button defaults to procedure library 2018-05-09 16:16:09 +02:00
Frederic Merizen
5fd5c3ee5b [#1833] Add ‘create from scratch’ button to procedure library 2018-05-09 16:15:19 +02:00
gregoirenovel
234ceae6f4
Merge pull request #1912 from betagouv/always-use-apientreprise-prod
Remove use of staging.apientreprise
2018-05-09 14:02:08 +02:00
Mathieu Magnin
3e176d4e08 Remove use of staging.apientreprise 2018-05-09 13:56:29 +02:00
gregoirenovel
576204988b
Merge pull request #1911 from betagouv/frederic/readme-line-break
Espace insécable avant le signe pourcent
2018-05-09 13:56:12 +02:00
Frederic Merizen
dceb30c504 Espace insécable avant le signe pourcent 2018-05-09 13:49:22 +02:00
Frederic Merizen
2646a12434 Merge branch 'dev' 2018-05-09 11:17:48 +02:00
Frederic Merizen
ccb6eefc55
Merge pull request #1662 from betagouv/frederic/fix_1563/remove_attestation_pj
#1563 Remove attestation mail attachment
2018-05-09 11:04:22 +02:00
Frederic Merizen
5ef129d960 [#1563] Remove attestation mail attachment 2018-05-09 10:42:40 +02:00
gregoirenovel
e961df5481
Merge pull request #1909 from betagouv/always-send-dubious-procedures-email
Always send dubious procedure email
2018-05-07 19:38:52 +02:00
Mathieu Magnin
7f4e6eae6b No dubious proc. email == Everything is ok || Something went wrong. We should always send dubious procedure email. 2018-05-07 12:24:05 +02:00
Mathieu Magnin
9f8083f69c
Merge pull request #1908 from betagouv/fix-1907
Fix 1907
2018-05-04 14:29:58 +02:00
Mathieu Magnin
dcdd431bc0 [Fix #1907] set activation reminder delay to 3 days to allow administrateurs to activate their account with the original message after the weekend 2018-05-04 14:23:05 +02:00
Mathieu Magnin
a2bbf1b4d6 [Fix #1907] A new token should be regenerated, because the one in db is encrypted 2018-05-04 14:23:05 +02:00
gregoirenovel
a62a47f10d Merge branch 'dev' 2018-05-04 10:01:44 +02:00
gregoirenovel
22eb9b63ec
Merge pull request #1889 from betagouv/export-improvements
Export improvements
2018-05-03 23:41:02 +02:00
gregoirenovel
8848abc536 #to_sorted_values -> #sorted_values 2018-05-03 23:35:51 +02:00
gregoirenovel
886431b120 Make some methods private 2018-05-03 23:35:51 +02:00
gregoirenovel
f020fa9e2b Remove some useless self mentions 2018-05-03 23:35:51 +02:00
Paul Chavard
0b7cf3ae75 #full_data_strings_array -> #export_values 2018-05-03 23:35:51 +02:00
Paul Chavard
8637a3015e Simplify Procedure#generate_export code 2018-05-03 23:35:51 +02:00
gregoirenovel
031522cf42 Checking on entreprise has no sense, check etablissement 2018-05-03 23:35:51 +02:00
gregoirenovel
12cda1739b #export_entreprise_data -> #export_etablissement_data 2018-05-03 23:35:51 +02:00
gregoirenovel
ec1859a9d5
Merge pull request #1890 from betagouv/liste-des-demarches
Liste des demarches
2018-05-02 17:14:39 +02:00
gregoirenovel
c52ffc6dec Merge branch 'dev' 2018-05-02 17:10:04 +02:00
gregoirenovel
5cdd7b48b1 Add a link to the available demarches 2018-05-02 17:09:38 +02:00
gregoirenovel
291259deb8 On the landing page, show the Usagers panel first 2018-05-02 17:09:38 +02:00