135 commits

Author	SHA1	Message	Date
snipe	00d2235610	Lowercase tests in composer.json per previous revert ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 15:12:47 -08:00
snipe	f61f386f31	Fixed again because I suck ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 14:07:48 -08:00
snipe	d20a0f7c6d	Update composer autoload for test case case ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 14:05:35 -08:00
snipe	406211d2fe	Move mockery to require-dev ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 11:22:46 -08:00
snipe	fb06c136b9	Added mockery (because reasons?) ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 11:11:14 -08:00
snipe	957d092844	Upgraded phpunit to v9 ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 11:04:04 -08:00
snipe	d96e95abd6	Small mods to configs, removed old faker, added new ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-01 13:46:21 -08:00
snipe	d08c1787a1	First steps at getting dusk working ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-30 20:09:29 -08:00
Brady Wetherington	25d72d2978	Make composer install work on 7.4 as well as 8.0	2021-11-09 13:06:24 -08:00
Brady Wetherington	ec030e9e1f	Tweak some version requirements to make composer install run under phpv8	2021-11-08 21:19:23 -08:00
snipe	211e0c6bd4	Dropped down to PHP 7.3 compat packages ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-17 20:21:43 -07:00
Brady Wetherington	8e66abb926	Basic Laravel7 compatibility, starting getting Livewire going	2021-06-28 21:00:16 -07:00
snipe	9e0e952576	Updated composer ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 20:12:39 -07:00
Brady Wetherington	0118ff8a78	Remove barryvdh's laravel-cors for fruitcake's laravel-cors	2021-06-11 19:12:43 -07:00
snipe	a8123092af	Misc fixes for shift ... // TODO - re-fix the exception handler Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 14:07:50 -07:00
Laravel Shift	30607ac268	Shift Laravel dependencies	2021-06-10 20:18:11 +00:00
Laravel Shift	c367fa7e40	Shift PSR-4 autoloading	2021-06-10 20:18:01 +00:00
Nuno Maduro	8b6b95a05b	Makes nunomaduro/collision versioning consistent with other dependencies (#9316)	2021-03-29 18:15:20 -07:00
snipe	9f3a8a43cc	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # composer.lock	2021-03-17 19:41:02 -07:00
snipe	1b890ffcc5	Added collision	2021-03-17 15:45:00 -07:00
snipe	b103f724b5	Added discard changes in composer (for those weird cases where it says something changed in a vendor directory)	2021-03-09 17:38:06 -08:00
snipe	89ab4bb86f	Revert "Added PHP8 compatibility [experimental]" ... This reverts commit 3873f14971. # Conflicts: # composer.lock	2021-03-09 13:38:38 -08:00
snipe	707a68fc54	Rollback :(	2021-03-09 13:15:00 -08:00
snipe	0d91ebfed8	One more try at Spatie	2021-03-09 12:56:13 -08:00
snipe	3873f14971	Added PHP8 compatibility [experimental]	2021-03-09 12:39:49 -08:00
snipe	d263990401	Updated min requirements in composer.json	2021-02-02 21:29:09 -08:00
snipe	1e062d4fc8	Re-applying laravel update with PHP min 7.2.5	2021-02-02 20:58:15 -08:00
snipe	ca37de5e45	Ugh. Rolling back composer.lock ... Everything sucks	2021-02-02 20:44:07 -08:00
snipe	9ba2fd93c1	Reverted Laravel upgrade :(	2021-02-02 20:34:23 -08:00
Brady Wetherington	b09ded2a3b	Upgrade laravel (#9081) ... * Hotfix to develop to yank extraneous e() * Upgrade Laravel release only to a later 6.18.x version * Upgrade Laravel to 6.x and Passport 9.x, the recommended versions	2021-02-02 20:22:36 -08:00
snipe	d3d96c8285	Reverted composer until we can figure out wtf happened	2020-12-15 17:25:17 -08:00
snipe	1023fa3edd	Re-added updated slack library	2020-12-15 14:10:57 -08:00
snipe	bf34385c3e	Temp revert to old slack library ... Getting a weird error, need to troubleshoot remotely	2020-12-15 13:43:18 -08:00
Alexander Chibrikin	fb37dbed92	use supported package for slack (#8867) ... * Updated version.php to master * use supported package for slack Co-authored-by: snipe <snipe@snipe.net>	2020-12-14 17:45:00 -08:00
snipe	8504c9e8b9	Added phplint to dev in composer	2020-11-16 19:08:04 -08:00
Johnson Yi	b2930d6069	Added #542: add saml authentication	2020-05-06 00:06:19 +10:00
snipe	c5e587f33b	Added codeception testing modules for —dev	2020-04-21 20:15:45 -07:00
snipe	5dc64ea91b	Re-added EasySlugger to fix tests	2020-04-21 19:28:24 -07:00
snipe	3cb4672ffe	Updated composer	2020-04-21 02:47:12 -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	450c1b9d56	Updated faker library to be compatible with PHP 7.4	2020-04-08 11:13:15 -07:00
snipe	9aed12c5aa	Update composer package with newer SVG package	2020-03-05 13:28:07 -08:00
snipe	5307e57bd9	Fix for CVE-2019-10772 ... Vuln in SVG sanitizer library	2020-03-04 22:15:31 -08:00
snipe	296de34e8a	WIP: Upgrade develop to Laravel 6.6.1 (#7637) ... I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials	2019-12-10 19:32:50 -08:00
snipe	e71e57f16a	Fixed XSS vulnerability in SVG image uploads [ch10476] (#7639) ... * Added enshrined/svg-sanitize * Added modular image resizing/SVG cleaning method (This already exists in v5, so I mostly ported it forward and added the SVG sanitizer.) * Use improved handleImages method to upload/resize/clean images * Removed $old_image This is handled in the ImageUpload request now	2019-12-05 22:23:05 -08:00
snipe	7f8f1ff35a	Specifically require slack notification channel for laravel 5.8 upgrade	2019-12-04 15:56:45 -08:00
snipe	5065164c40	Bumped Carbon version	2019-11-21 13:14:18 -08:00
snipe	38ed73a2b4	Bumped to Laravel 5.8	2019-11-18 21:17:36 -08:00
snipe	ba197c8857	Fixed #7259 - upgraded phpdocumentor/reflection-docblock to v4	2019-08-15 03:02:24 -07:00
snipe	b65fd4adba	Fixed syntax in composer.json ... (Our merge tool is teh sux0r)	2019-08-14 21:51:37 -07:00