14168 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
snipe	771c85e347	Translated account save message ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-20 11:19:31 +01:00
snipe	e5c358a1fe	Merge pull request #14731 from snipe/features/csp_env ... Fixed #14664 - allow additional urls in env for CSP	2024-05-16 22:25:11 +01:00
snipe	52c906f6b8	Added to env.example ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 22:21:52 +01:00
snipe	ca1555d962	Fixed #14664 - allow additional urls in env for CSP ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 22:19:18 +01:00
snipe	0d4f13219b	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2024-05-16 22:00:07 +01:00
snipe	7fdbbc846e	Bumped hash ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 21:59:38 +01:00
snipe	dbbbb103a0	Merge pull request #14730 from snipe/localizations/updated_strings ... Updated translations	2024-05-16 21:58:24 +01:00
snipe	2182ea1ce8	Updated translations ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 21:57:19 +01:00
snipe	f2cc9ec1dd	Merge remote-tracking branch 'origin/develop'	2024-05-16 19:57:46 +01:00
snipe	54b24434e1	Set file name variable ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 19:56:58 +01:00
snipe	653ad562a4	Updated codacy link ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 18:56:44 +01:00
snipe	7743b03129	Merge remote-tracking branch 'origin/develop'	2024-05-16 18:51:27 +01:00
snipe	84a601f364	Merge pull request #14729 from snipe/fixes/attribute_for_purchase_date ... Sets purchase date as date (versus datetime) in labels	2024-05-16 18:49:49 +01:00
snipe	88d131666c	Sets purchase date as date (versus datetime) in labels ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 18:40:49 +01:00
snipe	d691f3b315	Merge remote-tracking branch 'origin/develop'	2024-05-16 16:37:47 +01:00
snipe	00a9d5f33e	Merge pull request #14719 from snipe/fixes/add_next_audit_date_to_assets_form ... Added next audit date to assets form	2024-05-16 16:33:49 +01:00
snipe	eb0fd2f519	Removed stricter validation :( ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 16:29:11 +01:00
snipe	81efaa7481	Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form	2024-05-16 16:13:21 +01:00
snipe	2539c9e697	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 16:01:41 +01:00
snipe	3dfd471fa4	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/dist/all-defer.js # public/mix-manifest.json	2024-05-16 15:33:50 +01:00
snipe	4119526889	Merge pull request #14728 from snipe/fixes/smarter_decryption_in_activity ... Only attempt to decrypt custom fields in activity log if the value is not empty	2024-05-16 15:31:18 +01:00
snipe	6b3346d90c	Only attempt to decrypt if there is a value ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 15:28:25 +01:00
snipe	312ce51de6	Removed more debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 15:25:57 +01:00
snipe	09914f508f	Removed more debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 15:16:52 +01:00
snipe	45eda0f611	Removed debug lines ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 15:09:27 +01:00
snipe	de088d452f	Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance ... Adds a note text area to asset acceptances/declines	2024-05-16 15:06:05 +01:00
snipe	2f18430ce4	Merge pull request #14725 from snipe/features/added_security_dot_txt ... Added security.txt file	2024-05-16 09:59:46 +01:00
snipe	8d67e02d63	Added security.txt file ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 09:56:11 +01:00
Phil	1b85eea28e	added new compose and env files	2024-05-16 02:13:31 +02:00
Godfrey M	fb9a5f928f	removed license changes	2024-05-15 16:39:26 -07:00
Phil	4459483862	moved env. to own dev-file	2024-05-16 01:06:47 +02:00
Phil	a0cf7ecc98	moved file to dev-specific naming-scheme	2024-05-16 00:05:59 +02:00
snipe	8e35a56386	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 20:01:04 +01:00
snipe	30f738646e	Merge pull request #14700 from marcusmoore/chore/sc-25471 ... Updated alpine to the latest version (3.13.10)	2024-05-15 19:59:51 +01:00
snipe	55281313d8	Merge pull request #14474 from Godmartinz/asset-location-update-bug ... Fixed user assets not updating when a user changes location	2024-05-15 19:20:14 +01:00
Godfrey M	786799225c	remove dd	2024-05-15 10:37:07 -07:00
snipe	c137fafa97	Updated language ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 18:10:43 +01:00
snipe	cb22a3d556	Updated comments again :-/ ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 17:52:50 +01:00
snipe	c7accb4599	Added comments ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 17:38:42 +01:00
snipe	72c85f93b6	Fixed test ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:47:45 +01:00
snipe	c1d5b8713b	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	8310b91e00	Use UploadFileRequest for audit files ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	71b5bf2eef	Added visual on the hardware view screen ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	ab8b40745e	Added next audit date to create/edit asset screen ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	16ec47573b	Added help text to bulk edit blade ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	556d0b44a3	Added asset ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	0734d5b0b6	Added help text ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	f158a369a4	Added/updated string ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:47 +01:00
snipe	bdbfb0f2a1	Added accessor and mutator for next_audit_date ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:47 +01:00
snipe	e5653eaa93	Save new data ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:47 +01:00