Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,041 Commits 12 Branches 45 Tags 104 MiB
334d4b69c8
Commit Graph

2712 Commits

Author SHA1 Message Date
amcmanu3
5fe696e269 Merge branch 'dev' into refactor/backups 2024-04-19 16:09:31 -04:00
amcmanu3
a76a2722db Fix child schedule failing to load after del parent 2024-04-19 16:05:35 -04:00
--unset
227d642546 Set audit logging to logfile instead of DB 2024-04-17 18:03:10 -04:00
--unset
89b552a880 Redirect to /login if garbage is in query args 2024-04-16 10:26:32 -04:00
--unset
92bd7b80c8 Remove console log on login 2024-04-16 10:26:09 -04:00
Analicia Abernathy
6c28ef6327 Update cs_CS.json 2024-04-15 17:48:53 -05:00
Analicia Abernathy
2a601c9f31 update translations for refactor/api-key-su 2024-04-11 09:16:03 -05:00
Analicia Abernathy
ab18daebe7 Merge branch 'refactor/api-key-su' of gitlab.com:crafty-controller/crafty-4 into refactor/api-key-su 2024-04-10 18:19:11 -05:00
Analicia Abernathy
ed37387fbf updated translations for branch refactor/api-key-su 2024-04-10 18:18:44 -05:00
amcmanu3
400f42ba26 Merge branch 'dev' into refactor/api-key-su 2024-04-08 13:42:16 -04:00
Analicia Abernathy
ba39480c51 Merge branch 'tweak/error-return' of gitlab.com:crafty-controller/crafty-4 into tweak/error-return 2024-04-07 18:25:15 -05:00
Analicia Abernathy
36f2256273 Update languages for merge 743 2024-04-07 18:25:05 -05:00
Zedifus
8106966146 Prepare 4.3.3 release base 2024-04-07 01:58:29 +01:00
Zedifus
20a8366410 Merge branch 'dev' into bugfix/api-perms-request 2024-04-07 00:06:15 +01:00
Iain Powrie
0e8c8d4da8 Merge branch 'sec/bump-orjson' into 'dev' 
Bump orjson for CVE-2024-27454

See merge request crafty-controller/crafty-4!747
 2024-04-06 22:51:22 +00:00
Zedifus
6313380922 Fix calling of orjson .JSONDecodeError class 2024-04-06 22:54:43 +01:00
Zedifus
057139c7e1 Rerverse order of returned server jars versions 
Logic I removed in my refactor, whoops!

Newest -> oldest
 2024-04-06 22:01:37 +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
1b9646cd0f Merge branch 'dev' into tweak/server-jars-domain-swap 2024-04-06 21:06:11 +01: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
Zedifus
20d5f85602 Increase max versions returned 2024-04-06 20:20:45 +01:00
amcmanu3
afb7575398 Fix API perms request returning stack 2024-04-06 15:05:26 -04:00
amcmanu3
5f00f9d6fa Add full access translation 2024-04-06 13:53:38 -04:00
amcmanu3
9bed7092d6 Check for API permission as well as user permission 2024-04-06 13:42:41 -04:00
amcmanu3
46970e1283 Make dash button more noticable 2024-04-06 11:39:06 -04:00
Zedifus
cc67ebef76 A further clean up and refactor of server jars cache logic 
Reordered code, and tidy'd based on DRY (Don't Repeat Yourself)
 2024-04-06 01:38:45 +01:00
Zedifus
0fab5cd0f3 Refactor for temporary hardcoded types, use new health check response. 
api.serverjars.com not providing fetchTypes route currently,
Will revert when available.
NOTE: New api does not incl Spigot / Bukkit. Announce this.
 2024-04-05 20:01:37 +01:00
Zedifus
0c1b81faca Merge branch 'dev' into tweak/error-return 2024-04-03 00:56:50 +01:00
Zedifus
a8503748e2 Merge branch 'lang/italian-updates' of gitlab.com:crafty-controller/crafty-4 into lang/italian-updates 2024-04-03 00:30:48 +01:00
Iain Powrie
286151a01b Merge branch 'lang/czech-updates' into 'lang/italian-updates' 
update czech language

See merge request crafty-controller/crafty-4!742
 2024-04-02 23:30:42 +00:00
Zedifus
34c30f7552 Merge branch 'dev' into lang/italian-updates 2024-04-03 00:25:41 +01:00
Iain Powrie
221afabe78 Merge branch 'tweak/remove-version-disclosure' into 'dev' 
tweak/remove version disclosure

See merge request crafty-controller/crafty-4!737
 2024-04-02 23:13:51 +00:00
amcmanu3
39cfd40fad Add link to go back to dashboard on error page 2024-04-01 19:09:26 -04:00
Analicia Abernathy
50ccac8ea5 update czech language 2024-04-01 16:58:37 -05:00
amcmanu3
432421f362 Fix server clones following uuid migration 2024-04-01 17:02:27 -04:00
Analicia Abernathy
95490d5067 Updating Italian translation 2024-03-31 13:25:17 -05:00
amcmanu3
089b49c85e Disable crafty perms user does not have access to 2024-03-25 13:04:09 -04:00
amcmanu3
c13ac6a53c Merge branch 'dev' into refactor/api-key-su 2024-03-25 12:36:43 -04:00
Dylan Oonk
4a134278ae remove version disclosure from login 2024-03-24 22:49:47 +00:00
amcmanu3
3639ab9260 Catch more specific exception 2024-03-24 17:56:10 -04:00
amcmanu3
25b64e353c Fix backup restores after uuid server IDs 2024-03-24 17:55:58 -04:00
Silversthorn
3edfd4320d Replacing server_id=0 to server_id=None for AuditLog 2024-03-24 20:39:10 +01:00
Silversthorn
a87daa6ef3 Format with Black for lint apeasing 2024-03-23 14:32:39 +01:00
Silversthorn
7a7f237187 appease lint 2024-03-23 14:30:48 +01:00
Silversthorn
9aad5e3d8f trying something to works form differents update version 2024-03-23 14:20:31 +01:00
Silversthorn
2bb8e185de Checking if the column is already deleted 2024-03-23 14:13:45 +01:00
Silversthorn
f71aaeb870 Adding back the Servers Model 2024-03-23 13:47:57 +01:00
Silversthorn
d30b335637 renaming the file to run part 1 before part 2 2024-03-23 13:32:54 +01:00
Silversthorn
8ff83fa045 appease black lint 2024-03-23 13:14:47 +01:00
Silversthorn
3a4037a332 trying to add rollback methods 2024-03-23 12:57:41 +01:00
Silversthorn
f0086c70f7 importing class instead of copy pasting it 2024-03-23 12:37:46 +01:00
Silversthorn
64a1defb95 Removing logging and console to prevent unnecessary messages 2024-03-23 12:29:16 +01:00
Silversthorn
5e4dbb1902 Disabling code if already updated to prevent unnecessary errors messages 2024-03-23 12:28:22 +01:00
Silversthorn
8f8feef6de Solution is disabling update if already done 2024-03-23 12:11:43 +01:00
Silversthorn
c00cb1a61d Splitting migration in 2 files to remove migrator.run from it 2024-03-23 11:30:24 +01:00
Silversthorn
d39f93bfa5 trying loading only the diff migrations at constructor 2024-03-23 11:25:05 +01:00
amcmanu3
912785b280 Remove http references from codebase 2024-03-21 18:10:39 -04:00
Zedifus
9dffc25cc8 Prepare 4.3.2 release base 2024-03-19 00:08:55 +00:00
Zedifus
1a58ccd45a Merge branch 'dev' into remove/http-handler 2024-03-18 23:35:50 +00:00
amcmanu3
0a572fba92 Refactor API keys "super user" to "full access" 2024-03-17 12:50:11 -04:00
amcmanu3
6eea6a15d7 Remove http port from config 2024-03-15 14:49:31 -04:00
amcmanu3
c9a46a1f9b Remove http handler from codebase 2024-03-15 14:47:30 -04:00
amcmanu3
9704016c54 Update schema for str uuid 2024-03-13 17:47:07 -04:00
Zedifus
dbe5581e5a Appease Black 2024-03-10 22:52:23 +00:00
Silversthorn
36de32e5b1 Trying to appease lint one more time 2024-03-10 13:15:17 +00:00
Silversthorn
ae7d0991e4 Fixint lint issue 2024-03-10 12:59:04 +00:00
Silversthorn
1e2ec6b643 Removing the up_one in the constructor to prevent running all migration each time we got a new one. It's handled by migration.up() function. This function was not creating fake migrations. 2024-03-10 12:49:35 +00:00
Silversthorn
986576f243 Adding migration to fix the rework servers uuid issue 2024-03-10 12:43:52 +00:00
amcmanu3
a4da773d25 Remove print statements 2024-03-09 12:49:59 -05:00
amcmanu3
1381cf77ef Fix most translations 2024-03-09 12:49:51 -05:00
amcmanu3
99ccaa925f Add backups to page 2024-03-08 23:23:36 -05:00
amcmanu3
eec9432118 Update migration 
Add backup return function
 2024-03-08 23:22:54 -05:00
amcmanu3
1a8d351fbd Remove print statements 2024-03-08 22:45:08 -05:00
amcmanu3
548a439f14 Initial commit for backup migration. 
Kind of broken :/
 2024-03-08 22:06:33 -05:00
amcmanu3
5c8cca6fda Merge branch 'dev' into refactor/backups 2024-03-08 21:56:03 -05:00
Zedifus
128be0a352 Prepare 4.3.1 release base 2024-03-08 21:32:25 +00:00
amcmanu3
0c517868b4 Merge branch 'dev' into refactor/backups 2024-03-08 16:23:45 -05:00
Iain Powrie
ff9654266c Merge branch 'bugfix/backup-webhook' into 'dev' 
Alert webhook AFTER backup has finished

See merge request crafty-controller/crafty-4!727
 2024-03-08 00:33:57 +00:00
Iain Powrie
d9311455eb Merge branch 'bugfix/fix-def-pass-len-check' into 'dev' 
Fix default password min length check, crashing crafty on fresh install

See merge request crafty-controller/crafty-4!725
 2024-03-07 23:49:26 +00:00
amcmanu3
0cd3acca13 Alert webhook AFTER backup has finished 2024-03-07 11:06:39 -05:00
Silversthorn
bdefa69e32 Merge branch 'refactor/server_ids' of gitlab.com:crafty-controller/crafty-4 into refactor/server_ids 2024-03-03 10:00:25 +01:00
Silversthorn
2c289133f5 Fixing logging errors to info to display properly logs 
Remove return true/false values as the function shouldn't return values
 2024-03-03 10:00:18 +01:00
Zedifus
c20c6b35b8 Re-tag release to 4.3.0 
BREAKING: Contains db changes w/ no avail rollback
 2024-03-03 01:36:53 +00:00
Zedifus
e0bb2eaaa0 Merge branch 'dev' into refactor/server_ids 2024-03-03 01:32:44 +00:00
Zedifus
8d08084ac2 Change target of min pass length check to 'int' of pass length 
Fixes default password min length check, crashing crafty on fresh install
 2024-03-03 01:10:48 +00:00
Zedifus
3d5a370040 Merge branch 'dev' into bugfix/bedrock-download 2024-03-02 23:59:48 +00:00
Zedifus
03a5871c79 Merge branch 'dev' into bugfix/select-root 2024-03-02 23:44:03 +00:00
Zedifus
f98dbb9332 Merge branch 'dev' into bugfix/password-encode 2024-03-02 23:16:40 +00:00
Zedifus
49fce1b5c4 Merge branch 'dev' into bugfix/fix-forge-install 2024-03-02 22:51:44 +00:00
amcmanu3
9f524ff113 Too many www's 2024-03-02 17:00:52 -05:00
amcmanu3
6e28da4195 Fix bedrock url 2024-03-02 16:53:17 -05:00
Analicia Abernathy
440dee7ef5 really fixed polish translation 2024-02-23 09:01:40 -06:00
Analicia Abernathy
1ead20b9b5 updated Ukranian translation 2024-02-23 07:45:23 -06:00
Analicia Abernathy
5fc24f2253 updated thai translation 2024-02-23 07:45:00 -06:00
Analicia Abernathy
5a019c0f27 updated dutch translation 2024-02-23 07:44:41 -06:00
Analicia Abernathy
85a6fca65d updated polish translation 2024-02-23 07:44:10 -06:00
amcmanu3
fdf3221754 Fix bug where unix installs could not have a space in file name 2024-02-22 20:21:54 +00:00
amcmanu3
69dc7dfedb Update Hebrew translation 2024-02-22 13:06:49 -05:00