snipe aa8f1378c9 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php		2021-10-20 17:26:41 -07:00
..
bootstrap
components	Most of the basics are working, but not done and lots of debug messages are about	2021-10-04 22:06:48 -07:00
extensions	Updated more fa icons	2021-09-26 01:11:08 -07:00
locale
plugins	Updated more fa icons	2021-09-26 01:11:08 -07:00
app.js
bootstrap-js.js
bootstrap-table-locale-all.js
bootstrap-table-locale-all.min.js
bootstrap-table.css
bootstrap-table.js
bootstrap-table.min.css
bootstrap-table.min.js
bootstrap.datepicker.js	Updated more fa icons	2021-09-26 01:11:08 -07:00
bootstrap.js	Fixed font awesome caret	2021-09-25 23:17:35 -07:00
bootstrap.min.js
dashboard.js
dashboard2.js
demo.js	Updated more fa icons	2021-09-26 01:11:08 -07:00
ekko-lightbox.js
ekko-lightbox.min.js
FileSaver.min.js
html5.js
html5shiv.js
jquery.dragtable.js
jquery.fileupload.js
jquery.iframe-transport.js
jquery.js
jquery.typeahead.min.js
jquery.ui.widget.js
jspdf.min.js
jspdf.plugin.autotable.js
signature_pad.js
snipeit.js	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
snipeit_modals.js	Updated more fa icons	2021-09-26 01:11:08 -07:00
vue.js	Most of the basics are working, but not done and lots of debug messages are about	2021-10-04 22:06:48 -07:00