1561 commits

Author	SHA1	Message	Date
Daniel Meltzer	136df9418f	Deadcode--	2020-05-23 15:24:10 -04:00
Daniel Meltzer	7ea862787c	Refactor controller to use one method that shows all modals based on name.	2020-05-23 15:24:00 -04:00
Daniel Meltzer	25d6ceee6e	Remove old code.	2020-05-23 12:18:27 -04:00
Daniel Meltzer	fe74394ae6	Short circuit checkout logic to prevent iterating if we're not checking out to an asset	2020-05-23 11:48:02 -04:00
Daniel Meltzer	c70bd62a0f	Missing includes. Fix by using the request object instead of facade.	2020-05-23 11:36:16 -04:00
Daniel Meltzer	a6f90cb3fc	Assorted licenses UI fixes while testing. ... * Rename licenses route checkin parameter to clarify it's purpose and fix incorrect route in users view page. * Checkin note can be nullable for checking in a license. * License Seat view was only showing 20 license seats due to faulty transformer logic.	2020-05-12 14:38:21 -04:00
snipe	274f82893f	Regenerate session ID on logout ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-12 10:38:00 -07:00
snipe	730632e2eb	Apply PR #8043 to develop ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 22:57:55 -07:00
Johnson Yi	c1c37d521c	Allow downloading sp metadata without idp	2020-05-06 19:50:50 +10:00
Johnson Yi	b2930d6069	Added #542: add saml authentication	2020-05-06 00:06:19 +10:00
snipe	85712a1960	Only override fieldset_id with custom_fieldset_id if it’s present ... This is mostly to support prior versions. I have NFC why we did this in the first place. I’m sure I had a stellar reason, but couldn’t tell you what it is today. Signed-off-by: snipe <snipe@snipe.net>	2020-04-30 20:59:42 -07:00
snipe	e9cb17394c	Small validation fix on reset password ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-30 19:10:07 -07:00
snipe	8507bcd16b	Merge pull request #8008 from dmeltzer/component-checkinout-fixes ... Component checkout/checkin fixes.	2020-04-30 17:49:22 -07:00
snipe	b488cffc7e	Merge pull request #8006 from dmeltzer/api-test-fixes ... Test fixes pt 2.	2020-04-30 17:46:25 -07:00
snipe	8bb3c01f78	Addressed merge issue for reset password for #7997 ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-30 17:45:05 -07:00
snipe	82e02490fd	Removed duplicate update method (per #7997) ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-30 17:23:56 -07:00
Daniel Meltzer	68224757f4	Validate when editing the quantity of a component that the new quantity is > the amount checked out	2020-04-29 13:25:04 -04:00
Daniel Meltzer	358609720a	Component checkout/checkin fixes. ... - Provide proper translated messages for checkin vs checkout - Pass appropriate methods to the Checkout event, fixes an error on checkin. - Default to a value of 1 on checkin in UI to save a click sometimes.	2020-04-29 12:50:09 -04:00
Daniel Meltzer	1f8c3cc670	Test fixes.	2020-04-29 11:03:07 -04:00
Daniel Meltzer	f8d18a8eb0	Revert asset-checkout-different validation. ... This was causing issues when trying to check an item out to a user or a location because of the way laravel handles validation. Instead, rely on the exception check we had in the controller. I moved this exception up to the model checkout method so that it would work for anywhere that that method was called, even if it avoided the controller.	2020-04-29 10:59:00 -04:00
Daniel Meltzer	05187eb27f	Fix Functional Tests.	2020-04-28 11:39:53 -04:00
Daniel Meltzer	c74b904f14	Fix Location parent different validation on new location creation.	2020-04-28 11:39:52 -04:00
snipe	412caebf69	Fixed logo uploads ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 23:22:52 -07:00
snipe	bea3a7b982	Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 00:39:32 -07:00
snipe	f66ce02756	Added debugging logs ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 22:46:02 -07:00
snipe	c7b300a50d	Updated LDAP sync controller to use new Adldap2 connections ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 22:45:44 -07:00
snipe	cdd0e405be	Fixed weird merge ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 07:12:29 -07:00
snipe	b725e788ec	Applied new selectlist search to locations ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 06:39:41 -07:00
snipe	69a1732245	Removed duplicate form request in asset models controller ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 03:51:10 -07:00
snipe	7e9e5214ef	Fixed status label create error ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 03:50:43 -07:00
snipe	7a33e335d4	Fixes PSR autoloading issue	2020-04-21 20:15:24 -07:00
snipe	29b05d2020	Fixed syntax error in image upload request from mangled merge	2020-04-21 06:29:57 -07:00
snipe	c17106d1b3	Fixes for settings controller	2020-04-21 04:08:25 -07:00
snipe	cb71bcc4af	Switch to old() helper	2020-04-21 03:58:31 -07:00
snipe	87464e6ec0	Merge branch 'develop' into integrations/2020-04-15-v5-merge ... # Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js	2020-04-20 23:20:34 -07:00
snipe	197a84be94	Commented out rtd_location_id override - why did we do that?	2020-04-09 14:17:39 -07:00
snipe	b4fa4c77d7	Check for rtd_location_id before trying to assign	2020-04-09 14:14:30 -07:00
snipe	cfec142c3b	Better handle models without a fieldset in the asset request [RB 9935]	2020-04-09 11:18:54 -07:00
snipe	f8a72db696	Changed LDAP 600 to 500, clearer error messages on LDAP test	2020-04-09 09:55:44 -07:00
snipe	206bd675f2	Pulled slack validation out of setting model validation so it doesn’t fail mysteriously on other pages	2020-04-08 15:07:02 -07:00
snipe	a0f7fdc57a	Merge branch 'fixes/accessibility_fixes' ... # Conflicts: # public/css/build/all.css # public/css/dist/all.css # 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/js/components/importer/importer-file.vue	2020-04-08 11:19:42 -07:00
snipe	79232fc434	Fixed #7947 - Added rtd_location_id to API search	2020-04-08 11:00:04 -07:00
snipe	0b3f511534	Fixed compact() errors	2020-04-07 17:26:56 -07:00
snipe	893944403e	Check for location_id being set before trying to set it on checkout via API	2020-04-06 15:54:40 -07:00
snipe	d7873f257d	Fixed CSP for importer	2020-04-06 14:18:45 -07:00
snipe	e7c1418314	Fixed possible typo in CSP	2020-04-01 19:47:42 -07:00
snipe	4dcc1ffdbc	More form labels	2020-04-01 02:22:24 -07:00
snipe	7d466f3584	Update user uploads for more data to work with recport	2020-04-01 02:22:16 -07:00
snipe	6174f9b93f	Check that there is actually a filed ID submitted	2020-04-01 01:25:31 -07:00
snipe	a467a6999e	Use upload modal	2020-03-31 22:50:07 -07:00