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
[OE-3920] - fixed title assignment in view file, previously it was showing the title twice
Merge branch 'release/1.5' into develop
[OE-3389] changed non-event-type controllers to inherit from the base controller rather than base event type.
[OE-3935] added missing method for adding waiting list rules in the admin interface.
Fixed admin panel
[OE-3308] changes to allow booking.ward_id to be null. ward for a booking is set on the schedule/reschedule page and defaults using the original logic.
Merge branch 'develop' of github.com:openeyes/OphTrOperationbooking into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
+ first steps of integration with refactored BaseEventTypeController
+ further integration with controller refactoring work
+ further controller refactoring
+ psr2 compliance on variable names
+ futher refactor tweaks
+ [OE-2927] minor bugfix