Commit graph

4759 commits

Author SHA1 Message Date
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
simon lehericey
2bc61f9f3f [fix #1097] Accent insensitive search 2018-01-09 10:29:54 +01:00
simon lehericey
6a2b575027 [fix #1097] Add whitelist mechanisme to procedure 2018-01-09 10:29:54 +01:00
simon lehericey
f1b7a03b63 [fix #1097] Add job to monitor procedures 2018-01-09 10:29:54 +01:00
simon lehericey
d7d5d7eff4 Rename new_admin_mailer to administration_mailer 2018-01-09 10:29:54 +01:00
gregoirenovel
c4d0028d6d
Merge pull request #1193 from sgmap/fix-1129
[Fix #1129] Simplify the terms checkbox message
2018-01-09 10:00:38 +01:00
gregoirenovel
3f2876faf6 [Fix #1129] Simplify the terms checkbox message 2018-01-08 17:14:51 +01:00
gregoirenovel
aab41d4032
Merge pull request #1192 from sgmap/remove-open-simplif
Remove two opensimplif-related files
2018-01-08 17:03:56 +01:00
gregoirenovel
301eb411cd Remove two opensimplif-related files
They seem unused
2018-01-08 17:03:41 +01:00
Mathieu Magnin
b086706f55
Merge pull request #1159 from sgmap/fix_1149
Move avis actions to new gestionnaire controller
2018-01-08 17:02:24 +01:00
Mathieu Magnin
04e9f7be3e [Fix #1149] Move avis actions to new gestionnaire controller 2018-01-08 16:50:15 +01:00
Mathieu Magnin
aba59239ca [Fix #1149] Add context on tests before adding some more 2018-01-08 15:15:38 +01:00
gregoirenovel
5f9f6d243f
Merge pull request #1178 from sgmap/create-from-published
Create from published
2018-01-08 15:00:38 +01:00
gregoirenovel
bf5e21d6de [Fix #1182] Add a “create new procedure from an existing one” feature 2018-01-08 14:55:07 +01:00
gregoirenovel
27a8aba53e Allow the cloning of another admininistrateur’s procedure 2018-01-08 14:55:07 +01:00
gregoirenovel
ec5b9c86ce Add the admin argument to Procedure#clone 2018-01-08 14:55:07 +01:00
gregoirenovel
9c0fa30d5b Merge branch 'dev' 2018-01-08 10:02:30 +01:00
gregoirenovel
7f44818796
Merge pull request #1176 from sgmap/fix_1110-port_attestation_tags_to_mail
Fix 1110 4. port attestation tags to mail
2018-01-05 18:00:41 +01:00
Frederic Merizen
6139c614b0 [#1110] Migrate legacy tags to new tags in mail templates 2018-01-05 17:42:25 +01:00
Frederic Merizen
75a3d0f3db [#1110] use modern rather than legacy tags in default mail templates 2018-01-05 17:42:25 +01:00
Frederic Merizen
deea23139f [#1110] Use TagsSubstitutionConcern as engine for mail template tags 2018-01-05 17:42:25 +01:00
gregoirenovel
de30b27ad1
Merge pull request #1175 from sgmap/fix_1110-align_mail_and_document_templates
Fix 1110 3. align mail and document templates
2018-01-05 17:23:20 +01:00
Frederic Merizen
ab63f80080 [#1110] Motivation and date de décision are only tags for terminé dossiers 2018-01-05 16:35:29 +01:00
Frederic Merizen
e985439416 [#1110] Use tags method rather than ALLOWED_TAGS class constant 2018-01-05 12:48:07 +01:00
Frederic Merizen
b9a1f707f5 [#1110] name => libelle in mail templates
to match attestation templates
2018-01-05 12:48:07 +01:00
Frederic Merizen
8d77cd58c6 [#1110] Make linked procedure available to mail model 2018-01-05 12:48:07 +01:00
gregoirenovel
d80eb7a02b
Merge pull request #1174 from sgmap/fix_1110-port_mail_tags_to_attestation
Fix 1110 - 2. port mail tags to attestation
2018-01-05 12:08:40 +01:00