Commit Graph

1027 Commits

Author SHA1 Message Date
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
Zedifus
28b321f100 Fix import order
I have needs
2022-07-18 21:43:13 +01:00
Zedifus
4a2e5d1558 Merge branch 'dev' into tweak/remove_prop_requirement 2022-07-18 21:42:14 +01:00
Zedifus
374454f11c Merge branch 'dev' into bug/fix-issue-#106 2022-07-18 21:17:41 +01:00
Zedifus
b7b4c7ac11 Merge branch 'dev' into bug/fix-issue-#106 2022-07-18 21:17:16 +01:00
Zedifus
523e51a0ae Merge branch 'dev' into Fix-Pylint-no-self-use 2022-07-18 21:09:51 +01:00
Zedifus
44f3b903d4 Merge branch 'dev' into Fix-Pylint-no-self-use 2022-07-18 21:09:26 +01:00
Zedifus
11dd41501e Merge branch 'dev' into feature/pretzel-status-page-show 2022-07-18 21:01:32 +01:00
Zedifus
a9e0970a1c Merge branch 'dev' into hotfix/host-stats-error 2022-07-18 20:48:32 +01:00
Silversthorn
98fa8e8940 Giving json to auth_data 2022-07-18 20:57:04 +02:00
amcmanu3
f265b070c0 Fix log file path issue for support log/log delete 2022-07-18 14:55:12 -04:00
Silversthorn
bc16e0df2b Revert "Revert changes on base_handler, fixing things in the api methods"
This reverts commit f863357633.
2022-07-18 20:53:49 +02:00
Andrew
31ee894603 Add platform & crafty version info to support logs 2022-07-17 16:37:10 -04:00
Silversthorn
f863357633 Revert changes on base_handler, fixing things in the api methods 2022-07-17 12:17:45 +02:00
Silversthorn
b6d6b9c0a4 Remove unused elements and move get_players to py file instead of html file 2022-07-17 10:57:25 +02:00
Andrew
d8fadc6abd fix bug broken server creation 2022-07-16 19:19:34 -04:00
Andrew
2ddc1e7c96 Remove server.props requirement 2022-07-16 19:05:00 -04:00
Andrew
ea9b14e917 Add default value to show_status 2022-07-16 18:50:05 -04:00
Silversthorn
8e58d5f8ac Trying Fixing issue #106 2022-07-16 10:49:48 +02:00
Silversthorn
ee2c2f8bb1 Better use of functions and objects 2022-07-16 10:06:49 +02:00
Silversthorn
9f30ca3931 Fix pylint no-self-use 2022-07-16 09:52:30 +02:00
Andrew
5b599d0058 Appease the linter 2022-07-15 18:47:41 -04:00
Andrew
11260a34d6 Toggle Visible servers on status page 2022-07-14 18:26:42 -04:00
luukas
875767e16c
Merge branch 'dev' into feature/ajax-schedule-enabled 2022-07-13 15:48:09 +03:00
luukas
4f7e1bfa24
Check for None when getting the CPU frequency data
Default to -1 when an error occurs
2022-07-06 19:00:17 +03:00
Zedifus
102a470348 Merge branch 'dev' into bug/edit-user-issues 2022-07-06 02:50:06 +01:00
amcmanu3
f1d11bfb0d Remove tempdir from packaging logs. 2022-07-05 21:35:43 -04:00
amcmanu3
a498ef8986 Check if username exists 2022-07-05 19:49:51 -04:00
Zedifus
6406cdf66a Merge branch 'dev' into bug/server-creation-no-servers 2022-07-05 23:36:17 +01:00
Zedifus
dc73768a83 Merge branch 'dev' into bug/bool-obj-no-desc 2022-07-05 23:26:01 +01:00
amcmanu3
69f915616b Fix unhandled serverjars api error on server creation 2022-07-05 16:15:49 -04:00
amcmanu3
6f80b3e5c1 Fix bug with bool obj on server start 2022-07-05 15:24:19 -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
amcmanu3
205bbf356f Fix traceback on server schedule creation page 2022-06-21 18:40:16 -04:00
amcmanu3
d8d80bbb42 Remove bad check for backup path 2022-06-21 17:41:52 -04:00
amcmanu3
b725054dcd Appease the linter 2022-06-21 17:36:50 -04:00
amcmanu3
97900cd283 Fix issue on path transversal backups linux 2022-06-21 17:35:34 -04:00
amcmanu3
fdfec80a39 Fix bug with sec logic 2022-06-21 17:14:35 -04:00
amcmanu3
950cbce27c Fix java logic issue 2022-06-21 17:00:51 -04:00
Zedifus
ffba1fb438 Merge branch 'dev' into enhancement/backup-failure-alert 2022-06-21 21:34:51 +01:00
amcmanu3
d3b1095867 Disable backups directory from changing bad paths 2022-06-21 16:14:29 -04:00
amcmanu3
6c360d1ff1 Make backup failed alert 2022-06-21 15:59:08 -04:00