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
