6980 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ivan Nieto Vivanco	9eaf89aaa7	Add a variable to better control the selected user's ids	2021-10-21 13:28:58 -05:00
snipe	31d49b5c9b	Fixed merge error parse error ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 18:11:34 -07:00
snipe	6e0f8068b2	Fixed duplicate use statement from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:54:32 -07:00
snipe	9ee13f0d2a	Fixed dupe use statement from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:53:43 -07:00
snipe	ae1a4bb3c9	Fixed extra braces from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:36:06 -07:00
snipe	aa8f1378c9	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php	2021-10-20 17:26:41 -07:00
Godfrey M	9ae7d0b23a	when parent asset is assigned to other location, children assets location are updated as well.	2021-10-20 17:01:25 -07:00
snipe	365349fd91	Center custom fields email icon ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-18 18:39:46 -07:00
snipe	a88f622ec3	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-18 16:45:51 -07:00
snipe	f87ffb84d5	Merge pull request #10201 from snipe/fixes/xss_on_export ... Fixes possible XSS on all-file-types export	2021-10-15 09:54:52 -07:00
snipe	bda23bb1e6	Fixes possible XSS on all-file-types export ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-15 11:50:52 -05:00
snipe	4095a3f8c4	Removed dupe bars ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:31:08 -07:00
snipe	94c4265524	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2021-10-12 12:30:39 -07:00
snipe	4a98519c1f	Compiled assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:30:25 -07:00
snipe	d126b265ee	Merge pull request #10192 from snipe/bug/sc-17471/font-awesome-hamburger-menu-is-showing-as ... Fixed misisng hamburger menu	2021-10-12 12:10:53 -07:00
snipe	892fc0004a	Fixed misisng hamburger menu ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:09:46 -07:00
snipe	2cbbf7efe2	Merge pull request #10186 from tanji/patch-2 ... Exclude web.config from Apache	2021-10-11 10:03:37 -07:00
Guillaume Lefranc	494ed3d17a	Exclude web.config from Apache	2021-10-11 14:14:00 +02:00
Matthew Nickson	8996c24d1f	Merge branch 'develop' into sum_cost_by_quantity	2021-10-10 13:01:44 +01:00
FliegenKLATSCH	24c484303e	Do not include deleted assets by default when doing lookup by serial ... This commit introduces a new query parameter `deleted`, which can be set to `true` to include deleted assets in the response.	2021-10-09 08:56:31 +02:00
snipe	5d94b99035	Switched to 5 in one minute ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 15:53:32 -07:00
snipe	c4856c8aed	Merge pull request #10180 from snipe/fixes/add_rate_limiting_to_forgotten_password ... Throttle password reset requests to 5 every 60 seconds	2021-10-08 15:44:43 -07:00
snipe	0674ef5a3d	Fixed number to 1 (for minutes) ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 15:43:32 -07:00
snipe	702791210e	Throttle password reset requests to 5 every 60 seconds ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 14:26:30 -07:00
snipe	1f5c38ad7e	Merge pull request #10179 from inietov/features/allow_same_category_name_for_different_types ... Fixes #9365 #9800 Added a validation to use the same name in categories with different types [sc-17487]	2021-10-08 14:10:29 -07:00
Ivan Nieto Vivanco	23b770fac6	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
snipe	1c77fd0d09	Merge pull request #10178 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror ... Fixed typo when setting the headers	2021-10-08 12:04:45 -07:00
Ivan Nieto Vivanco	d184da8611	Fixed typo (thanks @ssddanbrown)	2021-10-08 13:39:49 -05:00
snipe	5f52ee59b2	Merge pull request #9529 from dampfklon/Feature_#9514_Asset_Acceptance,_resend_mail/_send_remainder ... Feature #9514, Feature #9378 Unaccepted Assets Report Actions, Fixed [ch16410]	2021-10-07 12:49:42 -07:00
Dampfklon	ab4a234e20	fix rebase errors	2021-10-07 21:32:57 +02:00
Dampfklon	7645f23f5c	remove pending Acceptances on checkin	2021-10-07 21:03:46 +02:00
Dampfklon	4418ad2340	Enable display of deleted acceptances, strike deleted users, add date, enable sorting	2021-10-07 21:03:46 +02:00
Dampfklon	12ee06deb6	add Download All Button, change route analogue to activity report	2021-10-07 21:01:50 +02:00
Dampfklon	9a9ca59544	Fix decprecated implode usage	2021-10-07 20:55:47 +02:00
Dampfklon	ed99532c30	Unaccepted Assets Report Actions (send reminder, delete) added ... Unaccepted Assets Export fixed	2021-10-07 20:53:02 +02:00
snipe	ac76364140	Merge pull request #10172 from snipe/fixes/S3_upload_preview ... Fixed models preview - Use Storage:: facade	2021-10-06 13:14:02 -07:00
snipe	7848a3c3dc	Use Storage:: facade for image preview for models ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 13:12:42 -07:00
snipe	f41ec640fe	Added Huntr.dev badge ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:49:30 -07:00
snipe	fc5efd857f	Merge pull request #10171 from snipe/fixes/xss_svg_in_file_uploads ... Fixed SVG XSS vuln	2021-10-06 12:38:51 -07:00
snipe	ccd430ce07	Switched back down to debug level ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:38:21 -07:00
snipe	f306401e7e	Fixed SVG XSS vuln ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:26:45 -07:00
snipe	c06a93ef13	Removed extra brace in assets for components ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 10:38:13 -07:00
snipe	17d4e25e60	Merge pull request #10167 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror ... Set headers in a different manner in the middleware [sc-17520]	2021-10-05 14:06:39 -07:00
Ivan Nieto Vivanco	ef6eea67d8	Set headers in a different manner in the middleware	2021-10-05 14:09:35 -05:00
snipe	3980c80c70	Merge pull request #10166 from uberbrady/fix_default_values_for_custom_fields_for_models_rebased ... Fix default values for custom fields for models rebased	2021-10-04 22:27:45 -07:00
Brady Wetherington	bbeedc026d	A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.	2021-10-04 22:07:29 -07:00
Brady Wetherington	d80604f2ac	Most of the basics are working, but not done and lots of debug messages are about ... I picked up the change that picked a point-release difference on the AWS library since that usually works out for us (x.y.1 vs. x.y.2 - usually a good call)	2021-10-04 22:06:48 -07:00
snipe	84c73aae5d	Merge pull request #10165 from snipe/fixes/set_restore_actions_to_POST_requests ... Set restore actions to POST requests instead of GET	2021-10-04 20:40:33 -07:00
snipe	dc3af7cc74	Resolved conflicts ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 20:39:24 -07:00
snipe	34eab88b7e	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 20:25:31 -07:00