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
Iain Powrie
a4c324669d
Merge branch 'fix/pylint-relative-paths' into 'dev'
...
Remove unused server_uuid variables to fix Pylint
See merge request crafty-controller/crafty-4!350
2022-06-16 13:19:26 +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
Craft Breadth
fb73f0a200
Merge branch 'feature/relative-paths-logs-jar' into 'master'
...
Use relative paths for the jarfile and logs
See merge request crafty-controller/crafty-4!347
2022-06-16 00:00:51 +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
Iain Powrie
025db1de77
Merge branch 'dev' into 'master'
...
Fix winreg import pass on non-NT systems
See merge request crafty-controller/crafty-4!344
2022-06-15 04:48:38 +00:00
amcmanu3
8611c7e5e4
Fix win reg import on not windows.
...
Replace WindowsError with OSError
2022-06-15 00:42:29 -04:00
Iain Powrie
a8b9e92c18
Merge branch 'dev' into 'master'
...
4.0.1 Patches,
See merge request crafty-controller/crafty-4!343
2022-06-15 04:19:30 +00:00
Iain Powrie
1d9053a549
Bump README badge version
2022-06-15 04:02:53 +00: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
Iain Powrie
2ab06a9dec
Merge branch 'newCoolUnraidXmlUpdate' into 'dev'
...
Update unRAID xml readability.
See merge request crafty-controller/crafty-4!337
2022-06-14 13:11:53 +00:00
hofq
d16e83686e
Update unRAID xml readability.
2022-06-14 13:11:53 +00:00
Iain Powrie
76af9b654d
Merge branch 'tweak/remove-no-else-excemptions-pylint' into 'dev'
...
Remove no-else pylint excemptions
See merge request crafty-controller/crafty-4!342
2022-06-14 13:08:39 +00:00
luukas
e73dd682c8
Fix no-else-* QA warnings
2022-06-14 15:40:57 +03:00
Zedifus
034af1b10c
Remove no-else pylint excemptions
2022-06-14 12:08:34 +01: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
Iain Powrie
249e540991
Merge branch 'dutch-translator-updates' into 'dev'
...
Update dutch translation for spacing issue
See merge request crafty-controller/crafty-4!340
2022-06-13 21:47:57 +00:00
Iain Powrie
10474ffe9d
Merge branch 'tweak/remove-pylint-deprecations' into 'master'
...
Remove deprecated pylint rules
See merge request crafty-controller/crafty-4!339
2022-06-13 21:41:39 +00:00
Analicia A
2b0900d95b
Correct translation - Dutch - added a space between two words
2022-06-13 21:40:45 +00:00
Iain Powrie
ecb7dd6177
Merge branch 'bugfix/useless-sessionlog-warning' into 'dev'
...
Remove a useless session.log warning
See merge request crafty-controller/crafty-4!338
2022-06-13 21:36:41 +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
Andrew
5022723895
Merge branch 'dev' into 'master'
...
Fix user reset password. Fix NL language
See merge request crafty-controller/crafty-4!335
2022-06-13 21:06:37 +00: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
80b125071c
Merge branch 'dev' into 'master'
...
Fix User Imports on Import3. Fix TZ stack
See merge request crafty-controller/crafty-4!334
2022-06-13 19:35:15 +00:00
xithical
c4ce592cdc
Merge branch 'freddy-0-dev-patch-40848' into 'dev'
...
borked icon location
See merge request crafty-controller/crafty-4!333
2022-06-13 19:27:55 +00:00
Iain Powrie
6fea0dfc50
Merge branch 'bug/tz-fallback' into 'dev'
...
Add fallback for tz not being found
See merge request crafty-controller/crafty-4!331
2022-06-13 19:24:03 +00:00
Freddy 0
a94e3f8a36
borked icon location
2022-06-13 19:22:53 +00: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
