278 Commits

Author	SHA1	Message	Date
amcmanu3	334d4b69c8	Allow three arguments on server actions	2024-05-25 15:12:46 -04:00
amcmanu3	60d3ee1aa8	Working default backup	2024-05-25 14:40:14 -04:00
--unset	6ca396854d	Merge branch 'dev' into refactor/backups	2024-05-15 21:01:16 -04:00
--unset	b1a7142dc0	Fix role permissions	2024-05-10 22:56:50 -04:00
--unset	88fd46282d	Add expected return variable	2024-05-10 19:31:20 -04:00
Zedifus	718e76a01d	Merge branch 'dev' into refactor/big-bucket	2024-05-09 21:23:07 +01:00
Zedifus	39a98f2b5e	Merge branch 'dev' into tweak/json-audit-log	2024-05-09 21:03:26 +01:00
--unset	5e778e9fd7	Allow self-hosted repo for server builder jars	2024-05-05 10:12:10 -04:00
--unset	5b58af2226	Refactor add category back.	2024-05-05 09:44:17 -04:00
--unset	ef39564c0a	Refactor server creation for big bucket	2024-05-04 15:55:52 -04:00
--unset	7967962e3a	Refactor backend for big bucket	2024-05-04 15:15:43 -04:00
amcmanu3	b898595371	Refactor backup config methods to add/update	2024-04-20 17:30:37 -04:00
amcmanu3	92dfd18dbd	Refactor API for new activity log format	2024-04-20 15:47:34 -04:00
amcmanu3	400f42ba26	Merge branch 'dev' into refactor/api-key-su	2024-04-08 13:42:16 -04:00
Zedifus	20a8366410	Merge branch 'dev' into bugfix/api-perms-request	2024-04-07 00:06:15 +01:00
Zedifus	6313380922	Fix calling of orjson .JSONDecodeError class	2024-04-06 22:54:43 +01:00
Zedifus	a2dc3a8a45	Merge branch 'dev' into bugfix/uuid-server-clone	2024-04-06 21:37:53 +01:00
amcmanu3	4f469f3df1	Do not allow clone while server is running	2024-04-06 16:24:55 -04:00
Zedifus	c1c5b5b989	Merge branch 'dev' into bugfix/backup-restore-uuid	2024-04-06 20:52:14 +01:00
Zedifus	7c3eae66fc	Merge branch 'dev' into bugfix/fixing-rework-id-issue	2024-04-06 20:25:16 +01:00
amcmanu3	afb7575398	Fix API perms request returning stack	2024-04-06 15:05:26 -04:00
amcmanu3	9bed7092d6	Check for API permission as well as user permission	2024-04-06 13:42:41 -04:00
amcmanu3	432421f362	Fix server clones following uuid migration	2024-04-01 17:02:27 -04:00
amcmanu3	c13ac6a53c	Merge branch 'dev' into refactor/api-key-su	2024-03-25 12:36:43 -04:00
amcmanu3	3639ab9260	Catch more specific exception	2024-03-24 17:56:10 -04:00
Silversthorn	3edfd4320d	Replacing server_id=0 to server_id=None for AuditLog	2024-03-24 20:39:10 +01:00
amcmanu3	912785b280	Remove http references from codebase	2024-03-21 18:10:39 -04:00
amcmanu3	0a572fba92	Refactor API keys "super user" to "full access"	2024-03-17 12:50:11 -04:00
amcmanu3	9704016c54	Update schema for str uuid	2024-03-13 17:47:07 -04:00
Zedifus	e0bb2eaaa0	Merge branch 'dev' into refactor/server_ids	2024-03-03 01:32:44 +00:00
Zedifus	f98dbb9332	Merge branch 'dev' into bugfix/password-encode	2024-03-02 23:16:40 +00:00
Silversthorn	303de39226	Merge branch 'dev' into refactor/server_ids	2024-02-21 23:00:21 +01:00
amcmanu3	975dd2f967	Allow super users to clone to their hearts desire ... Add same roles for cloned server	2024-02-19 21:45:05 -05:00
amcmanu3	fcb8b02907	Black codebase	2024-02-19 21:14:28 -05:00
amcmanu3	d168a7f8f0	Remove max password length	2024-02-19 19:19:30 -05:00
Silversthorn	c118ba7337	Merge branch 'dev' into refactor/server_ids	2024-02-20 00:32:38 +01:00
amcmanu3	e053f4a750	Check server creation for clone server call	2024-02-19 18:07:17 -05:00
Zedifus	0422a2ecdf	Fix assorted black issues currently in dev	2024-02-19 20:02:09 +00:00
Silversthorn	2eb0eb59ef	Merge branch 'dev' into refactor/server_ids	2024-02-03 21:12:39 +01:00
Silversthorn	0a3512a18e	Merge branch 'dev' into refactor/server_ids	2024-02-02 20:50:08 +01:00
Andrew	5c37b0e0fd	Add auth logging	2024-02-01 00:08:34 -05:00
Andrew	dc5490cdcb	Merge branch 'dev' into feature/anti-lockout	2024-01-31 19:18:55 -05:00
Silversthorn	56d37989e5	Merge branch 'dev' into refactor/server_ids	2024-01-30 21:19:07 +01:00
Zedifus	bc6da9ac87	Merge branch 'dev' into bugfix/audit-server-id	2024-01-28 23:47:30 +00:00
amcmanu3	ec5e291a98	Fix bug where del fail would give no feedback	2024-01-28 16:21:27 -05:00
amcmanu3	e399d57f47	Fix no server id in audit log	2024-01-28 16:20:08 -05:00
amcmanu3	665997c34c	Print to terminal not file	2024-01-22 19:51:57 -05:00
amcmanu3	f800933799	Fix typo	2024-01-16 23:09:04 -05:00
amcmanu3	3d4153f941	Add lockout user for forgot password ... Hide lockout user from users list	2024-01-16 15:36:14 -05:00
Andrew	589a11f43c	Allow omission of player stats from total	2024-01-13 16:43:16 -05:00
Zedifus	a564fac8cd	Merge branch 'dev' into refactor/server_ids	2023-12-13 02:52:02 +00:00
Zedifus	342a4f6599	Merge branch 'dev' into tweak/backup-delete	2023-12-07 13:45:15 +00:00
Zedifus	ba187374d4	Merge branch 'dev' into bugfix/no-file-error	2023-12-07 12:55:20 +00:00
amcmanu3	42e4bb7e3c	Give better feedback when backup delete fails	2023-12-04 11:01:01 -05:00
amcmanu3	3840cc3863	Fix bug where no file error doesn't show up	2023-11-29 22:28:18 -05:00
amcmanu3	74c0e8b23a	Fix bug where su cannot edit general user password	2023-11-29 21:30:29 -05:00
Iain Powrie	67ed35a6b0	Merge branch 'JonathanAlKass-master-patch-25467' into 'dev' ... removed ".decoder" from orjson in crafty-4/app/classes/web/routes/api/roles/index.py: line 113 See merge request crafty-controller/crafty-4!674	2023-11-25 20:20:38 +00:00
JonathanAlKass	62b095c38f	removed ".decoder" from orjson in line 113	2023-11-21 06:30:45 +00:00
Silversthorn	586b2038b6	Fixing warnings	2023-11-10 23:16:04 +01:00
amcmanu3	bfbb130db9	Add logs to API	2023-11-05 13:33:30 -05:00
Silversthorn	aa7f47a4f4	Reworking id to use uuid	2023-11-01 18:44:56 +01:00
amcmanu3	645542b459	Move from 418 (i am a teapot) to 424 missing dep	2023-10-29 18:49:31 -04:00
amcmanu3	76e8b01335	Fix notifications not showing up/being reset	2023-10-29 18:37:30 -04:00
Andrew	9710d64072	Fix logical issue with get files perms check	2023-10-20 15:41:39 -05:00
amcmanu3	44c2aaada3	Remove external references from front end deps ... use secure transfer for jsonschema reference	2023-10-18 14:55:16 -04:00
amcmanu3	6bc45b86e5	Merge branch 'dev' into tweak/user-edit	2023-10-08 22:44:53 -04:00
amcmanu3	cd04b87705	Appease the linter	2023-10-08 22:39:05 -04:00
amcmanu3	2d32e3ad2a	Fix user edits | retain crafty perms ... Move password/username edit to bootbox	2023-10-08 22:13:55 -04:00
Iain Powrie	99f17c1532	Merge branch 'feature/openmetrics-implementation' into 'dev' ... Implementation of OpenMetrics See merge request crafty-controller/crafty-4!624	2023-10-08 22:11:27 +00:00
Silversthorn	814aaeb1d2	Appease the linter	2023-10-08 22:02:13 +02:00
Zedifus	9ddd21da82	Merge branch 'dev' into bugfix/server-upload	2023-10-08 19:07:51 +01:00
amcmanu3	0296b09547	Move Crafty server upload to /import/upload	2023-10-08 10:54:28 -04:00
Silversthorn	72a5f1661c	Resolve Conflicts from Merge branch 'dev' into feature/openmetrics-implementation	2023-10-07 23:55:58 +02:00
Silversthorn	f49475c15a	Removing unused imports	2023-10-07 23:52:06 +02:00
Silversthorn	49914c7f14	Improve OpenMetrics Registries Work	2023-10-07 23:50:56 +02:00
amcmanu3	4eb15db30f	Use controller on update user call	2023-10-07 15:21:33 -04:00
Andrew	19d72e5766	Refactor test webhooks with data	2023-09-28 19:26:21 -04:00
Andrew	6a81a5b337	Add accent color option	2023-09-28 19:07:03 -04:00
Andrew	9a88563916	Swap server ID for name in send.	2023-09-28 15:54:56 -04:00
Andrew	13214e9e86	Fix authentication issues on webhook get/post	2023-09-28 14:57:18 -04:00
Zedifus	409d7618dd	Refactor Webhooks to WebhookFactory ... To save having a massive class lets go modular	2023-09-28 19:17:47 +01:00
Andrew	628c234400	Refactor management classname	2023-09-27 17:35:44 -04:00
Zedifus	f9218ae157	Merge branch 'dev' into feature/discord-webhooks	2023-09-27 21:57:13 +01:00
Andrew	6af4f7b196	Remove print statement	2023-09-27 16:13:02 -04:00
Andrew	6c396fdf11	Fix backup restore	2023-09-26 21:08:11 -04:00
Zedifus	65bea2a11a	Merge branch 'dev' into feature/discord-webhooks	2023-09-21 23:42:04 +01:00
Andrew	6c1508f061	Remove extra handler	2023-09-19 18:35:41 -04:00
Silversthorn	1bf8f3bf44	Merge branch 'dev' into bugfix/issue_255_status_page_update	2023-09-19 22:08:49 +02:00
Andrew	8c2cfacb4e	Use Jar naming schema for refresh	2023-09-08 20:27:47 -04:00
Silversthorn	99ef2db016	Adding host stats to the API	2023-09-06 23:28:46 +02:00
Andrew	096de18c2c	Merge branch 'dev' into feature/discord-webhooks	2023-09-05 20:39:20 -04:00
Silversthorn	2d77c456ca	Merge branch 'dev' into bugfix/issue_255_status_page_update	2023-09-05 20:05:12 +02:00
amcmanu3	2c14a3fd2c	Appease the linter	2023-09-04 21:39:40 -04:00
amcmanu3	514bf8453f	Appease sonar	2023-09-04 21:21:59 -04:00
amcmanu3	3c5560d3e2	Merge branch 'dev' into feature/arcadia-notifications	2023-09-04 20:38:33 -04:00
amcmanu3	4051d98f8f	Appease the linter	2023-09-04 20:28:55 -04:00
amcmanu3	84a24687d0	Appease the linter	2023-09-04 19:38:20 -04:00
amcmanu3	9d26a8ff8d	Make sonar changes	2023-09-04 19:22:11 -04:00
amcmanu3	3cb18f2da4	Make if more comprehensive	2023-09-04 18:44:17 -04:00
amcmanu3	24f9b64d59	Add default photo variable to appease sonar	2023-09-04 18:42:29 -04:00