Godfrey M d1efca2ae1 fixes conflicts

2023-08-15 09:28:42 -07:00

..

CheckinLicensesFromAllUsers.php

…

CheckoutLicenseToAllUsers.php

Fix operator in where clause

2023-04-24 17:26:06 -07:00

CreateAdmin.php

Added autoassign_licenses option to create admin

2023-04-16 15:28:08 -07:00

DisableLDAP.php

…

FixDoubleEscape.php

…

FixMismatchedAssetsAndLogs.php

…

GeneratePersonalAccessToken.php

Small refactor

2022-06-28 23:18:16 -07:00

ImportLocations.php

…

KillAllSessions.php

Merging master down into develop

2022-03-16 18:02:07 +00:00

LdapSync.php

fixes conflicts

2023-08-15 09:28:42 -07:00

LdapTroubleshooter.php

Fixed SC-19104 - fixes to ldap:troubleshoot artisan command

2022-06-14 12:18:42 -07:00

MergeUsersByUsername.php

One more trim…. sigh..

2022-05-18 03:53:42 -07:00

MoveUploadsToNewDisk.php

Removed dupe lines from merge conflict

2022-05-03 12:56:29 -07:00

NormalizeUserNames.php

Added console command to normalize capitalization on names

2023-03-16 16:23:52 -07:00

ObjectImportCommand.php

…

PaveIt.php

…

Purge.php

…

PurgeLoginAttempts.php

…

RecryptFromMcrypt.php

…

ReEncodeCustomFieldNames.php

Refine output and checks

2022-06-27 13:54:21 -07:00

RegenerateAssetTags.php

Small fixes for asset tag regeneration script

2022-05-18 17:14:22 -07:00

ResetDemoSettings.php

Add login note to demo resetter

2022-05-15 10:20:03 -07:00

RestoreDeletedUsers.php

…

RestoreFromBackup.php

Resolves Rollbar error 16746 - missing array key 'extension'

2023-01-24 18:19:26 -08:00

RotateAppKey.php

…

SendCurrentInventoryToUsers.php

…

SendExpectedCheckinAlerts.php

…

SendExpirationAlerts.php

…

SendInventoryAlerts.php

…

SendUpcomingAuditReport.php

…

SyncAssetCounters.php

Removed $start variable from calback

2023-01-05 18:04:06 -08:00

SyncAssetLocations.php

…

SystemBackup.php

Check that the filename we pass ends in zip, add it if not

2023-05-08 12:41:32 -07:00

Version.php

…