DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 15:09:40 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/resources/assets/js
History
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 Added resources 2020-04-22 07:15:24 -07:00
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 Added resources 2020-04-22 07:15:24 -07:00
plugins Updated more fa icons 2021-09-26 01:11:08 -07:00
app.js Removed vendor.js from setup blade 2020-04-22 07:15:12 -07:00
bootstrap-js.js Fixed missing </h3 tags 2020-03-31 23:36:56 -07:00
bootstrap-table-locale-all.js Added resources 2020-04-22 07:15:24 -07:00
bootstrap-table-locale-all.min.js Added resources 2020-04-22 07:15:24 -07:00
bootstrap-table.css Added resources 2020-04-22 07:15:24 -07:00
bootstrap-table.js Added resources 2020-04-22 07:15:24 -07:00
bootstrap-table.min.css Added resources 2020-04-22 07:15:24 -07:00
bootstrap-table.min.js Added resources 2020-04-22 07:15:24 -07:00
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 Fixed missing </h3 tags 2020-03-31 23:36:56 -07:00
dashboard.js Added resources 2020-04-22 07:15:24 -07:00
dashboard2.js Added resources 2020-04-22 07:15:24 -07:00
demo.js Updated more fa icons 2021-09-26 01:11:08 -07:00
ekko-lightbox.js Switched to h2 from h4 2020-04-01 03:51:08 -07:00
ekko-lightbox.min.js Switched to h2 from h4 2020-04-01 03:51:08 -07:00
FileSaver.min.js Added resources 2020-04-22 07:15:24 -07:00
html5.js Added resources 2020-04-22 07:15:24 -07:00
html5shiv.js Added resources 2020-04-22 07:15:24 -07:00
jquery.dragtable.js Added resources 2020-04-22 07:15:24 -07:00
jquery.fileupload.js Added resources 2020-04-22 07:15:24 -07:00
jquery.iframe-transport.js Added resources 2020-04-22 07:15:24 -07:00
jquery.js Added resources 2020-04-22 07:15:24 -07:00
jquery.typeahead.min.js Added resources 2020-04-22 07:15:24 -07:00
jquery.ui.widget.js Added resources 2020-04-22 07:15:24 -07:00
jspdf.min.js Added resources 2020-04-22 07:15:24 -07:00
jspdf.plugin.autotable.js Added resources 2020-04-22 07:15:24 -07:00
signature_pad.js Fixing assets :( 2020-04-21 03:07:11 -07:00
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