13724 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
snipe	0981cfa902	Built assets ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-30 20:22:50 +01:00
snipe	37fbcfa22b	Merge pull request #14798 from Godmartinz/redirect_back_to_asset_fix ... Fixed checkin option from appearing	2024-05-30 19:41:02 +01:00
Godfrey M	0ee441a976	adds hidden as well	2024-05-30 11:19:06 -07:00
Godfrey M	cf8de3baa9	fix checkin option from appearing	2024-05-30 11:11:35 -07:00
snipe	5a5d171ba2	Put session facade back - derp ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-30 14:15:08 +01:00
snipe	aadee068b3	Merge pull request #14740 from Godmartinz/redirect_back_to_asset ... Added Redirect options to asset check in/out	2024-05-30 14:14:04 +01:00
snipe	a46e2ebfd8	Small tweaks to user export, user view translations ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-30 13:59:00 +01:00
snipe	f710b1aac3	Merge pull request #14614 from akemidx/feature/sc-19796 ... ADDED: Export User Permissions (Superuser & Admin)	2024-05-30 13:41:26 +01:00
snipe	f6fe6e70b9	Merge branch 'develop' into redirect_back_to_asset	2024-05-30 13:38:11 +01:00
snipe	bed8861179	Merge pull request #14796 from snipe/chore/sc-25715/axios ... Upgraded axios	2024-05-30 13:17:23 +01:00
snipe	180d7b1b5b	Upgraded axios ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-30 13:13:25 +01:00
snipe	386416ee5d	Merge pull request #14795 from snipe/bug/sc-25687/papaparse ... Upgraded papaparse	2024-05-30 13:04:00 +01:00
snipe	6b5aa91f3d	Upgraded papaparse ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-30 13:00:57 +01:00
snipe	12e107a71b	Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout ... Bulk Consumable Checkout	2024-05-29 19:42:25 +01:00
snipe	fba72e1e8d	Merge pull request #14789 from snipe/fixes/14781_broken_wrench_icon ... Fixed #14781 - Fixed broken wrench icon on some browsers in manufacturer section	2024-05-29 19:23:21 +01:00
snipe	7bbee053c6	Updated fa icon call ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 19:19:45 +01:00
snipe	6ea1a3bacf	Merge pull request #14788 from snipe/security/Snyk-Upgrade-jquery-ui-from-1.13.2-to-1.13.3-#14735 ... Updated jquery-UI	2024-05-29 18:47:39 +01:00
snipe	603afe4466	Updated jquery-UI ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 18:44:39 +01:00
snipe	037ee8c07a	Merge pull request #14787 from snipe/fixes/return_redirect_fixes_for_docblock ... Fixes path for redirect response	2024-05-29 18:28:00 +01:00
snipe	df1cef59d5	Fixes path for redirect response ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 18:01:40 +01:00
snipe	3fcd196c04	Merge pull request #14786 from snipe/security/upgrade_bs_tables ... #14743 - Upgrade bootstrap-table from 1.22.3 to 1.22.5	2024-05-29 13:12:07 +01:00
snipe	8ee5e7cd0a	#14743 - Upgrade bootstrap-table from 1.22.3 to 1.22.5 ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 13:10:46 +01:00
snipe	1ec85063ee	Merge pull request #14785 from snipe/fixes/updates_facade_paths ... Fixed/updated facade paths	2024-05-29 13:03:13 +01:00
snipe	92ba889cae	Updated/removed facades ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 12:53:51 +01:00
snipe	f17162c2e2	Use artisan facade ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 12:40:05 +01:00
snipe	fb233c0aa4	Cleaned up facade names and references ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 12:38:15 +01:00
snipe	369c819a27	Merge pull request #14754 from Godmartinz/footer_user_bug ... Removed extra div from User Details.	2024-05-29 11:29:02 +01:00
snipe	f1eb4bd3a5	Merge pull request #14349 from snipe/jerm/update-mailer-configs ... Update mailer configurations for Symfony mailer	2024-05-29 11:25:55 +01:00
snipe	2f828683da	Merge pull request #14783 from snipe/fixes/fixed_category_test_depreciation_warning ... Fixed deprecation warning on category test	2024-05-29 11:19:31 +01:00
snipe	13db151297	Fixed deprecation warning on category test ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 11:06:51 +01:00
snipe	bb95c231e5	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2024-05-29 10:55:12 +01:00
snipe	dcea14fb99	Merge pull request #14778 from uberbrady/fix_8_3_compat ... Allows Snipe-ITv7 to install on PHPv8.1-8.3	2024-05-29 10:55:02 +01:00
snipe	282fed27da	Add @bryanlopezinc as a contributor	2024-05-29 10:46:59 +01:00
snipe	cf3ffe9c74	Merge pull request #14782 from bryanlopezinc/ReduceIDeErrors ... Reduce IDE errors in App\Http\Controllers\SettingsController	2024-05-29 10:46:03 +01:00
bryanlopezinc	5d01a06245	Reduce IDE errors in App\Http\Controllers\SettingsController	2024-05-29 08:07:49 +01:00
snipe	02cdda56e2	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2024-05-29 02:00:25 +01:00
snipe	ffecd97665	Bumped laravel in readme ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 02:00:21 +01:00
snipe	779cf9418e	Merge pull request #14780 from marcusmoore/fixes/sqlite-tests-in-gh ... Fixed sqlite tests in GitHub Actions	2024-05-29 01:59:12 +01:00
Marcus Moore	34b4452645	Skip "migrating" and run passport:keys for sqlite testing in GH	2024-05-28 17:41:01 -07:00
snipe	da1c4c23e6	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2024-05-29 00:26:37 +01:00
snipe	a5d0a21757	Fixed string path ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-29 00:26:33 +01:00
snipe	29454f7288	Merge pull request #14779 from marcusmoore/fixes/fix-group-create-endpoint ... Fixed Array to string conversion exception in group create api endpoint	2024-05-28 23:26:34 +01:00
Brady Wetherington	e271711c5b	Added the clock-lts repo which allows use on php8.1-8.3	2024-05-28 22:50:09 +01:00
Marcus Moore	4c78da3bbf	Re-add json encoding of permissions	2024-05-28 13:03:09 -07:00
Marcus Moore	71bab2c315	Improve test case	2024-05-28 13:02:44 -07:00
snipe	7d2af61989	Merge pull request #14775 from snipe/bug/sc-25676/groups_api ... Fixed #14771: improvements to groups API	2024-05-28 15:33:36 +01:00
snipe	03b5c2e246	Fixed bad translation string ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-28 15:21:28 +01:00
snipe	33d5d5e24f	Added tests ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-28 15:21:13 +01:00
snipe	3df2a4a70b	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-28 15:16:44 +01:00
snipe	6b41970e97	Check that selected is an array ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-28 15:15:31 +01:00