You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Mods-for-HESK-Netsyms/api/BusinessLogic/Security
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
6 years ago
..
BanRetriever.php Add a BaseClass/BaseException for 5.4 compatibility 7 years ago
BannedEmail.php Add a BaseClass/BaseException for 5.4 compatibility 7 years ago
BannedIp.php Add a BaseClass/BaseException for 5.4 compatibility 7 years ago
PermissionChecker.php Add a BaseClass/BaseException for 5.4 compatibility 7 years ago
UserContext.php revert meeee 7 years ago
UserContextBuilder.php Add a BaseClass/BaseException for 5.4 compatibility 7 years ago
UserContextNotifications.php Add a BaseClass/BaseException for 5.4 compatibility 7 years ago
UserContextPreferences.php Add a BaseClass/BaseException for 5.4 compatibility 7 years ago
UserPrivilege.php Merge branch '3-3-0' into '357-calendar-planning-phase-two' 6 years ago
UserToTicketChecker.php Re-added all manager-related code 7 years ago