snipe 453fc718d9 Merge branch 'develop' into integrations/2020-08-31-dev-into-master ... # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.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/Models/Ldap.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/less/overrides.less # resources/views/custom_fields/fieldsets/view.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 # tests/unit/UserTest.php		2020-08-31 12:44:03 -07:00
..
dist	Ficing webpack, CSS and JS (*whew* that sucked)	2020-04-27 22:41:33 -07:00
skin-black-dark.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-black-dark.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-black.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-black.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-blue-dark.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-blue-dark.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-blue.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-blue.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-contrast.css	Added option to disable backup in import	2020-05-11 20:41:10 -07:00
skin-contrast.css.map	Added option to disable backup in import	2020-05-11 20:41:10 -07:00
skin-green-dark.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-green-dark.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-green.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-green.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-orange-dark.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-orange-dark.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-orange.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-orange.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-purple-dark.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-purple-dark.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-purple.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-purple.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-red-dark.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-red-dark.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-red.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-red.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-yellow-dark.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-yellow-dark.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-yellow.css	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00
skin-yellow.css.map	Moved js, skins and primary CSS into dist directory	2020-04-22 03:39:42 -07:00