Mike Koch f53065f7f6 Merge branch '3-3-0' into '357-calendar-planning-phase-two' ...

# Conflicts:
#   api/BusinessLogic/Security/UserContext.php
#   api/BusinessLogic/Security/UserPrivilege.php
#   api/index.php
#   language/en/text.php

2018-01-29 01:46:16 +00:00

..

Constants

getEventsForStaff endpoint appears to be working

2017-12-17 22:05:32 -05:00

Exceptions

Add a BaseClass/BaseException for 5.4 compatibility

2017-09-11 21:03:03 -04:00

database_mysqli.inc.php

Update pages for HESK 2.7.4

2017-11-20 22:16:46 -05:00

database.inc.php

Update pages for HESK 2.7.4

2017-11-20 22:16:46 -05:00

json_error.php

Working on adding controller security

2017-12-01 12:56:23 -05:00

output.php

Refactored custom field validator, re-enabled test

2017-02-09 12:57:28 -05:00