lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
snipe_it/app/Console/Commands
History
snipe e321aeabae
Merge branch 'master' into integrations/2020-08-31-v5-rc 
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Importer/import_mappings.md
#	app/Models/Ldap.php
#	app/Models/Loggable.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/importer/importer-file.vue
#	resources/assets/less/overrides.less
#	resources/macros/macros.php
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/edit.blade.php
#	resources/views/hardware/labels.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	routes/web/fields.php
#	tests/unit/UserTest.php
2020-08-31 12:14:44 -07:00
..
CheckinLicensesFromAllUsers.php Moved user email nulling until after the save 2020-08-14 15:25:07 -07:00
CheckoutLicenseToAllUsers.php A few more fixes for the cli 2020-07-09 21:12:50 -07: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 Fix PHP 7.4 deprecation warnings in ldap-sync script. 2020-08-24 21:35:00 -07:00
MergeUsersByUsername.php Removed unused use directives 2020-06-25 17:43:53 -07:00
MoveUploadsToNewDisk.php Small fixed for file mover artisan command 2020-08-28 14:10:28 -07:00
ObjectImportCommand.php Renamed fire() to handle() 2019-05-22 00:52:32 -07:00
PaveIt.php Sync paveit command with new database tables. 2020-05-23 09:08:32 -04: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