Commit graph

4935 commits

Author SHA1 Message Date
Mathieu Magnin
f772adc582 Add flash when procedure is whitelisted 2018-01-10 18:17:05 +01:00
Mathieu Magnin
1ebaab51de Show procedure.whitelisted_at in administrate 2018-01-10 18:17:05 +01:00
Mathieu Magnin
4c0592d631 Rails-ish route 2018-01-10 18:17:05 +01:00
LeSim
36d8f4e056
Merge pull request #1211 from betagouv/abstraction
Abstract the Procedure whitelisting
2018-01-10 18:11:41 +01:00
gregoirenovel
608a8eaf67 Abstract the Procedure whitelisting 2018-01-10 17:58:10 +01:00
gregoirenovel
4f2ac6ac2e
Merge pull request #1208 from betagouv/org-rename
Handle the GitHub org rename: sgmap -> betagouv
2018-01-10 17:46:12 +01:00
gregoirenovel
289461d708 Handle the GitHub org rename: sgmap -> betagouv 2018-01-10 17:26:25 +01:00
gregoirenovel
e2bcace4ff
Merge pull request #1207 from betagouv/easier_whitelist
Easier whitelist
2018-01-10 17:24:46 +01:00
Simon Lehericey
6f0c3ebc11 Whitelist: send the alert mail to equipe 2018-01-10 17:18:44 +01:00
simon lehericey
53687bf84a Whitelist: add whitelist button in admin 2018-01-10 17:18:44 +01:00
Simon Lehericey
202d0489a1 Whitelist: links from mail to admin 2018-01-10 17:18:44 +01:00
Mathieu Magnin
8b4afac54e Merge branch 'dev' 2018-01-10 15:52:05 +01:00
Mathieu Magnin
fa2613c682
Merge pull request #1206 from betagouv/fix_optional_assets_precompilation
[Fix #1205] Assets precompilation is forced during deployment
2018-01-10 15:41:49 +01:00
Mathieu Magnin
748b273496 [Fix #1205] Assets precompilation is forced during deployment 2018-01-10 15:32:52 +01:00
Mathieu Magnin
be386a3870
Merge pull request #1194 from sgmap/fix_1098
Administrate
2018-01-10 13:53:41 +01:00
Mathieu Magnin
440c2b5dd1 [Fix #1098] add administrate custom layout to add logout link 2018-01-10 13:44:02 +01:00
Mathieu Magnin
d8d2ecf515 [Fix #1098] Administrateur dashboard 2018-01-10 13:44:02 +01:00
Mathieu Magnin
c7b3bb0733 [Fix #1098] Custom TypesDePieceJustificativeField for Administrate 2018-01-10 13:44:01 +01:00
Mathieu Magnin
51b94e2f53 [Fix #1098] Custom TypesDeChampCollectionField for Administrate 2018-01-10 13:44:01 +01:00
Mathieu Magnin
65f0859357 [Fix #1098] Using custom views to remove edit and delete button from index
This can be reverted when Administrate gem will include this fix : https://github.com/thoughtbot/administrate/pull/597 (>=0.5.0)
2018-01-10 13:44:00 +01:00
Mathieu Magnin
d0de9b9ae2 [Fix #1098] Add procedures dashboard 2018-01-10 13:44:00 +01:00
Mathieu Magnin
b2b26b73ab [Fix #1098] Add administrate gem 2018-01-10 13:44:00 +01:00
LeSim
61d9bc2095
Merge pull request #1204 from sgmap/fix_1033_champ_position
Fix 1033 champ position
2018-01-10 13:36:05 +01:00
Simon Lehericey
1473577131 [fix #1033] Procedure Edition: add position field to order the champs 2018-01-10 13:27:22 +01:00
gregoirenovel
e7bcef8868 Merge branch 'dev' 2018-01-09 16:59:31 +01:00
Simon Lehericey
78739ccc6f Spec: rename spec file to match code filename 2018-01-09 16:45:16 +01:00
gregoirenovel
c3f46f817d
Merge pull request #1202 from sgmap/simplify-mail-factory
Simplify factory girl configuration for mail templates
2018-01-09 16:31:14 +01:00
Frederic Merizen
9afdb4c2c4 Simplify factory girl configuration for mail templates 2018-01-09 16:24:00 +01:00
gregoirenovel
8d6d8026a6
Merge pull request #1201 from sgmap/fix_1186-rename_object_to_subject
[Fix #1186] Rename object to subject for mail templates
2018-01-09 16:14:15 +01:00
Frederic Merizen
56749769d6 [Fix #1186] Rename object to subject for mail templates 2018-01-09 16:00:31 +01:00
gregoirenovel
a6735c5acd
Merge pull request #1200 from sgmap/fix_typo_in_readme
Readme: fix typo
2018-01-09 15:55:10 +01:00
Simon Lehericey
81b3b3b0f9 Readme: fix typo 2018-01-09 15:51:07 +01:00
gregoirenovel
2074bda592 Merge branch 'dev' 2018-01-09 15:34:56 +01:00
Frederic Merizen
4c0d8042d3
Merge pull request #1190 from sgmap/remove_mail_templates_table
Drop MAIL_TEMPLATES table
2018-01-09 15:32:46 +01:00
Frederic Merizen
39a138e48d Drop MAIL_TEMPLATES table
it’s not used since 695dc16b8 / 335caed65e anymore
2018-01-09 15:28:16 +01:00
LeSim
86a89808ca
Merge pull request #1198 from sgmap/fix_pg_extension_migration
Fix pg extension creation in migration for #1097
2018-01-09 15:24:18 +01:00
Simon Lehericey
8d52f57e6a Fix pg extension creation in migration for #1097 2018-01-09 15:20:04 +01:00
gregoirenovel
52df5d998a
Merge pull request #1197 from sgmap/replace_deprecated_stubs
Replace old stub with new allow syntax
2018-01-09 14:48:06 +01:00
Frederic Merizen
8e9d360260 Replace old stub with new allow syntax 2018-01-09 14:37:39 +01:00
gregoirenovel
ce8961a2dc
Merge pull request #1185 from sgmap/fix_1037-add_dossier_date_tags
[Fix #1037] Add date de dépôt and début d’instruction tags
2018-01-09 11:35:55 +01:00
Frederic Merizen
7f040a5cf8 [Fix #1037] Add date tags to mail / attestation templates
- date de dépôt
- date de passage en instruction
2018-01-09 11:30:54 +01:00
Frederic Merizen
935a38bde0 [#1037] Introduce format-date function 2018-01-09 11:30:54 +01:00
gregoirenovel
fff6019858
Merge pull request #1189 from sgmap/fix-clone
Fix New from existing
2018-01-09 11:12:39 +01:00
gregoirenovel
fdf240cf31 Improve the wording on the “New from existing” page 2018-01-09 11:07:26 +01:00
gregoirenovel
c77558aeed Correctly handle errors when cloning someone else’s procedure 2018-01-09 11:07:26 +01:00
gregoirenovel
a1275af55f Use the path helper in the new procedure template 2018-01-09 11:05:19 +01:00
gregoirenovel
093d853ecc Fix some buggy error handling code in Admin::ProcedureController#clone 2018-01-09 11:05:19 +01:00
Frederic Merizen
45e5f77e52
Merge pull request #1177 from sgmap/fix_1110-remove_legacy_tags
Fix 1110 5. remove legacy tags
2018-01-09 10:49:30 +01:00
Frederic Merizen
63ca52792b [#1110] Remove legacy tags 2018-01-09 10:39:10 +01:00
LeSim
4b8f5933b1
Merge pull request #1184 from sgmap/fix_1097_check_champs
Fix 1097 check champs
2018-01-09 10:35:44 +01:00