snipe 5290c47e2a Merge branch 'develop' into v5-master-develop-integration ... # Conflicts: # .env.example # .travis.yml # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Middleware/EncryptCookies.php # app/Http/Requests/AssetRequest.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/AssetImporter.php # app/Models/AssetMaintenance.php # app/Models/Location.php # app/Models/User.php # composer.json # composer.lock # config/backup.php # config/database.php # config/version.php # public/mix-manifest.json # resources/lang/en-ID/general.php # resources/lang/vi/admin/settings/general.php # resources/views/accessories/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # tests/api/ApiCategoriesCest.php		2019-11-18 19:49:39 -08:00
..
CreateAdmin.php	Improvement: Better documentation, small refactors (#6017)	2018-08-01 00:06:41 -07:00
DisableLDAP.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
FixDoubleEscape.php	Fix snipeit:unescape not unescaping quotes (#6506)	2018-12-14 18:08:00 -08:00
ImportLocations.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
LdapSync.php	Added 4260352 to ldapsync enabled account constraint	2019-10-18 17:48:50 -07:00
MoveUploadsToNewDisk.php	[WIP] Added #5957 - Flysystem support (#6262)	2018-09-29 21:33:52 -07:00
ObjectImportCommand.php	Renamed fire() to handle()	2019-05-22 00:52:32 -07:00
PaveIt.php	Features/restore deleted cmd (#5982)	2018-07-27 02:42:55 -07:00
Purge.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
RecryptFromMcrypt.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ReEncodeCustomFieldNames.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
RegenerateAssetTags.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ResetDemoSettings.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
RestoreDeletedUsers.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
RotateAppKey.php	Added console rekey tool (#7330)	2019-09-03 11:03:32 -07:00
SendCurrentInventoryToUsers.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
SendExpectedCheckinAlerts.php	Renamed fire() to handle()	2019-05-22 00:52:32 -07:00
SendExpirationAlerts.php	Renamed fire() to handle()	2019-05-22 00:52:32 -07:00
SendInventoryAlerts.php	Patch for 5965 - multiple email recipients no longer working (#6238)	2018-09-26 15:47:53 -07:00
SendUpcomingAuditReport.php	Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992)	2019-05-05 22:32:52 -04:00
SyncAssetCounters.php	Fixed more camel-casing -> snake-casing	2019-05-24 16:01:12 -07:00
SyncAssetLocations.php	Integrations/develop into master (#7352)	2019-08-14 21:48:14 -07:00
SystemBackup.php	Renamed fire() to handle()	2019-05-22 00:52:32 -07:00
Version.php	Bumped version	2017-12-01 20:49:04 -08:00