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/resources/views
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
..
accessories Add additional info on accessories view page 2021-09-26 03:59:04 -07:00
account Fixed labels in profile form 2021-10-28 12:57:27 -07:00
asset_maintenances Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
auth Updated more fa icons 2021-09-26 01:11:08 -07:00
categories Updated more fa icons 2021-09-26 01:11:08 -07:00
companies Updated more fa icons 2021-09-26 01:11:08 -07:00
components Use Helper alias 2021-09-28 19:44:55 -07:00
consumables Use Helper alias 2021-09-28 19:44:55 -07:00
custom_fields Merge remote-tracking branch 'origin/master' into develop 2021-11-15 19:24:38 -08:00
departments Add a hidden field to handle departments inside Full Company Support config 2021-07-29 13:28:57 -05:00
depreciations Use Helper alias 2021-09-28 19:44:55 -07:00
errors More fa icons 2021-09-24 07:21:30 -07:00
groups Updated more fa icons 2021-09-26 01:11:08 -07:00
hardware Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
importer Updated more fa icons 2021-09-26 01:11:08 -07:00
kits Updated more fa icons 2021-09-26 01:11:08 -07:00
layouts Merge remote-tracking branch 'origin/master' into develop 2021-11-15 19:24:38 -08:00
licenses UNRELATED: fixed wrong html tag for license view badge count 2021-11-10 00:08:15 -08:00
livewire A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working. 2021-10-04 22:07:29 -07:00
locations Use Helper alias 2021-09-28 19:44:55 -07:00
manufacturers Updated more fa icons 2021-09-26 01:11:08 -07:00
modals Fixed SVG XSS vuln 2021-10-06 12:26:45 -07:00
models Adds reqestable as model bulk edit field 2021-10-28 15:15:54 -07:00
notifications Use Helper alias 2021-09-28 19:44:55 -07:00
paginator Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
partials Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self 2021-10-28 17:53:24 -07:00
reports Enable display of deleted acceptances, strike deleted users, add date, enable sorting 2021-10-07 21:03:46 +02:00
settings More refinements to the UI 2021-11-10 18:15:38 -08:00
setup Use Helper alias 2021-09-28 19:44:55 -07:00
statuslabels Updated more fa icons 2021-09-26 01:11:08 -07:00
suppliers Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
users Adds reqestable as model bulk edit field 2021-10-28 15:15:54 -07:00
vendor Fixes a couple blade templates for relative URLs (#9170) 2021-02-26 15:59:36 -08:00
dashboard.blade.php Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you 2021-10-28 17:13:37 -07:00
notifications.blade.php Updated more fa icons 2021-09-26 01:11:08 -07:00