Commit Graph

1349 Commits

Author SHA1 Message Date
Andrew
778effab98 Merge branch 'bug/kill-server' into 'dev'
Fix server not being cleaned up when killed.

See merge request crafty-controller/crafty-commander!215
2022-03-19 01:55:22 +00:00
Andrew
2efcacceb5 Fix server not being cleaned up when killed. 2022-03-18 21:50:09 -04:00
Andrew
20ea3c402d Merge branch 'darthleo-jqueryui-integration' into 'dev'
Better dashboard re-ordering

See merge request crafty-controller/crafty-commander!214
2022-03-19 01:48:24 +00:00
Iain Powrie
f280da8c52 Better dashboard re-ordering 2022-03-19 01:48:24 +00:00
xithical
7c822b715a Add functions for importing 3.x users, require passwords when adding users 2022-03-18 20:46:56 -05:00
Iain Powrie
ccd0bc8e8f Merge branch 'dev-BetterCertsGeneration' into 'dev'
Adding Subject Alt Names in certificate

See merge request crafty-controller/crafty-commander!209
2022-03-16 09:49:17 +00:00
Zedifus
a6e99347af Format the cert gen helper
Use black to format this function and appease lint.

We should really use black on the full project
2022-03-15 18:47:49 +00:00
Silversthorn
83c692beb5 pylint happy !! 2022-03-15 19:17:20 +01:00
Silversthorn
2f89c3a93d It was a comma !!! 2022-03-15 18:12:56 +00:00
Silversthorn
7e6d34de0f 2nd Try 2022-03-15 07:43:36 +00:00
Silversthorn
466d71db36 Try to be cool with pylint (resolving Major issue ?) 2022-03-15 07:32:08 +00:00
Iain Powrie
ba85c81e2d Merge branch 'translations/latvian' into 'dev'
Add Latvian lang file

See merge request crafty-controller/crafty-commander!212
2022-03-15 01:00:08 +00:00
Zedifus
897a9b2280 Add Latvian lang file
Thanks Mednis
2022-03-15 00:48:41 +00:00
amcmanu3
1253d60ad8 Remove scroll bars from motd 2022-03-14 19:48:53 -04:00
Andrew
6659466427 Merge branch 'bug/cannot-create-server' into 'dev'
Fix error where user could not create server

See merge request crafty-controller/crafty-commander!211
2022-03-14 23:11:01 +00:00
Andrew
e8951848e4 Merge branch 'dev-FixingLoginAndLogoutCookies' into 'dev'
Fixing Cookies at Logout

See merge request crafty-controller/crafty-commander!210
2022-03-14 23:10:22 +00:00
amcmanu3
0f27b2df91 Fix error where user could not create server
Fix error where user could not create support files
2022-03-14 17:39:19 -04:00
Silversthorn
c00915e347 Remove unused line 2022-03-14 21:37:40 +00:00
Silversthorn
79f918b877 Adding back and Commenting Old lines 2022-03-14 22:27:19 +01:00
Silversthorn
5900033134 Fixing Cookies deletion
Adding redirection at Login
2022-03-14 22:26:09 +01:00
Silversthorn
62244637bb Adding Subject Alt Names in certificate 2022-03-14 20:30:24 +01:00
Andrew
ddb254b9c7 Merge branch 'bug/cannot-create-user' into 'dev'
Bug/cannot create user

See merge request crafty-controller/crafty-commander!208
2022-03-14 03:17:48 +00:00
Andrew
2d531ab019 Merge branch 'feature/searchable-servers' into 'dev'
Fix bug could not drag servers after searching

See merge request crafty-controller/crafty-commander!207
2022-03-14 03:17:21 +00:00
Andrew
b5dac31ad5 Fix bug where you cannot create user without stack 2022-03-13 22:31:48 -04:00
Andrew
1f980484ae Adjust max size of motd 2022-03-13 17:12:33 -04:00
Andrew
f889dc1dad Fix bug could not drag servers after searching 2022-03-13 16:41:27 -04:00
Andrew
c111f7b69e Add === to check in dash 2022-03-13 16:14:50 -04:00
Andrew
6b42735444 Add search to dashboard
Fix MOTD formatting
2022-03-13 16:02:55 -04:00
Andrew
35a6307183 Merge branch 'feature/percentage-helper' into 'dev'
Add percentage to backups/support logs page

See merge request crafty-controller/crafty-commander!205
2022-03-13 15:58:43 +00:00
Andrew
e3c5c3b51e Merge branch 'dev' into 'feature/percentage-helper'
Security patch to fix

See merge request crafty-controller/crafty-commander!206
2022-03-13 14:34:40 +00:00
Andrew
d4a1efba78 Appease the linter 2022-03-13 09:26:38 -04:00
Andrew
fdce9e2539 Add websocket warning/error 2022-03-13 08:44:19 -04:00
Andrew
3a8174cc22 Add status bar for support log archive 2022-03-13 08:29:26 -04:00
Andrew
6e4435c86f Add Full support for backup status 2022-03-13 06:36:44 -04:00
Andrew
33cad6afa8 Add percentage to backups page
Helper designed to be used for support logs as well.
2022-03-11 00:19:05 -05:00
Andrew
8858780d41 Move backups to ajax request 2022-03-11 00:18:22 -05:00
Andrew
319e06cd10 Add backend percentage to backups 2022-03-09 23:45:49 -05:00
Iain Powrie
755e4a656b Security patch to fix
CVE-2020-14343

pyyaml Arbitrary Code Execution [9.8/10]
2022-03-09 10:41:34 +00:00
Iain Powrie
3918365393 Merge branch 'bugfix/lang-encoding' into 'dev'
Reencode `utf-8 with BOM` to utf-8

See merge request crafty-controller/crafty-commander!202
2022-03-08 06:36:30 +00:00
Zedifus
cee590a867 Reencode utf-8 with BOM to utf-8 2022-03-08 06:32:29 +00:00
Iain Powrie
514573f99c Correct version on docs, whoops 2022-03-08 06:12:21 +00:00
Iain Powrie
8717c863bf Merge branch 'tweak/better-signal-logging' into 'dev'
Fix signal logging

See merge request crafty-controller/crafty-commander!200
2022-03-08 05:47:38 +00:00
Zedifus
affcc14245 Fix circular imports
I'm a silly
2022-03-08 05:44:26 +00:00
Zedifus
cb3379a316 Fix signal logging 2022-03-08 05:26:13 +00:00
Iain Powrie
4cc617fd0d Merge branch 'tweak/fix-imports' into 'dev'
Tidy imports & dep auto-installer

See merge request crafty-controller/crafty-commander!199
2022-03-08 04:50:21 +00:00
Zedifus
b306d1f313 Tidy imports & dep auto-installer 2022-03-08 04:40:44 +00:00
Andrew
b9f6aad33d Merge branch 'enhancement/security-machine' into 'dev'
Attempt to appease Iain and the security machine

See merge request crafty-controller/crafty-commander!198
2022-03-08 03:21:50 +00:00
amcmanu3
7629f9a3ff Attempt to appease Iain and the security machine 2022-03-07 22:12:56 -05:00
Andrew
eda9f44b5f Merge branch 'bug/backups-restore/download' into 'dev'
Bug/backups restore/download

See merge request crafty-controller/crafty-commander!197
2022-03-08 02:56:52 +00:00
amcmanu3
7302737005 Fix 'server_id' not defined bug in download file 2022-03-07 21:48:37 -05:00