amcmanu3
75c8cdef53
Add names to schedules
2022-08-05 13:52:50 -04:00
amcmanu3
e0377d4b2f
Add translations to schedules page
2022-08-05 11:56:41 -04:00
amcmanu3
ad318296dc
Fix no new_job error
2022-08-04 23:57:22 -04:00
amcmanu3
64122f3674
Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev
2022-08-04 23:33:07 -04:00
amcmanu3
f69d79b702
Fix indenting on jobs being added
2022-08-04 23:23:56 -04:00
Zedifus
e15cc93d04
Prepare 4.0.9 release base
2022-08-05 04:17:30 +01:00
Zedifus
4f1026c42f
Change href to open new tab
2022-08-05 03:09:57 +01: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
390d995f53
Add flashing frontend notification
...
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
2022-08-05 02:56:26 +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
e306bc449c
Merge branch 'dev' into bug/pretzel-api-key-delete
2022-08-05 01:12:52 +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
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
Andrew
72f97e4ff0
Fix issue where any user could add/remove api keys
2022-06-18 16:55:39 -04:00
Andrew
fd0da1ef20
Fix any user can recieve all api keys
2022-06-18 16:20:57 -04:00
Andrew
e9bf2af83b
Add wiki iframe as requested.
2022-06-18 15:57:37 -04:00
Andrew
4a35e09fbd
Remove commander naming scheme from public
2022-06-18 15:53:47 -04:00
Andrew
9bbf316494
Check for Oracle Java before changing start string
2022-06-17 19:11:03 -04:00
Andrew
a2ad23548c
Check for Oracle Java before changing start string
2022-06-17 19:08:57 -04:00
luukas
b4770bc9a0
Use indent=4 instead of indent=True
...
`indent=True` is equivalent to `indent=1`
You can test this by executing `'foo' * True`, `'foo' * 1` and
`'foo' * 4` in a Python REPL.
2022-06-18 01:30:50 +03:00
luukas
5bfd564ef4
Use with-blocks when opening files
2022-06-18 01:27:55 +03:00
Zedifus
8480172bdc
Merge branch 'dev' into tweak/host-stats-exceptions
2022-06-17 15:42:37 +01:00
luukas
abc34ef2b6
Add better error logging for statistic collection
2022-06-17 16:19:37 +03:00
Andrew
e435292a52
Fix blank server_detail page for general users
2022-06-17 00:58:18 -04:00
Zedifus
e47cad13f9
Bump version
2022-06-16 18:45:07 +01:00
Iain Powrie
43906d531e
Merge branch 'bug/support_logs' into 'dev'
...
Bug/support logs
See merge request crafty-controller/crafty-4!354
2022-06-16 16:56:56 +00:00
amcmanu3
e3d289e6fd
Fix support logs download issues
2022-06-16 12:11:21 -04:00
amcmanu3
35518e960f
Fix username capital issues once and for all
2022-06-16 09:52:21 -04:00
Andrew
fff186e547
Merge branch 'bugfix/reconnecting-websocket' into 'dev'
...
Make the WebSocket automatically reconnect.
See merge request crafty-controller/crafty-4!345
2022-06-16 13:39:25 +00:00
luukas
581b6734d3
Remove unused server_uuid variables to fix Pylint
2022-06-16 15:31:11 +03:00
Iain Powrie
828af04e1f
Merge branch 'master' into 'dev'
...
Merging Master into Dev
See merge request crafty-controller/crafty-4!349
2022-06-16 00:10:03 +00:00
luukas
f39e75616c
Use an exponential backoff algorhithm.
...
https://stackoverflow.com/a/37038217/15388424
2022-06-16 02:37:53 +03:00
Iain Powrie
c22d07d832
Merge branch 'bugfix/getelementbyid-first-dashboard' into 'dev'
...
Fix an error when there are no servers
See merge request crafty-controller/crafty-4!346
2022-06-15 23:30:12 +00:00
Iain Powrie
2ed9e5663d
Merge branch 'feature/filemanager-improvements' into 'dev'
...
Fix Ace editor saving keybinds and ex-commands
See merge request crafty-controller/crafty-4!341
2022-06-15 23:24:06 +00:00
luukas
e009ff9819
Use relative paths for the jarfile and logs
2022-06-16 02:10:26 +03:00
luukas
d9c03caa9b
Fix an error when there are no servers
2022-06-16 00:19:48 +03:00
luukas
cd8ebfdcbe
Make the WebSocket automatically reconnect.
...
The WebSocket reconnects 5 seconds after the connection's closure.
If the connection reconnection fails it will try to reconnect after
another 5 seconds.
2022-06-16 00:10:48 +03:00
amcmanu3
8611c7e5e4
Fix win reg import on not windows.
...
Replace WindowsError with OSError
2022-06-15 00:42:29 -04:00
Zedifus
5d4ba079bb
Bump version patch/sub
2022-06-15 04:53:49 +01:00
Zedifus
00466719ea
Exempt R1717 consideration
2022-06-15 04:52:19 +01:00
Zedifus
0f82ba3084
Line exempt E0602
...
It's not an undefined var it's the Base class for I/O related errors.
False positive.
2022-06-15 04:44:19 +01:00
Zedifus
5f8dbd4dc7
Fix C0113 & Exempting R0201 Line as self required.
2022-06-15 04:27:27 +01:00
Zedifus
9ed5cc3c5a
Fix pylint R1724
2022-06-15 04:15:46 +01:00
Zedifus
1cfc926b16
Fix line length CQ
2022-06-15 04:11:40 +01:00
amcmanu3
cda2120579
Fix window java issue causing no stats
2022-06-14 22:33:02 -04:00
amcmanu3
17ef71046c
Merge branch 'master' into dev
2022-06-14 15:49:32 -04:00
amcmanu3
0f43dd627a
Fix uppercase usernames imported from 3.
...
Uppercase usernames will break logic on three.
They need to be lowered before they are imported.
2022-06-14 15:43:29 -04:00
amcmanu3
50438c485b
Fix support log delete order.
...
Fix username uppercase.
2022-06-14 15:42:13 -04:00
luukas
e73dd682c8
Fix no-else-* QA warnings
2022-06-14 15:40:57 +03:00
Zedifus
32427c3684
Merge branch 'master' into dev
2022-06-14 12:05:58 +01:00
luukas
c9744554d4
Improve the code for save status
2022-06-14 03:07:26 +03:00
luukas
a67f069709
Fix Ace editor saving keybinds and ex-commands
...
* Remove our manual keydown handler and use an Ace builtin function
* Define Vim's :write aka :w ex-command
2022-06-14 02:45:17 +03:00
luukas
392cf3d4e7
Make the file editor stick to the top of the page
2022-06-14 01:35:43 +03:00
Analicia A
2b0900d95b
Correct translation - Dutch - added a space between two words
2022-06-13 21:40:45 +00:00
Zedifus
f1340f4f45
Appease black
2022-06-13 22:35:33 +01:00
luukas
73a6d1cd78
Fix the error message while deleting session.log
2022-06-14 00:30:28 +03:00
Iain Powrie
75d3baccbd
Remove deprecated pylint rules
...
https://github.com/PyCQA/pylint/pull/3571
https://github.com/PyCQA/pylint/pull/3577
2022-06-13 21:30:24 +00:00
luukas
0d664cfae5
Remove a useless session.log warning
...
This fixes an error being sent when session.log doesn't exist.
This usually occurs when the logs directory is deleted.
2022-06-14 00:16:49 +03:00
amcmanu3
55f7ab1d35
Fix traceback on crash detection startup
2022-06-13 16:13:18 -04:00
amcmanu3
e644380b64
Allow users with capital letter to reset password
2022-06-13 16:06:36 -04:00
Andrew
7e7557f530
Merge branch 'bug/import-user-error' into 'bug/tz-fallback'
...
Bug/import user error
See merge request crafty-controller/crafty-4!332
2022-06-13 19:21:07 +00:00
amcmanu3
074e9f33a8
Fix import3
2022-06-13 15:14:41 -04:00
amcmanu3
8f5cdbb0c5
Fix crafty3 -4 import users
2022-06-13 15:07:12 -04:00
amcmanu3
4019f0365e
Fix user import issues
2022-06-13 14:45:01 -04:00
Zedifus
6962662ce5
Fix black
2022-06-13 19:41:25 +01:00
amcmanu3
033bf05279
Appease black
2022-06-13 14:31:53 -04:00
amcmanu3
b3f167ab62
Add fallback for tz not being found
2022-06-13 14:29:25 -04:00
amcmanu3
0ffe6801d8
Fix user email bug on import3
2022-06-13 12:47:42 -04:00
amcmanu3
1655818afc
Define the prompt after the init is complete
2022-06-12 20:09:46 -04:00
Andrew
25a1c67c26
Fix black formatting
2022-06-12 17:17:58 -04:00
Andrew
474597d16c
Add survery to admin first log
2022-06-12 17:03:42 -04:00
Andrew
9ba7dac723
Merge remote-tracking branch 'origin/master' into dev
2022-06-12 13:24:43 -04:00
Silversthorn
e0d0965931
Fixing Pylint for good
2022-06-12 18:39:05 +02:00
Silversthorn
a9cdd33c77
Fixing Pylint Errors
2022-06-12 18:30:39 +02:00
Silversthorn
007218111f
Should work now :)
2022-06-12 17:13:39 +02:00
Andrew
52d53aafe4
Delay wss error message for slower systems
2022-06-12 10:47:12 -04:00
Silversthorn
430f9f9fcf
It might do the refresh after a server update
2022-06-12 08:37:24 +02:00
Andrew
51697039cd
Merge branch 'bug/server-stats-refresh' into 'dev'
...
Make call to controller and not stale object
See merge request crafty-controller/crafty-4!315
2022-06-11 21:51:35 +00:00
amcmanu3
ddcd3dc5c3
Appease the linter
2022-06-11 17:46:36 -04:00
amcmanu3
e99cacfc53
Make call to controller and not stale object
2022-06-11 17:34:31 -04:00
amcmanu3
d5be8d1531
Update contribution page
2022-06-11 16:36:07 -04:00
Andrew
c924663ab3
Fix stack on server stop
2022-06-10 19:04:34 -04:00
Andrew
41cf247c5a
Appease black
2022-06-10 18:31:48 -04:00
Andrew
4a15a2331e
Fix error when stats job does not exist on kill
2022-06-10 18:29:47 -04:00
luukas
f343db1a30
Fix inconsistency on the jsonschema API endpoint
2022-06-10 00:10:54 +03:00
Silversthorn
538b78db47
Fixing Translations issues loaded in with js
2022-06-09 00:11:21 +02:00
Silversthorn
f23bdd14a2
Fixing an issue with single quotes and translations
2022-06-08 23:56:22 +02:00
Silversthorn
51b1097a96
Fixing Stack when redirected from Unauthorized page
2022-06-08 21:42:25 +02:00
amcmanu3
d7606f4cc6
Fix user permissions issue
2022-06-06 17:04:45 -04:00
Andrew
8e23ba5bdb
Fix backup error if excluded dir doesn't exists.
2022-06-06 00:05:16 -04:00
Iain Powrie
0921616285
Merge branch 'bug/fix-3-import' into 'dev'
...
Fix version3 imports
See merge request crafty-controller/crafty-4!299
2022-06-05 20:10:59 +00:00
amcmanu3
e0fb4c6442
Fix version3 imports
2022-06-05 16:02:52 -04:00
Andrew
0df30d2f05
Fix typo in error message
2022-06-04 14:24:12 -04:00
Silversthorn
757959e89d
Fixing the last one
2022-06-04 02:20:45 +02:00
Silversthorn
61806b6050
Correction of unused import
2022-06-04 02:13:11 +02:00
Silversthorn
2e5299e521
Improving MOTD
2022-06-04 02:13:00 +02:00
Iain Powrie
ebf00a1900
Merge branch 'secops/pre-beta-security-fixes' into 'dev'
...
Pass 2 sec advisory fixes
See merge request crafty-controller/crafty-4!294
2022-06-03 20:10:17 +00:00
amcmanu3
dd54a5f2c9
Mark update as complete when it fails
2022-06-03 16:04:12 -04:00
amcmanu3
aa44650a05
Fix windows file pathing
2022-06-03 15:53:29 -04:00
amcmanu3
ace79cad2f
Remove useless print statements
2022-06-03 15:53:20 -04:00
amcmanu3
0200f1caec
Remove useless console logs
2022-06-03 15:53:12 -04:00
amcmanu3
6eb3e541bf
Fix player counts on dashboard
2022-06-03 15:21:57 -04:00
Zedifus
4cdd2bf776
Remove unused code
2022-06-03 19:50:58 +01:00
Zedifus
62bdf22618
Change for to forEach loop
...
> Fixes ESLint rule ID security/detect-object-injection
2022-06-03 19:49:51 +01:00
Zedifus
04ffe0eb65
Remove unused function
2022-06-03 18:41:05 +01:00
Zedifus
df86897108
Change for to forEach loop
...
> Fixes ESLint rule ID security/detect-object-injection
2022-06-03 18:33:21 +01:00
Iain Powrie
3200c72571
Merge branch 'secops/pre-beta-security-fixes' into 'dev'
...
pre beta release security fixes
See merge request crafty-controller/crafty-4!289
2022-06-03 15:36:28 +00:00
Zedifus
eaecb2f09b
Replace standard pseudo-random generators
...
Resolves: `Bandit ID B311`
[Standard pseudo-random generators are not suitable for security/cryptographic purposes.]
2022-06-03 14:05:26 +01:00
Iain Powrie
18ab2cd76d
Drop to less permissive mask for bedrock imports
...
`Owner` of the file (which should be us) can r-w-e
`Group` of the file can r-w
`World` can do nothing.
Sticky bit is still set.
2022-06-03 11:42:20 +00:00
Andrew
293ae5dbd1
Remove link to non-used jquery item
2022-06-02 13:41:16 -04:00
Andrew
e561e112d4
Refactor jquery-ui to vendors
2022-06-02 13:27:38 -04:00
Andrew
5e48b250fa
Fix api v1 bug with list servers
2022-06-02 09:40:43 -04:00
Andrew
98b364cd3e
Fix support logs validation
2022-06-02 08:57:36 -04:00
Andrew
8ff2d8437d
Fix permissions on server clone
2022-06-02 08:51:12 -04:00
Andrew
6b85620fec
Fix schedule tasks not being killed on restore
2022-06-02 08:23:42 -04:00
Andrew
5970895268
Fix resetting api_key
2022-06-02 08:23:28 -04:00
Andrew
fae4ff12ea
Fix general user support logs
2022-06-02 08:23:18 -04:00
Andrew
50872e2bb5
Remove active tasks when server is deleted
2022-06-02 07:34:34 -04:00
Andrew
b793016c03
Redefine how servers are served to panel_handler
2022-06-02 07:34:17 -04:00
Andrew
f2dec0c52b
Reset secret key on fresh start when db dumped
2022-06-02 07:33:43 -04:00
Andrew
273e2f465d
Only show authorized servers on role creation
2022-06-01 19:26:57 -04:00
Andrew
ec730a1694
Merge branch 'bug/pretzel-support-log-temp-cleanup' into 'dev'
...
Cleanup temp dirs on support log creation
See merge request crafty-controller/crafty-4!286
2022-06-01 22:33:52 +00:00
Andrew
ea2dd5b78f
Add self to parameters for non-static function
2022-06-01 18:31:31 -04:00
Andrew
8e0ccd4f94
Fix indexing for updates made on branch
2022-06-01 18:25:27 -04:00
Andrew
5d3badef2c
Cleanup temp dirs on support log creation
2022-06-01 17:54:58 -04:00
Silversthorn
9e4c8e99b1
Merge branch 'dev' into dev-StatsDBImprovement
2022-06-01 23:52:49 +02:00
Iain Powrie
7f4bd6eac7
Merge branch 'experimental/lukas-codebase-improvements' into 'dev'
...
Fix Finnish translations
See merge request crafty-controller/crafty-4!285
2022-06-01 20:49:16 +00:00
luukas
6474663a64
Fix Finnish translations
2022-06-01 23:25:53 +03:00
Andrew
9864cecff1
Merge branch 'experimental/lukas-codebase-improvements' into 'dev'
...
Lukas's codebase improvements
See merge request crafty-controller/crafty-4!277
2022-06-01 20:22:47 +00:00
luukas
89b6e239bc
Merge branch 'dev' into experimental/lukas-codebase-improvements
2022-06-01 22:35:11 +03:00
Andrew
28ffbe4627
Remove unnecessary pass
2022-06-01 15:20:16 -04:00
Andrew
3946a926bf
Remove print statement
2022-06-01 15:17:13 -04:00
Andrew
fdc88451b9
Add exception for permissions in helpers check
2022-06-01 15:11:37 -04:00
Zedifus
de96844276
Remove useless return from a_backup_server
...
(Pylint R1711)
2022-06-01 18:34:04 +01:00
Zedifus
256c6567fd
Remove temporary directory on backup completion
...
When running backups, the temporary directory wasn't being properly removed.
Added logic to remove the temporary directory upon backup completion,
cleaned up the try/except a bit.
2022-06-01 18:28:24 +01:00
luukas
45a1b835fb
Fix server error checking in API stdin endpoint
2022-06-01 14:17:33 +03:00
DarthLeo1000YT
d486fdd4c8
add jquery back to the main base.html template.
2022-05-30 20:57:19 -04:00
luukas
e0b0e52bd5
Add stdin route for the API
2022-05-31 00:11:17 +03:00
Silversthorn
ec2d967419
Fixing Commands to server
2022-05-30 22:49:42 +02:00
Silversthorn
150e8e5794
Renaming Server in shared to ServerInstance
2022-05-30 22:40:34 +02:00
Silversthorn
f89f94c44a
Merge branch 'dev' into dev-StatsDBImprovement
2022-05-30 22:16:42 +02:00
Silversthorn
f597a26e5b
Trying to fix stuff
2022-05-30 22:05:36 +02:00
Silversthorn
b0ea943992
Fixing lasts pylint warning
2022-05-30 19:32:11 +02:00
Silversthorn
8f5c688b72
Fixing Pylint issues
2022-05-30 19:28:39 +02:00
luukas
290c398198
Add command queue stdin commands back
2022-05-30 18:23:37 +03:00
Andrew
26b3b8a869
Merge branch 'cleanup/remove-unused-dependencies' into 'dev'
...
Remove unused dependencies
See merge request crafty-controller/crafty-4!279
2022-05-30 13:18:42 +00:00
Silversthorn
37bda32164
Fixing moved functions calls
2022-05-30 07:36:25 +02:00
Silversthorn
2f2c9d8203
Merge branch 'dev' into dev-StatsDBImprovement
2022-05-29 10:30:18 +02:00
Zedifus
ca793807cb
Add kofi widget
...
Not sure how to remove the background behind the widget :(
2022-05-29 07:09:39 +01:00
luukas
7885b2c8f7
Fix null writer
2022-05-28 21:11:09 +03:00
luukas
b0e356f999
Fix host stats error messages
2022-05-28 19:43:37 +03:00
luukas
0df5fedf2b
Add try-excepts for host stats
2022-05-28 19:32:54 +03:00
luukas
d1beb2f125
Redirect stderr to null during psutil's import.
...
On some systems /proc might be unavailable and psutil would freak out
printing several exceptions to stderr but strangely not raising the
exceptions for upper scope to handle
2022-05-28 19:00:25 +03:00
luukas
f2890fa31d
Remove unused dependencies
2022-05-28 18:31:11 +03:00
Zedifus
ccd09e9753
Fix missing escaped chars in submitted translation
2022-05-28 15:17:41 +01:00
Iain Powrie
cfe5f01d78
Update he_IL.json 3.5
...
Fix For RTL & Typo Mistakes and orientation & definition of a few words
Thanks thefourcraft
2022-05-28 14:10:55 +00:00
Silversthorn
3b4253de9b
Fixing get_authorized_server
2022-05-26 23:19:59 +02:00
Silversthorn
6fae395185
Fixing issues for latest stats
2022-05-26 15:43:24 +02:00
Silversthorn
99b28efd33
Merge branch 'dev' into dev-StatsDBImprovement
2022-05-26 15:39:52 +02:00
Silversthorn
be1930c7c7
fixing server shutdown gracefull exit
2022-05-26 15:28:54 +02:00
Silversthorn
2b484d5a07
fixing download jar
2022-05-26 15:20:21 +02:00
Silversthorn
056856cf98
Fixing Helpers issue
2022-05-26 15:02:47 +02:00
Silversthorn
8423cc24c1
I'm breaking/fixing stuff
2022-05-26 14:50:20 +02:00
Andrew
39915ef53c
Fix critical bad stats push
2022-05-26 06:49:51 -04:00
luukas
47fc398f26
Fix CORS preflight
2022-05-26 00:31:58 +03:00
Andrew
b0b9936df7
Merge branch 'bugfix/stats-db-select' into 'dev'
...
Get rid of the stats database proxy
See merge request crafty-controller/crafty-4!276
2022-05-25 18:29:23 +00:00
Andrew
b293164e12
Add crash detection to realtime stats
2022-05-25 14:26:13 -04:00
luukas
8ce7a96071
Use a better ANSI escape regex in the API logs
2022-05-25 18:41:41 +03:00
luukas
2e51fa9629
Remove newline characters from API file logs
2022-05-25 18:41:16 +03:00
luukas
3956d9c699
Remove stdin sending from command_watcher
...
Reasons:
* It's unused in our program
* It can be a start to security vulnerabilities.
I've seen many routes add commands to `Commands` without validation.
2022-05-25 17:44:09 +03:00
Silversthorn
5a1353373a
trying something new
2022-05-25 15:54:35 +02:00
luukas
ca450f21ed
Document set_passwd and threads prompt commands
...
Help messages:
set_passwd: Set a user's password. Example: set_passwd admin
threads: Get all of the Python threads used by Crafty
2022-05-25 16:25:49 +03:00
luukas
8e13b4e11d
Simplify helpers setting methods
2022-05-25 16:21:34 +03:00
luukas
0eac0721ea
Remove unused DatabaseShortcuts imports
2022-05-25 16:17:01 +03:00
luukas
4e84eee5a5
Rename server stats variables to server_stats
2022-05-25 16:15:51 +03:00
luukas
83018c6860
Calculate the min stats date with timedelta
...
This is more correct than just using days.
I've also tested this working in a completely separate Peewee project.
2022-05-25 16:14:42 +03:00
luukas
a937a94ac8
Use a better variable name for stat disappear date
...
* Rename occurences of `last_week` with `minimum_to_exist`
2022-05-25 14:49:17 +03:00
luukas
4b707aa9d1
Don't use get_latest_server_stats
...
Use get_server_stats_by_id instead of get_latest_server_stats
The reasoning behind this is that all usages of get_latest_server_stats
had `DatabaseShortcuts.return_rows(latest)[0]`, which
get_server_stats_by_id already did
2022-05-25 14:43:05 +03:00
luukas
166272e12c
Replace .count() != 0 with .exists()
2022-05-25 14:24:34 +03:00
luukas
fae4aeb492
Fix CQ C0412
2022-05-25 14:16:14 +03:00
luukas
cf2ff2f2d5
Try to get rid of database_stats_proxy
2022-05-25 14:00:22 +03:00
Andrew
7ca7232829
Add question to warning message
2022-05-24 19:11:14 -04:00
Iain Powrie
54c81d6dd4
Merge branch 'bugfix/api-v2-bugfixes' into 'dev'
...
API v2 bug fixes
See merge request crafty-controller/crafty-4!267
2022-05-24 22:42:41 +00:00
luukas
2ac9118152
Merge remote's bugfix/api-v2-bugfixes to local
2022-05-25 00:58:32 +03:00
luukas
cbc73b7e92
Fix routing for the user permissions handler
2022-05-25 00:58:10 +03:00
luukas
57ef5e27dd
Add route for viewing user Crafty permissions
...
The route includes the permission mask, counters and limits
2022-05-25 00:55:49 +03:00
luukas
6dadce2c9a
Enable changing more of yourself with superuser
...
Enable modifying your own superuser status, permissions and roles if you
have superuser status
2022-05-25 00:43:49 +03:00
luukas
b0d342e949
Check if something is in a dict with a simpler way
...
* Replace `data.get("key", None) is not None` with `"key" in data`
2022-05-25 00:39:16 +03:00
luukas
2aa2d14f5e
Improve the invalidate tokens API handler
...
* Remove the TODO
* Replace the Console.info with logger.debug
2022-05-25 00:35:11 +03:00
luukas
9a9d101015
Add pasword hashing to API user modification
2022-05-25 00:32:31 +03:00
luukas
54ff888002
Fix user modification via the API
2022-05-25 00:29:31 +03:00
Iain Powrie
db13b11f18
Merge branch 'tweak/pretzel-wss-error' into 'dev'
...
Add link to documentation to WSS error
See merge request crafty-controller/crafty-4!272
2022-05-24 18:14:06 +00:00
Zedifus
f69cf39c1d
Add Hebrew lang file
...
Up to date to 3.5, altered credits trans keys amended,
Patreon will need amended to Patreon / Ko-fi like en lang,
this will be done on final beta translation update.
Thanks thefourcraft
2022-05-24 18:58:37 +01:00
Andrew
5104c34513
Add link to documentation to WSS error
2022-05-23 21:23:29 -04:00
Zedifus
d0596af4c9
Add exemption orjson no-member falsepositive
2022-05-23 22:54:06 +01:00
Zedifus
2a4295d9b3
Add subscription source parsing & format html
2022-05-23 22:21:32 +01:00
