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,173 Commits 12 Branches 45 Tags 104 MiB
dd56b4be37
Commit Graph

1506 Commits

Author SHA1 Message Date
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
amcmanu3
719896e4b2 Fix api key delete confirm 2022-08-04 15:47:52 -04:00
Andrew
4f4798d44a Add serverjars cache refresh 2022-08-03 15:38:44 -04:00
Andrew
b4213a438b Clean up javascript. Add Translations 2022-08-03 12:26: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
fc1146b86f Merge branch 'dev' into bug/super-user-creation 2022-07-27 19:04:32 +01:00
Zedifus
462fbb021e Add lang pl_PL 
Thanks Terrariadlc²
 2022-07-26 21:15:19 +01:00
Zedifus
f448ae3c7a Update lang es_ES 
Thanks JuliGame
 2022-07-26 21:14:22 +01: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
Andrew
9616ffb0a1 Fix bug where SU status wouldn't stick on creation 
Clean up SU user edit logic
 2022-07-19 11:21:22 -04:00
Zedifus
1947ba4d5a Prepare 4.0.8 release base 2022-07-19 00:47:33 +01:00
Zedifus
69ddcd5dd1 Version Bump 4.0.7 2022-07-19 00:03:22 +01:00
Zedifus
1c2b70ae1d Merge branch 'dev' into bug/server-order-on-creation 2022-07-18 23:52:56 +01:00
Zedifus
2775845da1 Sort lang en_EN 
Also fix java replace grammar
 2022-07-18 23:25:41 +01:00
Zedifus
e25bd9c776 Update lol_EN 😺 
Help me.
 2022-07-18 23:20:48 +01:00
Zedifus
9ddae0adfb Add lang pt_BR 
Thanks Morse
 2022-07-18 23:02:18 +01:00
Zedifus
ca4e4ddf79 Update lang id_ID 
Thanks GamingBrowser
 2022-07-18 23:00:01 +01:00
Zedifus
b7a960f037 Update lang fr_FR 
Thanks Silversthorn
 2022-07-18 22:55:27 +01:00
Zedifus
b3bf19782a Update lang fi_FI 
Thanks Lukas
 2022-07-18 22:51:11 +01:00
Zedifus
0e96b1360c Update lang he_IL 
Thanks thefourcraft
 2022-07-18 22:46:01 +01:00
Zedifus
0e875c4137 Update lang lv_LV 
Thanks Mednis
 2022-07-18 22:38:28 +01:00
Zedifus
471eccc882 Update lang zh_CN 
Thanks ThrRip
 2022-07-18 22:34:31 +01:00
Zedifus
a5dd9a676d Update lang nl_BE 
Thanks TurtleKing
 2022-07-18 22:29:58 +01:00
amcmanu3
383194cf66 Fix servers being out of order on creation page. 2022-07-18 17:12:43 -04: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
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
ec2094d378 Merge branch 'dev' into dev-FixStatusPage-JS_errors 2022-07-18 21:23:35 +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
b6fc8c059d Fixing motd not displaying properly one mobiles 2022-07-16 19:58:58 +02: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
Andrew
1438ce1c36 Add handle. 
Change text color in "on" position
 2022-07-14 14:46:23 -04:00
luukas
875767e16c
Merge branch 'dev' into feature/ajax-schedule-enabled 2022-07-13 15:48:09 +03:00
luukas
c88ef5e9d6
Add a title to the schedule toggle on mobile 2022-07-13 13:42:43 +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
43a93f35b3 Version bump to 4.0.6 2022-07-06 03:04:24 +01: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
11b13fbcd6 Add page alert for wrong password 2022-07-05 20:27:10 -04:00
amcmanu3
a498ef8986 Check if username exists 2022-07-05 19:49:51 -04:00
Zedifus
8ff9f111f6 Merge branch 'master' into dev 2022-07-06 00:45:32 +01:00
amcmanu3
964b3bc4c3 Remove auto complete on edit user 2022-07-05 19:21:06 -04:00
Zedifus
3719d3f24f Merge branch 'dev' into bug/unzip-firefox 2022-07-05 23:47:27 +01: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
Zedifus
795f72a7b4 Merge branch 'dev' into bug/backup-external-restore 2022-07-05 23:15:25 +01:00
amcmanu3
c909d01596 Fix file unzip on Firefox 2022-07-05 17:50:51 -04: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
Matze
b7941484f5 Add string "cloneConfirm" to german translation (related to !388 & !384) 2022-06-24 20:26:34 +02:00
Iain Powrie
8487871dd6 Bump version to 4.0.5 
Forgot this in release
 2022-06-24 04:09:50 +00: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
Zedifus
459ca2d191 Merge branch 'dev' into bug/server-startup 2022-06-24 03:38:05 +01:00
Iain Powrie
bf446e869d Merge branch 'tweak/german-lang-spelling' into 'dev' 
reviewed the german translation, fixed some spelling issues and added some missing strings

See merge request crafty-controller/crafty-4!385
 2022-06-24 02:30:46 +00:00
Zedifus
3b9f72beee Merge branch 'dev' into tweak/clone-confirmation 2022-06-24 03:02:48 +01:00
Andrew
118924eeaa Fix one more stop where this as an issue 2022-06-23 21:57:50 -04:00
Zedifus
e4140748cf Merge branch 'dev' into dev-BetterMobileDisplayStatusPage 2022-06-24 02:56:52 +01: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
Silversthorn
db839252ac Better Display 2022-06-23 18:07:25 +02:00
Silversthorn
ae73165423 smaller Server icon 2022-06-23 18:02:54 +02:00
luukas
f951b49e2f
AJAX schedule enabled status 
This is buggy in its current state
 2022-06-23 01:58:06 +03: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
Matze
d3164c564e corrected a misunderstood translation in string "javaversionDesc" 2022-06-22 23:24:07 +02:00
Matze
6328ef4a74 reviewed the german translation, fixed some spelling issues and added some missing strings 2022-06-22 22:54:57 +02:00
Silversthorn
b3993d1072 First try to add a better display for Status Page 2022-06-22 21:36:05 +02:00
Andrew
b359685392 Add clone server confirmation. 2022-06-22 14:51:10 -04:00
amcmanu3
b1b04e536e Fix cannot delete backup on page 2 2022-06-21 23:18:17 -04: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
7074dd18fb Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-21 17:14:55 -04:00
amcmanu3
fdfec80a39 Fix bug with sec logic 2022-06-21 17:14:35 -04:00
Zedifus
7107713666 Merge branch 'dev' into enhancement/file-editor-large 2022-06-21 22:01:36 +01:00
amcmanu3
950cbce27c Fix java logic issue 2022-06-21 17:00:51 -04:00
amcmanu3
d1af950c46 Update translation 2022-06-21 16:55:42 -04:00
amcmanu3
c2bcc82cc0 Fix save button bug 2022-06-21 16:44:30 -04:00
amcmanu3
6e1eaf595c Allow file-editor increase size 2022-06-21 16:41:06 -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
177d99e002 Add mobile menu to pages without it 2022-06-21 15:59:34 -04:00
amcmanu3
6c360d1ff1 Make backup failed alert 2022-06-21 15:59:08 -04:00
Zedifus
610b94dd59 Merge branch 'dev' into tweak/file-enhancements 2022-06-21 20:41:09 +01:00
Zedifus
70e9290627 Merge branch 'dev' into dev-ImprovingMobileDisplay 2022-06-21 20:23:48 +01:00
Andrew
e727e6662a Merge branch 'tweak/java-version-retention' into 'dev' 
Fix sec bug with server creation roles/Java Version Select improvements

See merge request crafty-controller/crafty-4!376
 2022-06-21 19:17:35 +00:00
Zedifus
a6d9b81775 Add execution cmd -display only- for non supers 2022-06-21 20:11:01 +01:00
Zedifus
28e313ee1d Revert back to 'Do not override' as default 2022-06-21 19:53:23 +01:00
Zedifus
7379545186 Strip empty entry in update-alternatives output 
Catch ValueError on missing end quote in java execution command
 2022-06-21 19:28:53 +01:00
Zedifus
6fe5d16ded Remove java selection from bedrock 2022-06-21 19:05:56 +01:00
Zedifus
176f5a4004 Add java selection POST check 
Protect against tampered post requests to front end

Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-06-21 18:39:20 +01:00
amcmanu3
c4fb6482cc Fix sec bug with server creation roles 
Retain current java version in dropdown.
 2022-06-21 01:18:19 -04:00
Iain Powrie
44e5d27d88 Bump Version 2022-06-21 04:06:08 +00:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
Zedifus
4bfbf9ea47 Merge branch 'dev' into bug/ping-data 2022-06-21 04:09:35 +01:00
Zedifus
69d1aa6c87 Appease linter 2022-06-21 03:31:40 +01:00
amcmanu3
569d21f295 Fix java override for general user 2022-06-20 20:50:34 -04:00
amcmanu3
41532f97ef Change translation from None to javaNoChange 2022-06-20 18:53:19 -04:00
Zedifus
8e646df58c Add Java detect for win, and hook up to front end 2022-06-20 23:44:33 +01:00
amcmanu3
32b3551108 Add java selection code to panel handler 2022-06-20 17:56:26 -04:00
Silversthorn
eb37faac08 Better Mobile Display for Dashboard 2022-06-20 23:41:52 +02:00
amcmanu3
77c9d2613d Appease black 2022-06-20 17:33:36 -04:00
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04:00
Silversthorn
2d3377b497 Fixing Resizing of the table 2022-06-20 22:39:03 +02: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
Silversthorn
ce21ed6171 Fixing Mobile Display on Server Wizard 2022-06-20 19:24:09 +02:00
Zedifus
e820ba058a Add prototype helper (linux only) 2022-06-20 18:05:39 +01:00
Iain Powrie
bc73f6b5f3 Merge branch 'tweak/german-language-spelling' into 'dev' 
Updated spelling of "default" and "defaultPort" in german translation - related to #31

See merge request crafty-controller/crafty-4!370
 2022-06-20 12:45:11 +00:00
amcmanu3
ccfbad91d1 Check if ping result is boolean 2022-06-19 23:07:48 -04:00
Matze
ae4def47a4 Updated spelling of "default" and "defaultPort" in german translation 2022-06-19 19:43:52 +02:00
Andrew
4f5b52bbdf remove sticky from main menu 2022-06-18 18:19:32 -04:00
Zedifus
b9a9007b4f Merge branch 'dev' into tweak/front-end 2022-06-18 23:12:24 +01:00
Zedifus
376a6b3a1e Merge branch 'dev' into critical/API-token-auth-issues 2022-06-18 23:01:39 +01:00
Zedifus
53c622e928 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-06-18 22:52:07 +01:00
Zedifus
c8d88e1b50 Bump version & Update latest link 2022-06-18 22:52:02 +01:00
Andrew
9569e760c9 Fix api key permission logic issue 2022-06-18 17:40:50 -04:00
xithical
464428ea7e Remove erroneous print statements 2022-06-18 16:29:36 -05:00
xithical
8b6d70ba9a Fix bug where non-superusers could not edit their own API keys 2022-06-18 16:27:06 -05: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
Andrew
478dfdc6ef Fix -1 showing on dashboard when offline 2022-06-18 17:18:21 -04:00
Zedifus
9659963c92 Merge branch 'dev' into tweak/java-version 
Correct changelog
 2022-06-18 22:14:57 +01:00
Andrew
31097da971 Fix type issue comparing 2022-06-18 17:06:44 -04:00
Andrew
a8cd982b96 Fix warning message 2022-06-18 17:03:44 -04:00
Andrew
37765dbebc Fix general user can view any api-key page 2022-06-18 17:02:10 -04:00