snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php		2022-03-03 21:59:38 -08:00
..
css	Updated assets	2022-01-21 12:33:49 -08:00
img	Added userpics from thispersondoesnotexist.com	2021-09-23 22:05:42 -07:00
js	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
uploads	Fixed logo uploads	2020-04-27 23:22:52 -07:00
vendor/livewire	Most of the basics are working, but not done and lots of debug messages are about	2021-10-04 22:06:48 -07:00
.htaccess	Merge master down into develop	2021-12-16 14:26:24 -08:00
favicon.ico	Default favicon	2020-02-11 20:19:24 -08:00
index.php	Misc fixes for shift	2021-06-11 14:07:50 -07:00
mix-manifest.json	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
mix.js.map	Added resources	2020-04-22 07:15:24 -07:00
robots.txt	Disallow / in robots	2017-09-28 17:47:48 -07:00
web.config	Fix for IIS+ Chrome not showing webfonts	2017-11-06 16:51:46 -08:00