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
Merge branch 'master' into develop
[OE-3198] - added closing button on anaesthetic section that closes all the side and changed behaviour for treatement closing button as required
Merge branch 'master' into develop
+ work with latest changes to BaseEventTypeController
+ element option setting
+ only set defaults for creating an event
RBAC.
+ only set injection side property on create
+ remove redundant code
Merge branch 'feature/rbac' into develop
[OE-3885] Add drug name to previousInjections API response.
removed model references
removed model references
[OE-3914] fixed collation
[OE-3731] Adjusted asset paths
[OE-3731] Fixed grunt build
Merge branch 'feature/assets' into develop