Commit graph

8920 commits

Author SHA1 Message Date
gregoirenovel
74366c6268
Merge pull request #2033 from betagouv/email-improvements
Email improvements
2018-06-01 15:48:58 +02:00
gregoirenovel
f8f760db62 Use p tags in emails to improve legability 2018-06-01 15:42:56 +02:00
gregoirenovel
dd66089d5c Put the title in an instance variable when needed to avoid repetition 2018-06-01 15:42:56 +02:00
gregoirenovel
1cd06b68d4 Remove extra markup from the avis invitation email 2018-06-01 15:42:56 +02:00
gregoirenovel
4f2509861b Improve the wording of the avis email 2018-06-01 15:42:56 +02:00
Frederic Merizen
0173ca4ce8
Merge pull request #2035 from betagouv/frederic/remove-duplicate-translations
Remove duplicate translations
2018-06-01 15:34:37 +02:00
Frederic Merizen
c39a58749f Remove duplicate translations
There is a default translation for `blank` already
2018-06-01 15:21:25 +02:00
gregoirenovel
db2f2e39e9
Merge pull request #2029 from betagouv/fix-1858
[Fix #1858] Improve the avis email’s style
2018-06-01 14:13:41 +02:00
gregoirenovel
bc8f74dc42 [Fix #1858] Improve the avis email’s style 2018-06-01 14:11:06 +02:00
gregoirenovel
23e909928a
Merge pull request #2025 from betagouv/fix-886
Fix #886
2018-06-01 14:10:44 +02:00
gregoirenovel
a0b82696dd [Fix #886] devise/mailer -> devise_mailer 2018-06-01 11:47:46 +02:00
gregoirenovel
8f1579fb9e [Fix #886] Move mail templates from /mails to /notification_mailers 2018-06-01 11:47:46 +02:00
gregoirenovel
0da03dac1e
Merge pull request #2022 from betagouv/mailers-cleanup
Mailers cleanup
2018-06-01 11:45:42 +02:00
gregoirenovel
464d1c1efa Remove a useless method 2018-06-01 11:35:40 +02:00
gregoirenovel
8782bdd961 Do one thing per line 2018-06-01 11:35:40 +02:00
gregoirenovel
69e95f62c8 Remove useless methods 2018-06-01 11:35:40 +02:00
gregoirenovel
b364b8bfb3 Improve many subjects 2018-06-01 11:35:40 +02:00
Frederic Merizen
7357ea796f Merge branch 'dev' 2018-06-01 11:22:35 +02:00
gregoirenovel
d7a8a103d7 Remove the prefix from our emails’ subjects 2018-06-01 11:21:11 +02:00
Frederic Merizen
845987aedd
Merge pull request #2024 from betagouv/fix_clone
Fix clone
2018-06-01 11:18:51 +02:00
simon lehericey
c72421fb9e Procedure: Once deliberation or cadre_juridique have been set, forbid unsetting them 2018-06-01 11:12:53 +02:00
simon lehericey
b998425005 Procedure: add rake task to set juridique_required to false for legacy procedures 2018-06-01 11:12:53 +02:00
simon lehericey
1f0e46a4ff Procedure: required juridique stuff only if needed 2018-06-01 11:12:53 +02:00
simon lehericey
7eb34053f8 Procedure: add juridique_required flag to procedure 2018-06-01 11:12:53 +02:00
gregoirenovel
7660f5890a Merge branch 'dev' 2018-06-01 10:45:59 +02:00
gregoirenovel
f114f1478d
Merge pull request #2020 from betagouv/bump-delayed-job-web
Remove delayed_job_web version lock
2018-06-01 10:43:53 +02:00
gregoirenovel
e5869f2bec Remove delayed_job_web version lock
Now that the security patches have been patched
2018-06-01 10:42:40 +02:00
gregoirenovel
dc88fb46b3
Merge pull request #2019 from betagouv/cleanup-mailers
Cleanup mailers
2018-06-01 10:40:24 +02:00
gregoirenovel
23931a7591 Remove the contact_email locale 2018-06-01 00:00:11 +02:00
gregoirenovel
185f08f63e Add constants for email addresses 2018-06-01 00:00:11 +02:00
gregoirenovel
a3f5ae9d0b Add a variable to improve readability 2018-06-01 00:00:11 +02:00
gregoirenovel
8eeb10bc5c Add parentheses 2018-06-01 00:00:11 +02:00
gregoirenovel
a60f1c434e Improve the mailers readability 2018-06-01 00:00:11 +02:00
Paul Chavard
740a83f665
Merge pull request #2017 from betagouv/frederic/fix-2015-clone-procedure-error-handling
[Fix #2015] Make sur all data is initialised for index view
2018-05-31 18:41:03 +02:00
Frederic Merizen
b571f0706c [Fix #2015] Make sur all data is initialised for index view 2018-05-31 18:32:13 +02:00
Frederic Merizen
d28d467aea Merge branch 'dev' 2018-05-31 17:07:02 +02:00
LeSim
5a699162c5
Merge pull request #1904 from betagouv/fix_1897_legal_ref
[fix #1897] Procedure: add legal reference
2018-05-31 17:02:22 +02:00
simon lehericey
18ad227df5 [fix #1897] Procedure: can delete a deliberation 2018-05-31 16:56:28 +02:00
simon lehericey
0e690c90cc Procedure: clone the deliberation 2018-05-31 16:56:28 +02:00
simon lehericey
fa14db1cbf Procedure: add deliberation 2018-05-31 16:56:28 +02:00
simon lehericey
a96889310b Procedure: add legal reference 2018-05-31 16:55:31 +02:00
Paul Chavard
25f0b6258a
Merge pull request #2011 from tchak/manager-users-and-gestionnaires
Add users and gestionnaires to manager
2018-05-31 16:20:33 +02:00
Paul Chavard
e2a126e37a Add users and gestionnaires to manager 2018-05-31 15:18:24 +02:00
gregoirenovel
3f99f41372
Merge pull request #2004 from betagouv/clean
Clean
2018-05-31 15:09:18 +02:00
Frederic Merizen
32914a5d08 Merge branch 'dev' 2018-05-31 14:42:40 +02:00
gregoirenovel
0329b1db68 Use User#owns_or_invite? instead of Dossier#owner_or_invite? 2018-05-31 14:39:43 +02:00
gregoirenovel
4e9565a5df Adds User#owns? 2018-05-31 14:39:43 +02:00
gregoirenovel
a007d6e3eb Avoid trailing spaces in strings 2018-05-31 14:29:38 +02:00
Frederic Merizen
c832938a11
Merge pull request #1997 from betagouv/frederic/fix-1995-add_gender_birthdate_to_api
[#1995] Add gender and birthdate fields to API
2018-05-31 14:26:25 +02:00
Frederic Merizen
2f769ca933 [#1995] Add gender and birthdate fields to API 2018-05-31 14:21:37 +02:00