5236 commits

Author	SHA1	Message	Date
Marcus Moore	6f639f7bf0	Load settings properly in SendUpcomingAuditReport command	2024-05-06 16:44:14 -07:00
snipe	dab5874fd7	Merge pull request #14391 from snipe/features/add_Brother_188mm_tape_label ... Added Brother 18mm label type	2024-05-02 13:14:04 +01:00
snipe	4850227c04	Merge pull request #14655 from snipe/feature/sc-25381/simpler_overdue_endpoints ... Refactored due/overdue for audit, added due/overdue for checkin API endpoint and GUI	2024-05-02 13:11:51 +01:00
snipe	eb9a654cc3	Moved settings call higher ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-02 12:37:41 +01:00
snipe	4224bc0c43	Removed extra settings param ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-02 12:36:57 +01:00
snipe	19cff25300	Merge pull request #14651 from marcusmoore/bug/sc-25402 ... Fixed `purchase_cost` not being allowed to be a string when creating asset via api	2024-04-27 03:39:10 +01:00
snipe	848e1fe1f6	Refactored audit alerts ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 21:26:00 +01:00
snipe	fe147adec3	Refactor checkin alert ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 21:10:54 +01:00
snipe	103809b65f	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 21:01:43 +01:00
snipe	a398496dd4	Added comments ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 21:01:27 +01:00
snipe	839db8ef44	Refactored due-or-overdue methods ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 20:59:27 +01:00
snipe	50d8b02f8b	Removed unused scope ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 19:23:27 +01:00
snipe	860764a436	Use totals for sidebar ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 19:12:21 +01:00
snipe	52d6a8990a	Check that the asset is not already checked in ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 19:06:46 +01:00
snipe	3f04afee5c	Removed unused method ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 19:01:26 +01:00
snipe	2117f61e8c	More view sharing for sidebar ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 19:01:15 +01:00
snipe	d40604b574	Removed debugging, added date cast ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 19:01:05 +01:00
snipe	6dc9ccffcd	Refactor api for handling audit/expected checkins ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 18:56:57 +01:00
snipe	bf058bd5c6	Use updated scopes ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 14:02:56 +01:00
snipe	dfaf01e8aa	Updated asset counters ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 14:02:47 +01:00
snipe	2e92ee8eee	Switch to whereBetween so tests run on sqlite ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 14:02:23 +01:00
Marcus Moore	2a71877bec	Add additional condition	2024-04-25 17:04:07 -07:00
Marcus Moore	30bd920497	Add conditional	2024-04-25 16:24:12 -07:00
Marcus Moore	1d5b48b88d	Add comment and improve method	2024-04-25 16:22:15 -07:00
Marcus Moore	3a2eeaea7a	WIP: Future-proof rules being converted to array syntax	2024-04-24 17:40:40 -07:00
Marcus Moore	12418ae91b	WIP: allow EU style purchase cost via api	2024-04-24 17:18:29 -07:00
snipe	2439758ef3	Merge pull request #14587 from Godmartinz/License-export-button ... Added a License Export function and button	2024-04-24 04:42:56 +01:00
snipe	685f1cbfb8	Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels ... Removed encrypted fields from label options	2024-04-23 13:31:38 +01:00
snipe	bdd43b7134	Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields ... Re-enabled updating encrypted custom fields via API [sc-41465]	2024-04-23 10:20:55 +01:00
Godfrey M	96b3af7cbc	fixed view from sending all custom fields	2024-04-22 18:27:34 -07:00
Godfrey M	5fc6771543	adds licenses available, updated teranslations	2024-04-22 17:58:49 -07:00
Godfrey M	14ddf36d46	removed two duplicate translations	2024-04-22 10:43:11 -07:00
Godfrey M	25f1167c9d	adds company scoping to license export	2024-04-22 10:38:55 -07:00
Godfrey M	420225c2d5	Merge branch 'refs/heads/develop' into License-export-button	2024-04-22 10:33:30 -07:00
snipe	2aa3ce15bd	Removed escaping on notes for file uploads ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-22 14:55:02 +01:00
snipe	8dd71f99cc	Added ico, image/x-icon,image/vnd.microsoft.icon to favicon validation ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-22 13:54:19 +01:00
snipe	424cbd3248	Removed noisy debug ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-18 14:25:54 +01:00
snipe	6f195cb8ec	Merge pull request #14591 from snipe/bug/sc-25258/naive_fix_for_user_scoping ... First fix for user FMCS scoping	2024-04-17 21:49:53 +01:00
snipe	4450351b75	Only sync groups if API user is superadmin ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-17 11:06:50 +01:00
snipe	9bb15aaf1b	Added individual gates to keep response consistent with other company-ed things ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-17 10:57:49 +01:00
snipe	65dd729e19	Additional gates ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-17 10:57:20 +01:00
snipe	5e8c129c7f	Revert accidental commit ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-17 09:26:50 +01:00
snipe	ab3b5ca4ef	Fixed tests ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-17 09:26:07 +01:00
snipe	a8d48b758e	Merge pull request #14594 from marcusmoore/bug/sc-25314/multiple-label-fields-on-one-row ... Fixed label fields only showing first option	2024-04-15 18:53:03 +01:00
Brady Wetherington	67a8e0b5c6	This re-enables the ability to update encrypted custom fields via the API	2024-04-15 18:46:11 +01:00
snipe	7b7d424962	Merge pull request #13880 from Godmartinz/department-validation-bug ... Fixed department validation to allow updates	2024-04-12 10:50:26 +01:00
Marcus Moore	a4e959818a	Add comment	2024-04-11 17:23:28 -07:00
Marcus Moore	c3a71cc182	Improve variable names and add comment	2024-04-11 16:44:13 -07:00
Marcus Moore	da03cfdbe5	Formatting	2024-04-11 16:39:29 -07:00
Marcus Moore	2b137d76fa	Trim string to avoid leading whitespace if label is empty	2024-04-11 16:38:22 -07:00