snipe-it/resources/views
snipe 453fc718d9
Merge branch 'develop' into integrations/2020-08-31-dev-into-master
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Models/Ldap.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	tests/unit/UserTest.php
2020-08-31 12:44:03 -07:00
..
accessories Fixed accessories “current image” path in edit form 2020-08-24 14:30:55 -07:00
account Squashed commit of the following: 2020-08-31 12:17:19 -07:00
asset_maintenances Switch to old() helper 2020-04-21 03:58:31 -07:00
auth Added #542: add saml authentication 2020-05-06 00:06:19 +10:00
categories Added resources 2020-04-22 07:15:24 -07:00
companies Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
components Updated components and consumables to use storage facade 2020-08-12 13:02:54 -07:00
consumables Updated components and consumables to use storage facade 2020-08-12 13:02:54 -07:00
custom_fields Merge branch 'develop' into integrations/2020-08-31-dev-into-master 2020-08-31 12:44:03 -07:00
departments Hide icons in error messages 2020-04-01 03:21:15 -07:00
depreciations Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
errors Fixed missing </h3 tags 2020-03-31 23:36:56 -07:00
groups Fixed incorrect route for saving groups 2020-05-01 01:26:15 -07:00
hardware Squashed commit of the following: 2020-08-31 12:17:19 -07:00
importer Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
kits Refactor controller to use one method that shows all modals based on name. 2020-05-23 15:24:00 -04:00
layouts Squashed commit of the following: 2020-08-31 12:17:19 -07:00
licenses Squashed commit of the following: 2020-08-31 12:17:19 -07:00
locations Switch to old() helper 2020-04-21 03:58:31 -07:00
manufacturers Switch to old() helper 2020-04-21 03:58:31 -07:00
modals Merge branch 'develop' into integrations/2020-08-31-dev-into-master 2020-08-31 12:44:03 -07:00
models Switch to old() helper 2020-04-21 03:58:31 -07:00
notifications Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
paginator Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
partials Misc Flysystem/image upload request fixes 2020-08-26 11:53:36 -07:00
reports Squashed commit of the following: 2020-08-31 12:17:19 -07:00
settings Fixed backup urls for download 2020-08-28 18:22:37 -07:00
setup Switch to old() helper 2020-04-21 03:58:31 -07:00
statuslabels Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
suppliers Fixed suppliers upload 2020-08-24 18:53:33 -07:00
users Merge branch 'develop' into integrations/2020-08-31-dev-into-master 2020-08-31 12:44:03 -07:00
vendor Added ability to upload favicon and email logo 2018-12-05 19:56:12 -08:00
dashboard.blade.php Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
notifications.blade.php Feedback for Kits; Fix checkins for accessories (#7060) 2019-05-23 19:39:30 -07:00