snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/MoveUploadsToNewDisk.php # app/Http/Controllers/ActionlogController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Assets/AssetCheckinController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/BulkUsersController.php # app/Http/Requests/AssetCheckoutRequest.php # app/Importer/LicenseImporter.php # app/Models/Actionlog.php # app/Models/License.php # app/Models/User.php # app/Observers/AssetObserver.php # composer.lock # config/version.php # database/factories/LicenseFactory.php # database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php # database/migrations/2018_10_18_191228_add_kits_licenses_table.php # database/migrations/2018_10_19_153910_add_kits_table.php # database/migrations/2018_10_19_154013_add_kits_models_table.php # database/migrations/2019_02_07_185953_add_kits_consumables_table.php # database/migrations/2019_02_07_190030_add_kits_accessories_table.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/ar/general.php # resources/lang/ar/passwords.php # resources/lang/cs/general.php # resources/lang/cs/passwords.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/fr/admin/custom_fields/general.php # resources/lang/fr/admin/hardware/general.php # resources/lang/fr/admin/locations/table.php # resources/lang/fr/admin/settings/message.php # resources/lang/hu/admin/custom_fields/general.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/general.php # resources/lang/it/admin/settings/general.php # resources/lang/nl/admin/custom_fields/general.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/sv-SE/passwords.php # resources/lang/tr/general.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/reports/activity.blade.php # resources/views/users/print.blade.php		2022-04-28 17:49:06 +01:00
..
CheckinLicensesFromAllUsers.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CheckoutLicenseToAllUsers.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CreateAdmin.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
DisableLDAP.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
FixDoubleEscape.php	Switch to searching on semicolon instead of &	2022-02-09 15:55:22 -08:00
FixMismatchedAssetsAndLogs.php	Shift bindings	2021-06-10 20:16:56 +00:00
ImportLocations.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
KillAllSessions.php	Merging master down into develop	2022-03-16 18:02:07 +00:00
LdapSync.php	adds manager field to LDAP sync	2022-03-24 11:24:39 -07:00
LdapTroubleshooter.php	Get rid of stale commented-out line	2022-03-07 20:22:23 -08:00
MergeUsersByUsername.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
MoveUploadsToNewDisk.php	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
ObjectImportCommand.php	Shift cleanup	2021-06-10 20:19:27 +00:00
PaveIt.php	Updated banner with better warning	2021-09-20 18:49:04 -07:00
Purge.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
PurgeLoginAttempts.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
RecryptFromMcrypt.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ReEncodeCustomFieldNames.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
RegenerateAssetTags.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ResetDemoSettings.php	Fixed S3 upload path	2021-09-14 12:49:17 -07:00
RestoreDeletedUsers.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
RestoreFromBackup.php	Merge master back down into develop	2022-03-29 16:28:43 +01:00
RotateAppKey.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SendCurrentInventoryToUsers.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SendExpectedCheckinAlerts.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SendExpirationAlerts.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SendInventoryAlerts.php	Fixed #8597 - Added leading slash to notifications console commands	2020-10-23 04:46:26 -07:00
SendUpcomingAuditReport.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SyncAssetCounters.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SyncAssetLocations.php	Shift bindings	2021-06-10 20:16:56 +00:00
SystemBackup.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Version.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00