DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/public/js
History
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
2021-11-15 19:24:38 -08:00
..
bootstrap Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
build Merge remote-tracking branch 'origin/master' into develop 2021-11-15 19:24:38 -08:00
dist Updated snipeit.js with "restore" modal code 2021-11-09 22:39:33 -08:00
extensions Updated more fa icons 2021-09-26 01:11:08 -07:00
locale Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
plugins Updated more fa icons 2021-09-26 01:11:08 -07:00
bootstrap-table-locale-all.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
bootstrap-table-locale-all.min.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
bootstrap-table.css Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
bootstrap-table.js Fixed stupid curly quotes 2020-04-01 03:55:44 -07:00
bootstrap-table.min.css Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
bootstrap-table.min.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
bootstrap.datepicker.js Updated more fa icons 2021-09-26 01:11:08 -07:00
dashboard.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
dashboard2.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -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 Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
html5.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
html5shiv.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
jquery.dragtable.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
jquery.fileupload.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
jquery.iframe-transport.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
jquery.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
jquery.typeahead.min.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
jquery.ui.widget.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
jspdf.min.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
jspdf.plugin.autotable.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
metisMenu.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
metisMenu.min.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
pGenerator.jquery.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
respond.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
select2.min.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
signature_pad.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
signature_pad.min.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
snipeit.js Updated snipeit.js with "restore" modal code 2021-11-09 22:39:33 -08:00
vendor.js Ficing webpack, CSS and JS (*whew* that sucked) 2020-04-27 22:41:33 -07:00
vue.js Switched to h2 from h4 2020-04-01 03:51:08 -07:00
xlsx.core.min.js Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00