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

..

BannedEmail.php

Add a BaseClass/BaseException for 5.4 compatibility

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

BannedIp.php

Add a BaseClass/BaseException for 5.4 compatibility

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

BanRetriever.php

Add a BaseClass/BaseException for 5.4 compatibility

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

PermissionChecker.php

Add a BaseClass/BaseException for 5.4 compatibility

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

UserContext.php

revert meeee

2017-12-06 21:37:42 -05:00

UserContextBuilder.php

Add a BaseClass/BaseException for 5.4 compatibility

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

UserContextNotifications.php

Add a BaseClass/BaseException for 5.4 compatibility

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

UserContextPreferences.php

Add a BaseClass/BaseException for 5.4 compatibility

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

UserPrivilege.php

Merge branch '3-3-0' into '357-calendar-planning-phase-two'

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

UserToTicketChecker.php

Re-added all manager-related code

2017-09-13 21:27:02 -04:00