12384 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marcus Moore	423b636db9	Guard against non-integers being passed for company_id	2024-01-09 10:57:43 -08:00
snipe	eaf6d56253	Merge pull request #14109 from marcusmoore/chore/sc-24397 ... Moved contributors to dedicated file	2024-01-08 22:28:52 +00:00
snipe	8541a342cb	Merge pull request #14108 from Godmartinz/asset_maintenance_scope ... Added supplier name as a searchable relation on the asset maintenance report	2024-01-08 22:25:55 +00:00
Godfrey M	4184b271f7	adds Supplier as a searchable relation on the asset maintenance report	2024-01-08 14:22:35 -08:00
Marcus Moore	6b105ba8f0	Move link	2024-01-08 14:17:42 -08:00
Marcus Moore	348ed1e555	Add link to contributors file	2024-01-08 14:16:15 -08:00
Marcus Moore	8314047bfb	Add newline to start of contributors file	2024-01-08 14:02:09 -08:00
Marcus Moore	1bd4b3827d	Add missing comma	2024-01-08 13:47:43 -08:00
Marcus Moore	a2463c2a71	Reference correct file	2024-01-08 13:43:26 -08:00
Marcus Moore	f4d568bf89	Add missing config key	2024-01-08 13:40:57 -08:00
Marcus Moore	eb862c27b8	Add config keys	2024-01-08 13:31:30 -08:00
Marcus Moore	18f79ad924	Move contributors from readme to dedicated files	2024-01-08 13:29:18 -08:00
Marcus Moore	afb396ed65	Add contributor commands to package.json	2024-01-08 13:26:58 -08:00
Marcus Moore	8ea15fc6aa	Run generate command to migrate to new style ... (from markdown style tables and images to html style) ./node_modules/.bin/all-contributors generate	2024-01-08 12:42:45 -08:00
Marcus Moore	064ec1c22d	Add missing markers	2024-01-08 12:39:40 -08:00
Marcus Moore	2f47217003	Add all-contributors-cli as dev dependency	2024-01-08 12:26:52 -08:00
snipe	4f8defb67d	Merge pull request #14107 from snipe/bug/sc-24471 ... Check that the asset exists before trying to get properties	2024-01-08 12:43:13 +00:00
snipe	2707c399ea	Check that the asset exists before trying to get properties ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-08 12:42:05 +00:00
snipe	6ebbd2dc30	Merge pull request #14104 from snipe/feature/google_login_more_prominent ... Move Google Login prompt higher, made it bigger	2024-01-05 15:03:12 +00:00
snipe	7c5d29ccd9	Move Google Login prompt higher, made it bigger ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-05 14:56:34 +00:00
snipe	93712ec417	Merge pull request #14103 from snipe/bug/user_api_limit_offset_order ... Moved limit and offset in user API to after additional qualifiers	2024-01-05 12:02:18 +00:00
snipe	f8a21bdb2d	Moved limit and offset to after additional qualifiers ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-05 11:59:31 +00:00
snipe	98ef687e9c	Merge pull request #14090 from marcusmoore/chore/sc-24386 ... Run sqlite tests in GitHub action	2024-01-04 22:41:37 +00:00
snipe	432f05586e	Merge pull request #14100 from Godmartinz/fix-license-seat-department-link ... fixed `departmentNameLinkFormatter` url	2024-01-04 22:40:24 +00:00
snipe	dbcf7e3fd1	Merge pull request #14101 from marcusmoore/bug/sc-24398 ... Fixes creating invalid query with null values	2024-01-04 22:36:46 +00:00
Marcus Moore	742e183b02	Add guard against adding null values to query ... Since $request->filled(null) returns true	2024-01-04 14:04:00 -08:00
Godfrey M	a110b5fcca	ugh	2024-01-04 12:37:53 -08:00
Godfrey M	1f1e58eb1e	remove unintentional change	2024-01-04 12:36:57 -08:00
Godfrey M	32b34ca9b9	departmentNameLinkFormatter had a bad url	2024-01-04 12:33:33 -08:00
snipe	0c6611d6bd	Merge pull request #14097 from spencerrlongg/hotfix/migration_model_issue ... Use Query Builder instead of Model for Update to Skip Observer	2024-01-04 00:36:30 +00:00
spencerrlongg	0d853f931d	use query builder instead of model for update to skip observer	2024-01-03 18:32:13 -06:00
snipe	42d35174b2	Updated hash ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-03 23:25:56 +00:00
snipe	00718d7a4b	Merge pull request #14096 from snipe/security/snyk_14075 ... Upgrade jspdf-autotable from 3.5.31 to 3.8.0	2024-01-03 23:23:10 +00:00
snipe	ab32c42ac8	Upgrade jspdf-autotable from 3.5.31 to 3.8.0 ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-03 23:21:27 +00:00
snipe	bbdc8383e1	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-03 23:17:44 +00:00
snipe	e711d68de1	Merge pull request #14095 from snipe/security/snyk_14066_Upgrade_fortawesome/fontawesome-free ... Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.5.0	2024-01-03 23:16:39 +00:00
snipe	b29df4a610	Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.5.0 ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-03 23:15:49 +00:00
snipe	93273d301a	Merge pull request #14094 from snipe/localizations/updated_strings ... Updated language strings	2024-01-03 23:13:15 +00:00
snipe	50eb257cec	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-03 23:12:29 +00:00
snipe	b23ce6cfc6	Merge pull request #14093 from marcusmoore/bug/sc-24389 ... Fixes language source directory for crowdin	2024-01-03 22:11:20 +00:00
Marcus Moore	08c16b4435	Fix language source directory	2024-01-03 14:02:36 -08:00
snipe	0d697629aa	Merge pull request #14092 from marcusmoore/chore/sc-24383 ... Syncs readme to DockerHub description	2024-01-03 21:36:34 +00:00
Marcus Moore	1f7e7b20e9	Sync readme to dockerhub	2024-01-03 13:26:49 -08:00
Marcus Moore	4894f524a0	Update action name	2024-01-03 12:30:10 -08:00
Marcus Moore	f819e1469a	Run sqlite tests in GitHub action	2024-01-03 12:27:13 -08:00
snipe	cce9540316	Merge pull request #13964 from spencerrlongg/refactor/store_asset_form_request ... Tests For API Asset Store + Refactor For Auto Increment & Form Requests	2024-01-03 19:26:11 +00:00
spencerrlongg	901b1b83d0	rm code, was probably fixed through rules at some point	2024-01-02 18:27:17 -06:00
spencerrlongg	9e84521098	fix auto-increment settings for test settings	2024-01-02 18:10:59 -06:00
Spencer Long	8546407083	Merge branch 'develop' into refactor/store_asset_form_request	2024-01-02 18:05:15 -06:00
spencerrlongg	7c30261ec8	add marcus' migration changes to branch	2024-01-02 17:28:41 -06:00