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
2,601 Commits 12 Branches 45 Tags 104 MiB
78d27bbc13
Commit Graph

730 Commits

Author SHA1 Message Date
Zedifus
532409a08d Merge branch 'dev' into bug/start-nonetype 2022-09-19 22:57:42 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Andrew
f5cdd9f573 Check to "which java" doesn't return none 2022-09-19 11:13:35 -04:00
Andrew
67d465b94c Add debug logging 2022-09-12 15:36:13 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
Andrew
6a6376ea8a appease the linter 2022-09-07 16:52:27 -04:00
Andrew
d45e32013b Fix backup exclusion issue 2022-09-07 16:51:41 -04:00
Andrew
296a5a46de Add comments. Debug logging 2022-09-07 16:01:42 -04:00
amcmanu3
011b66e1df Fix server startup after update 2022-09-04 19:06:07 -04:00
amcmanu3
76a499f5a4 Fix start server after updates 
Fix update notifs
 2022-09-04 17:50:08 -04:00
Zedifus
385ceb9655 Merge branch 'dev' into tweak/password-reset 2022-09-04 21:41:27 +01:00
Zedifus
7f95f7085d Merge branch 'dev' into feature/bedrock-creation 2022-09-04 21:12:47 +01:00
Zedifus
88d3facc80 Merge branch 'dev' into enhancement/bedrock-update-support 2022-09-04 21:03:31 +01:00
amcmanu3
ceab737667 Update requirement checking for password reset 2022-09-04 14:22:25 -04:00
amcmanu3
a6148a7d8a Make password username lowercase 2022-09-04 13:33:22 -04:00
Andrew
dd56b4be37 update updates 2022-09-03 13:42:30 -04:00
Andrew
1f95ad600c Add return 2022-09-03 13:26:51 -04:00
Andrew
5d688522bd Fix backup logic 2022-09-03 13:23:30 -04:00
Andrew
6559112e1b Fix update logic 2022-09-03 13:16:03 -04:00
Andrew
9a7a1cc5d8 Change elif to else 2022-09-03 12:46:35 -04:00
amcmanu3
99979f668b Fix black formatting 2022-09-01 12:51:54 -04:00
amcmanu3
d5ecfe9128 Add spinner to update button 2022-09-01 12:46:37 -04:00
Iain Powrie
3e370c0ae4 Apply 1 suggestion(s) to 1 file(s) 2022-09-01 14:41:42 +00:00
amcmanu3
2becb657ca Put try/except around creation 2022-08-31 20:01:38 -04:00
amcmanu3
bd38fcd6e4 Add try/except around download 2022-08-31 19:59:46 -04:00
amcmanu3
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -04:00
amcmanu3
b445d085c8 Fix no id on import3 servers 2022-08-31 16:11:49 -04:00
Zedifus
96c4fa3bdd Validate bedrock url before download with urllib 
Even though there will be an incredibly small chance of tampering
this is to make bandit happy
"Bandit Test ID B310"
https://stackoverflow.com/a/53040523/18355876
 2022-08-31 20:04:39 +01:00
Zedifus
0c9e10f18a Fix sec overly permissive file permissions 
775 is too permissive for this  file, '-rwxr--r--' is more than enough
B103: Test for setting permissive file permissions
https://bandit.readthedocs.io/en/latest/plugins/b103_set_bad_file_permissions.html
 2022-08-31 19:50:35 +01:00
Zedifus
fdf1a5a41d Add url helper to bedrock update 2022-08-31 19:46:07 +01:00
Zedifus
9350ed07d7 Add bedrock remote url helper 2022-08-31 19:04:04 +01:00
Andrew
600de2be0c Fix executable backups 
Cleanup after ourselves
 2022-08-31 12:18:52 -04:00
Andrew
266e540374 Add bedrock update support 2022-08-31 11:59:33 -04:00
Zedifus
51d123e9eb Merge branch 'dev' into tweak/support-logs-zip-comment 2022-08-27 19:00:38 +01:00
Zedifus
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00
Zedifus
b0b04a6495 Merge branch 'dev' into feature/pretzel-variable-shutdown-timeout 2022-08-27 17:50:50 +01:00
Zedifus
1b4777fbab Merge branch 'dev' into feature/pretzel-users-roles-manager 2022-08-27 17:25:49 +01:00
Zedifus
6f66b77478 Add 'optional' comment to all archival methods 2022-08-27 17:05:13 +01:00
Andrew
27ad78c14d Make admin manager none on fresh install 2022-08-27 11:17:31 -04:00
Andrew
3c14d0f2ee Appease the linter 2022-08-27 10:44:34 -04:00
Zedifus
7d801ac216 Add date and time to log archive 2022-08-26 16:23:08 +01:00
Zedifus
b8b61649b7 Tidy support string creation and include as comment 2022-08-26 15:57:35 +01:00
Zedifus
d3b7ab048d Add comment arg to make_compressed_archive 
This is an optional arg that will add a comment to zip file
 2022-08-26 15:56:31 +01:00
Andrew
037758accb Working live graph 2022-08-22 20:04:40 -04:00
Andrew
9d961215a5 Fix logical bug with shutdown log/console prompts 2022-08-21 13:00:24 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -04:00
Andrew
cafa720bba Fix server quotas. Removed un-used perms columns 2022-08-20 13:00:20 -04:00
amcmanu3
b10523ae0a Add import status to working bedrock 2022-08-17 19:07:56 -04:00
amcmanu3
504ffd57f6 Working zip imports 2022-08-17 18:14:16 -04:00
amcmanu3
b5420c083e Starting zip imports 2022-08-17 17:41:44 -04:00
amcmanu3
eea5e329af Refactor and add import_helpers. 
Working jar imports
 2022-08-17 17:22:03 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -04:00
Zedifus
ab5f587f50 Merge branch 'dev' into tweak/pretzel-backup-list 2022-08-14 18:03:30 +01:00
Zedifus
8c3649d0bb Merge branch 'dev' into bug/pretzel-fresh-install 2022-08-14 17:53:22 +01:00
amcmanu3
f6975912f4 Only list zip files in backups list 2022-08-07 12:19:58 -04:00
amcmanu3
f4660fb36c Make fresh install more efficient 2022-08-07 11:30:00 -04:00
amcmanu3
675912a0b6 Check for number of users in fresh install 2022-08-07 11:04:12 -04:00
Andrew
be7a816f78 Fix reaction tasks not firing 
Fix delay not being accurate
 2022-08-07 01:30:59 -04:00
Zedifus
c5d049830e Merge branch 'dev' into bug/unloaded-servers 2022-08-06 01:10:16 +01:00
amcmanu3
5cbb8f7018 Fix broken unloaded servers 2022-08-05 20:04:34 -04:00
amcmanu3
75c8cdef53 Add names to schedules 2022-08-05 13:52:50 -04:00
amcmanu3
ad318296dc Fix no new_job error 2022-08-04 23:57:22 -04:00
amcmanu3
f69d79b702 Fix indenting on jobs being added 2022-08-04 23:23:56 -04:00
Zedifus
6d08d31d97 Add log lines for update notif 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 03:02:02 +01:00
Zedifus
59174110ab Remove print statement 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 02:38:43 +01:00
Zedifus
ff0faffc08 Add update check to 12hr schedule 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 02:37:21 +01:00
Zedifus
1e6df269ac Merge branch 'dev' into feature/crafty-version-check 2022-08-05 01:53:40 +01:00
Zedifus
a0b599bbd2 Merge branch 'dev' into enhancement/pretzel-next-run 2022-08-05 01:27:18 +01:00
Zedifus
da6a3e3688 Merge branch 'dev' into bug/server-creation-api 2022-08-05 00:33:58 +01:00
Zedifus
6c901e5e3e Merge branch 'dev' into bug/pretzel-backup-restart 2022-08-05 00:20:20 +01:00
Iain Powrie
5353cd854f Change sleep from 60 to 3 2022-08-04 23:18:01 +00:00
amcmanu3
18a0b95d29 Fix lint issues 2022-08-04 18:34:43 -04:00
amcmanu3
6c0cd54e7e Add next run to schedule info 2022-08-04 18:15:59 -04:00
Andrew
d1bdb6198b Fix server creation with serverjars API 
By accident this adds some modded support.

TODO: Cleanup javascript in wizard.
Fix naming on selects in wizard
 2022-08-02 21:08:53 -04:00
Andrew
ad0d47c357 Check for server backup on restart 2022-07-30 14:47:07 -04:00
Andrew
af009a96d9 Fix bug where no java reg path found stack 2022-07-30 13:17:01 -04:00
Zedifus
99ae7e01a1 Tidy import naming 
This will allow for previous variable naming
 2022-07-21 00:39:29 +01:00
Zedifus
ebe5d6815c Add helper for remote version check 2022-07-20 23:53:31 +01:00
Zedifus
31fe66776c Merge branch 'dev' into incident/log-file-issues 2022-07-18 22:03:03 +01:00
Zedifus
4f3fc40e5b Merge branch 'dev' into tweak/support-logs 2022-07-18 21:52:36 +01:00
amcmanu3
f265b070c0 Fix log file path issue for support log/log delete 2022-07-18 14:55:12 -04:00
Andrew
31ee894603 Add platform & crafty version info to support logs 2022-07-17 16:37:10 -04:00
Andrew
2ddc1e7c96 Remove server.props requirement 2022-07-16 19:05:00 -04:00
luukas
875767e16c
Merge branch 'dev' into feature/ajax-schedule-enabled 2022-07-13 15:48:09 +03:00
amcmanu3
f1d11bfb0d Remove tempdir from packaging logs. 2022-07-05 21:35:43 -04:00
amcmanu3
ea24215e21 Remove default backup dir location 2022-07-05 14:55:17 -04:00
amcmanu3
70dfc28574 Fix unable to restore backup on external meduim 2022-07-05 14:45:13 -04:00
Zedifus
48cd5916ed Revert internal comment 
Must've changed this accidentally
 2022-06-24 03:56:31 +01:00
Zedifus
9a6625ccaa Merge branch 'dev' into bugfix/handle-none-java-return 2022-06-24 03:45:36 +01:00
Andrew
118924eeaa Fix one more stop where this as an issue 2022-06-23 21:57:50 -04:00
Zedifus
cf25249a9d Fix path issue with update-alternatives 
Sometimes it can be in /sbin,
if it is we return `None` which broke upstream frontend.
Returning an empty list to resolve this.
 2022-06-24 02:28:05 +01:00
Andrew
b4749f8caf Fix 2 bugs: Stats startup after backup 
Server java version path bug
 2022-06-23 19:34:27 -04:00
luukas
147f178c87
Add a basic API for modifying schedules. 
THIS IS VERY UNTESTED AND WILL BE EXPANDED TO FULL CRUD FOR SCHEDULES
 2022-06-23 01:57:29 +03:00
Zedifus
610b94dd59 Merge branch 'dev' into tweak/file-enhancements 2022-06-21 20:41:09 +01:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
Zedifus
8e646df58c Add Java detect for win, and hook up to front end 2022-06-20 23:44:33 +01:00
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04:00
Andrew
7d286e60e0 Backup/Config.json rework for API key hardening 
See merge request crafty-controller/crafty-4!369
 2022-06-20 19:26:21 +00:00
Zedifus
e820ba058a Add prototype helper (linux only) 2022-06-20 18:05:39 +01:00
Iain Powrie
1de2ea1b5c Merge branch 'bug/-1-stats-showing-on-dashboard' into 'dev' 
Fix -1 showing on dashboard when offline

See merge request crafty-controller/crafty-4!365
 2022-06-18 21:27:05 +00:00