Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
Merge branch 'master' into develop
[OE-3816] created a new model to link sites with an email contact for therapy application emails, and an admin interface to manage them (not in use by the mailer code yet).
[OE-3816] added type_id property to indicate which types of letters the rule applies to.
[OE-3816] hooked up new email model to the therapy application mailer
[OE-3816] restrict recipient email addresses to a list of allowed domains
[OE-3816] allow rules to use the default sender name/email to make adding rules easier.
[OE-3816] bugfix: default sender should be the default for new recipient rules
[OE-3816] removed default sender functionality as it causes problems with the email processor
[OE-3816] fixed the email processor to work without the default sender being set in the database
[OE-3816] use site defined in the event rather than the current user session
WIP: update for base controller refactor.
+ tweaks to use default optional render behaviour for base controller class
+ removed extraneous checking for side displays
+ transaction handling for exceptional circumstances delete
RBAC.
Tidy up error handling for generatePreviewPdf.
Merge branch 'feature/rbac' into develop