Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
[OE-2950] event title moved to controller
Merge branch 'release/1.5' into develop
+ controller refactor changes
+ fix for eyedraw import code
+ controller refactor changes
RBAC.
Merge branch 'feature/rbac' into develop
[OE-3377] - initial code to create the Laser management admin panel
[OE-3377] - added Add Laser form (not saving yet)
[OE-3377] - fixed rules to force site to be provided, removed _POST and using CHttpRequest instead
[OE-3377] - fixed initialisation of $import and added migration for laser availability
fixed model reference
[OE-3377] - adding available field to form
[OE-3377] - further progress including unit tests and fixtures
[OE-3914] fixed collation
[OE-3377] - included available scope and related unit tests
[OE-3731] Adjusted asset paths