Commit graph

20402 commits

Author SHA1 Message Date
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
LeSim
caf1f1b74f Merge branch 'develop' into add_dossier_workflow_dates 2017-03-06 17:54:45 +01:00
LeSim
4de6a9595a Merge pull request #33 from sgmap/block_dossier_initiation_if_procedure_is_archived
Block dossier initiation if procedure is archived
2017-03-06 17:48:18 +01:00
Mathieu Magnin
376c50db8f Long procedure title should be cut if too long 2017-03-06 16:18:22 +01:00
Mathieu Magnin
4e50469d3f Merge branch 'develop' into staging 2017-03-06 16:08:51 +01:00
Mathieu Magnin
44819bb0b1 Fix reopened dossier should not be listed in new dossiers 2017-03-06 15:59:52 +01:00
Mathieu Magnin
7e4f473027 When procedure is archived user can update dossier if not in brouillon 2017-03-06 15:03:51 +01:00
Mathieu Magnin
88654535ea Remove comment 2017-03-06 14:35:45 +01:00
Mathieu Magnin
a24980145c Block dossier initiation if procedure is archived 2017-03-06 14:29:01 +01:00
Mathieu Magnin
811a452760 Merge branch 'develop' into staging 2017-03-06 11:16:45 +01:00
Simon Lehericey
6be76095c6 Conf: reactivate spring and guard 2017-03-05 22:17:17 +01:00
Simon Lehericey
7eb77ba667 Mail Received: remove useless template_decorator 2017-03-05 22:17:17 +01:00