Commit graph

4363 commits

Author SHA1 Message Date
LeSim
8f5f86b2f3 Merge pull request #40 from sgmap/destroy_emails_with_procedure
Destroy emails with procedure
2017-03-13 13:59:32 +01:00
LeSim
18b3368a29 Merge pull request #39 from sgmap/confirm_important_actions
Add confirm popup on important actions
2017-03-13 13:58:58 +01:00
Mathieu Magnin
fc9ef92c37 Destroy emails with procedure 2017-03-13 10:27:19 +01:00
Mathieu Magnin
6d6133908e Merge branch 'develop' into staging 2017-03-09 18:18:02 +01:00
Mathieu Magnin
e501c2f23b Merge pull request #37 from sgmap/add_new_relic
Add new relic
2017-03-09 18:15:23 +01:00
Mathieu Magnin
19e3d336e9 Using dotenv for local env variables 2017-03-09 17:38:20 +01:00
Mathieu Magnin
ad1250af6f Add confirm popup on important actions 2017-03-09 16:55:47 +01:00
Mathieu Magnin
48d12cfa34 max width in Administration 2017-03-08 14:52:37 +01:00
Simon Lehericey
66cb0c09b1 Stats: wording 2017-03-08 14:26:45 +01:00
Mathieu Magnin
9aa405f1b5 Merge branch 'staging' 2017-03-08 13:56:57 +01:00
Mathieu Magnin
3eedf616e8 Merge branch 'develop' into staging 2017-03-08 11:00:55 +01:00
Mathieu Magnin
5d4e8622f6 Merge pull request #38 from sgmap/stats
Stats: add adminitrations stats view
2017-03-08 10:59:06 +01:00
Mathieu Magnin
342a6b239e Small css changes 2017-03-08 10:55:24 +01:00
Simon Lehericey
a29a5a3513 Merge branch 'develop' into staging 2017-03-07 18:33:20 +01:00
LeSim
78325cc9f9 Merge pull request #34 from sgmap/customize_submission_mail
Customize submission mail
2017-03-07 18:32:55 +01:00
Mathieu Magnin
9cd506e265 Clone mail_templates with procedure 2017-03-07 18:19:48 +01:00
Simon Lehericey
6cb88a995f Stats: add adminitrations stats view 2017-03-07 18:09:09 +01:00
Mathieu Magnin
4ea7635dfc Fix after review 2017-03-07 16:23:44 +01:00
Simon Lehericey
2b04bf1dfd Merge branch 'develop' into staging 2017-03-07 14:33:14 +01:00
LeSim
2e19dd26b7 Merge pull request #36 from sgmap/remember_me
Add remember me on login
2017-03-07 14:15:37 +01:00
Mathieu Magnin
53b8c4aaa4 Add new relic 2017-03-07 11:34:25 +01:00
Mathieu Magnin
8ded471f61 Merge branch 'staging' 2017-03-07 11:11:47 +01:00
LeSim
9764604430 Merge branch 'develop' into customize_submission_mail 2017-03-07 11:05:04 +01:00
Simon Lehericey
63681cfded Migrate mails to new system 2017-03-07 10:44:24 +01:00
Simon Lehericey
c1953592b7 ReceivedMail: change timestamp for migration 2017-03-07 10:44:10 +01:00
Simon Lehericey
8cd46b7fdf InitiatedMail: set default timestamp 2017-03-07 10:43:58 +01:00
Mathieu Magnin
a88b150c3c Add remember me on login 2017-03-07 10:29:48 +01:00
Simon Lehericey
65e83dd6ec Mails: factorize default and change slug 2017-03-07 10:27:14 +01:00
Simon Lehericey
02bbf0543f Mails: move to their own namespace 2017-03-07 10:27:14 +01:00
Simon Lehericey
335caed65e Mail Template: Delete 2017-03-07 10:27:14 +01:00
Simon Lehericey
2536774519 DescriptionController: send initiatedMail notification 2017-03-07 10:27:14 +01:00
Simon Lehericey
3d7f04ad3d DossierController: send receivedMail when the mail is ... received 2017-03-07 10:27:14 +01:00
Simon Lehericey
9d710336b3 MailTemplate: allow edition of all the new mails 2017-03-07 10:27:13 +01:00
Simon Lehericey
c8f515832b MailTemplate: add email and nom_organisation tag 2017-03-07 10:27:13 +01:00
Simon Lehericey
6c560e65eb Notification Mailer: use send_notification for all the mails 2017-03-07 10:27:13 +01:00
Simon Lehericey
70b2020656 Procedure: remove mail_template 2017-03-07 10:27:13 +01:00
Simon Lehericey
206d56f106 Procedure: add the new mails 2017-03-07 10:27:13 +01:00
Simon Lehericey
695dc16b85 Mails: add refused, without_continuation, draft, closed, received mails object 2017-03-07 10:27:05 +01:00
Simon Lehericey
7b336922cc Cleaning 2017-03-07 10:25:34 +01:00
Simon Lehericey
36500407b4 DossierController: use the new method send_notification 2017-03-07 10:25:34 +01:00
Simon Lehericey
65d399b4b0 NotificationMailer: add send notification 2017-03-07 10:25:34 +01:00
Simon Lehericey
89763ec8d4 MailTemplateController: use new initiated_mail 2017-03-07 10:25:34 +01:00
Simon Lehericey
c22c84f1f9 Procedure: add inititad_mail with default provider 2017-03-07 10:25:34 +01:00
Simon Lehericey
2f5dde381a NotificationMailer: simplify using default method 2017-03-07 10:25:34 +01:00
Simon Lehericey
47fc6e6957 InitiatedEmail: add initiated email 2017-03-07 10:25:28 +01:00
Simon Lehericey
9fbea39eca Merge branch 'develop' into staging 2017-03-06 21:47:43 +01:00
LeSim
22837c01b0 Merge pull request #35 from sgmap/state_wording
Wording
2017-03-06 20:49:22 +01:00
Simon Lehericey
a334888363 Wording 2017-03-06 20:44:25 +01:00
LeSim
4d9732b63a Merge pull request #31 from sgmap/add_dossier_workflow_dates
Add state dates to dossier
2017-03-06 18:25:26 +01:00
Simon Lehericey
a5bb6ea0d7 Dossier: fix merge 2017-03-06 18:17:28 +01:00