11365 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
snipe	d3fbbec92c	Merge pull request #13455 from snipe/fixes/confusion_around_localization_date ... Fixed #13382 - confusion around localization date	2023-08-14 22:50:30 +01:00
snipe	9820ab34d7	Use today’s date for date format selectlist ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-14 22:44:29 +01:00
snipe	aa333bcf0b	Merge pull request #13448 from Godmartinz/status-label-translations_fix ... Fixed #13446 - added translations to status label type column	2023-08-14 22:25:46 +01:00
snipe	ba56746f57	Merge pull request #13437 from marcusmoore/feature/improve-user-factory ... Allowed permissions in the user factory to be chained	2023-08-14 22:23:55 +01:00
snipe	716e13e5b1	Merge remote-tracking branch 'origin/develop'	2023-08-14 22:23:06 +01:00
snipe	dcec4ba5e2	Merge pull request #13454 from snipe/fixes/13450_removed_escaping_custom_fieldsets ... Fixed #13450 - remove escaping on saveing new custom fields	2023-08-14 22:22:35 +01:00
snipe	12e9d2adeb	Fixed #13450 - remove escaping on saveing new custom fields ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-14 22:21:41 +01:00
Ivan Nieto Vivanco	8da2a8a79c	Allows to save signature for declined items	2023-08-14 14:58:10 -06:00
Ivan Nieto Vivanco	4796598bb6	Add declinedCheckout method to Accessory model	2023-08-14 14:35:31 -06:00
Godfrey M	c3356ab765	fixed translation choice and color choice	2023-08-14 12:20:46 -07:00
Godfrey M	4446b2311d	remove unnecessary changes	2023-08-14 12:14:15 -07:00
Godfrey M	6b94ef6adc	fixes the statuslabeltypeforatter instead of the model	2023-08-14 12:13:01 -07:00
Godfrey M	a0d5774635	adds translations to status label type column	2023-08-14 10:42:17 -07:00
snipe	ec2556f991	Merge remote-tracking branch 'origin/develop'	2023-08-14 13:02:45 +01:00
snipe	291fa1cd29	Merge pull request #13445 from snipe/fixes/typo_in_formatter_for_asset_maintenances ... Fixed case in BS table formatter for boolean	2023-08-14 13:02:27 +01:00
snipe	58286c9cab	Fixed case in BS table formatter for boolean ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-14 13:01:32 +01:00
Robert-Azelis	1e43d88e06	Create 2023_08_13_172600_add_email_to_companies.php	2023-08-13 17:25:33 +02:00
Robert-Azelis	da701677c7	Update edit.blade.php	2023-08-13 17:24:17 +02:00
Robert-Azelis	30d33310ae	Update CompanyPresenter.php	2023-08-13 17:23:33 +02:00
Robert-Azelis	bbb8ecfee4	Update Company.php	2023-08-13 17:21:55 +02:00
Robert-Azelis	8988a5dfc3	Update CompaniesTransformer.php	2023-08-13 17:20:15 +02:00
Robert-Azelis	ed5b4ca0a2	Update CompaniesController.php	2023-08-13 17:18:25 +02:00
Robert-Azelis	07bafa9508	Update CompaniesController.php	2023-08-13 17:15:20 +02:00
snipe	6134dfa8f2	Merge remote-tracking branch 'origin/develop'	2023-08-11 09:42:30 +01:00
snipe	a1cfa45344	Merge pull request #13439 from snipe/fixes/500_error_when_cloning_invalid_accessory ... Fixed route for accessory index	2023-08-11 09:42:00 +01:00
snipe	df8f6a8d2b	Correctly call the route for accessory index ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-11 09:40:49 +01:00
Marcus Moore	5b86c02366	Set permissions to empty object in user factory	2023-08-10 16:55:44 -07:00
Marcus Moore	41479b1ec7	Allow permissions in the user factory to be chained	2023-08-10 16:35:10 -07:00
Marcus Moore	3a2b15313c	Bump guzzlehttp/psr7 to 2.4.5	2023-08-10 11:53:20 -07:00
Marcus Moore	6b6bb61400	Bump nyholm/psr7 to 1.6.1	2023-08-10 11:52:42 -07:00
snipe	6adaa32286	Merge pull request #13431 from marcusmoore/feature/custom-report-scoping ... Removed unneeded `Company::scopeCompanyables` from `ReportsController`	2023-08-10 09:57:53 +01:00
snipe	a599f0c923	Merge pull request #13434 from marcusmoore/chore/improve-test-stability ... Improved test stability and messaging	2023-08-10 09:57:26 +01:00
snipe	4db4bf7be4	Merge pull request #13432 from marcusmoore/chore/remove-old-testing-code ... Removed unused Codeception test code	2023-08-10 09:57:11 +01:00
Marcus Moore	04661d5441	Add help text to response assertion helpers	2023-08-09 17:09:31 -07:00
Marcus Moore	3a5ed031bf	Escape values in response assertion helpers	2023-08-09 17:08:49 -07:00
Marcus Moore	60baaae192	Remove unused test bootstrap file	2023-08-09 16:22:58 -07:00
Marcus Moore	8508594a2f	Remove old and unused Codeception test code	2023-08-09 13:32:15 -07:00
Marcus Moore	e0b464dcec	Merge branch 'develop' into feature/custom-report-scoping	2023-08-09 13:03:05 -07:00
snipe	7df3be3a54	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json	2023-08-09 10:54:49 +01:00
snipe	bd3ba9a5f7	Merge pull request #13428 from snipe/security/update_autotable ... Updated autotable	2023-08-09 10:49:01 +01:00
snipe	a65ac1ccdf	Updated autotable ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-09 10:47:45 +01:00
snipe	ffabc9c331	Merge pull request #13414 from marcusmoore/fixes/chipperci-config ... Fixes ChipperCi Pipeline	2023-08-09 10:37:21 +01:00
snipe	a6a742d8d8	Merge pull request #13407 from marcusmoore/feature/sc-23465 ... Added messaging to category edit page to improve clarity around when users will be emailed	2023-08-09 10:36:19 +01:00
Marcus Moore	2e632a3d2d	Improve test readability	2023-08-08 17:40:02 -07:00
Marcus Moore	c32f099053	Remove unneeded call to Company::scopeCompanyables	2023-08-08 17:22:15 -07:00
Marcus Moore	c752e1670c	Add test around company scoping in custom report	2023-08-08 17:21:39 -07:00
Marcus Moore	1405e17251	Add simple test around custom asset report response	2023-08-08 17:10:36 -07:00
snipe	15122bbb55	Merge pull request #13425 from snipe/security/upgrade_webpack_snyk_13416 ... Updated webpack	2023-08-08 22:24:59 +01:00
snipe	c18349d75f	Updated webpack ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-08 22:07:49 +01:00
snipe	70903f068c	Merge remote-tracking branch 'origin/develop'	2023-08-08 19:01:40 +01:00