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
3,004 Commits 12 Branches 45 Tags 104 MiB
4227b114b3
Commit Graph

2023 Commits

Author SHA1 Message Date
Andrew
ec746d2131 Fix duplicate word bug 
Fix delete bug
 2022-10-12 23:55:25 -04:00
Andrew
3f4d232910 Add log filtering 
known bug: when adding more than 4 items to js array
 2022-10-12 23:29:20 -04:00
Zedifus
0721c0d7d4 Strip meta from sem version 2022-10-08 18:34:38 +01:00
Zedifus
68be3aac16 Merge branch 'dev' into bug/stats-timeout 2022-10-08 18:20:00 +01:00
Zedifus
fbb6dad524 Merge branch 'dev' into tweak/themes 2022-10-08 18:12:37 +01:00
amcmanu3
3ac77d05c7 Add timeout to socket 2022-10-07 19:42:28 -04:00
Zedifus
21d119d58e Merge branch 'dev' into dev-fixed-sidebar-V2 2022-10-06 18:48:57 +01:00
Silversthorn
905be275ed Add Collapse Memory for sidebar on LargeBreakpoint 2022-10-06 07:52:24 +02:00
Zedifus
47a9210750 Merge branch 'dev' into bug/backup-config-persistance 2022-10-05 22:36:59 +01:00
Zedifus
c1374b5c7f Merge branch 'dev' into bug/port-constraint 2022-10-05 22:12:14 +01:00
Zedifus
522adb765c Appease lint 
Major - R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it
 2022-10-05 22:02:17 +01:00
Silversthorn
002d89934e I hope this time it's ok, the sidebar works as intended 2022-10-04 23:58:31 +02:00
Silversthorn
425cb3869b Fixing scrolling sidebar even when collapsed 2022-10-04 23:10:03 +02:00
Silversthorn
d87a2c4c17 Revert "Fix scrolling of sidebar" 
This reverts commit 99693324dc.
 2022-10-04 23:03:42 +02:00
amcmanu3
c58e4e3ebf Clean up backup configs when deleting servers 2022-10-04 16:37:53 -04:00
amcmanu3
ad41960338 Appease the linter 2022-10-04 16:23:29 -04:00
Andrew
b8e0e2b0fb Add catch for those that have existing bad ports 2022-10-04 16:14:22 -04:00
amcmanu3
3681f52856 Fix scheduled task disable 2022-10-04 16:07:08 -04:00
Andrew
2e212cc788 Add port constraint for all server creation & api 2022-10-04 15:55:52 -04:00
Andrew
f558388a0f Update themes to include all colors 2022-10-04 13:31:37 -04:00
Zedifus
4d74a1e3c0 Merge branch 'dev' into bug/zip-import-conditional 2022-10-03 22:26:22 +01:00
amcmanu3
03320c375a Fix conditional issue with zip imports/uploads 2022-10-03 15:38:45 -04:00
Silversthorn
99693324dc Fix scrolling of sidebar 2022-10-03 18:48:49 +02:00
Zedifus
6688085292 Prepare 4.0.16 release base 2022-10-02 22:23:59 +01:00
Zedifus
0ab8a2d80e Merge branch 'dev' into bug/websocket-clients 2022-10-02 21:16:31 +01:00
Andrew
352a3e12e7 Fix minor bugs with uploads import 2022-10-02 15:54:13 -04:00
Andrew
5f8c0dab4c Merge branch 'dev' into 'feature/upload-import' 
# Conflicts:
#   app/frontend/templates/server/wizard.html
 2022-10-02 19:10:05 +00:00
Zedifus
7cc8503941 Merge branch 'dev' into enhancement/themes 2022-10-02 19:52:56 +01:00
Zedifus
f9a918e014 Merge branch 'dev' into bug/api-stdin 2022-10-02 19:40:13 +01:00
Andrew
cb064f95df Fix set size changed during iteration 2022-10-02 14:29:36 -04:00
Andrew
dc218eb9d5 Remove java specific settings from bedrock upload 2022-09-28 18:23:12 -04:00
Andrew
a21bb36f7c Make it so a user cannot upload anything but zip 
TODO add better feedback than "error"
 2022-09-27 23:07:44 -04:00
Andrew
f090bf8c6f Add task to check for old files every 12 hours 2022-09-27 22:57:24 -04:00
Andrew
ab344cbff4 Add zip upload to bedrock servers 2022-09-27 22:49:52 -04:00
Andrew
b9bd654e58 Add upload import functionality. 
Update gitignore
 2022-09-27 22:06:22 -04:00
Andrew
31a8366186 Fix tooltip colors 2022-09-26 21:41:22 -04:00
Andrew
3d82b61007 Add comments to CSS file. 
Update ronald theme
 2022-09-26 21:34:54 -04:00
Andrew
8e1534e268 Add arguments to API routes 2022-09-26 21:31:44 -04:00
Andrew
3eb87209de Fix color issues with dropdown 2022-09-26 21:24:00 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
Andrew
05f08773a3 Add themes to users DB 2022-09-26 21:23:16 -04:00
Andrew
0cba81788e Add translation 2022-09-26 21:22:56 -04:00
Andrew
95188a053d Fix navigation colors 2022-09-25 22:36:17 -04:00
Andrew
c7a292a662 Fix notification color 2022-09-25 22:23:37 -04:00
Andrew
baa441d427 Add light. Fix login 2022-09-25 22:18:36 -04:00
Andrew
ca91debea1 Set base.html origin back to default 2022-09-25 17:52:24 -04:00
Andrew
e6121b06a6 Add dark mode. Refactor code to accept themes 2022-09-25 17:52:01 -04:00
Andrew
d7de340807 Initial commit for themes/black 2022-09-25 12:45:22 -04:00
Andrew
046943c250 Fix bug with API stdin 2022-09-25 12:14:01 -04:00
Andrew
eaa68751b2 Fix type error on interval check. 2022-09-25 11:17:44 -04:00
Zedifus
8cada1c450 Prepare 4.0.15 release base 2022-09-23 03:36:15 +01:00
Andrew
e2c846205b self.clients was already a set. cannot subscript 2022-09-22 21:42:58 -04:00
Zedifus
ff78e711d0 Prepare 4.0.14 release base 2022-09-20 23:50:07 +01:00
Zedifus
3209f69d14 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-20 23:22:00 +01:00
Zedifus
03a54d0249 Override 'unsubscriptable-object' pylint rule 
False positive from 'self' use
 2022-09-20 23:21:57 +01:00
amcmanu3
ff8ddb0f6e Fix cron edit traceback. 
Do not allow day to be greater than 30
 2022-09-20 17:52:11 -04:00
amcmanu3
ca2358ac0a Fix user creation traceback 2022-09-20 17:43:54 -04:00
amcmanu3
084cb8b71c Fix scrollable term issue on startup 2022-09-19 20:17:02 -04:00
amcmanu3
63347f956b Fix logical issues surrounding Gravatar fetch 2022-09-19 20:00:15 -04:00
Zedifus
0829331534 Appease Minor and Major lint issues in !464 2022-09-19 23:49:16 +01:00
Zedifus
532409a08d Merge branch 'dev' into bug/start-nonetype 2022-09-19 22:57:42 +01:00
Zedifus
2b36fbd448 Merge branch 'dev' into tweak/reaction-schedules 2022-09-19 22:50:55 +01:00
Zedifus
48b3c26f42 Merge branch 'dev' into bug/websocket-client-list-size 2022-09-19 22:40:23 +01:00
Zedifus
d3cfdd4a78 Merge branch 'dev' into bug/unloaded-server-config 2022-09-19 22:33:30 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Zedifus
d2d812edb7 Merge branch 'dev' into tweak/backup-restore 2022-09-19 22:11:53 +01:00
Zedifus
be8b24975d Merge branch 'dev' into bug/bleach 2022-09-19 22:04:59 +01:00
Zedifus
07941b7c3c Merge branch 'dev' into bug/js-errors 2022-09-19 21:57:43 +01:00
Zedifus
53be81dc08 Merge branch 'dev' into tweak/terminal-scroll 2022-09-19 21:47:52 +01:00
Zedifus
b93733c758 Merge branch 'dev' into tweak/debug-backup-logging 2022-09-19 21:39:14 +01:00
Andrew
f5cdd9f573 Check to "which java" doesn't return none 2022-09-19 11:13:35 -04:00
Andrew
9ecf912a98 Make default option be selected option in edit 2022-09-16 13:15:07 -04:00
amcmanu3
187860056c Create set from list for client list size change 2022-09-16 13:09:10 -04:00
Andrew
a3c1d9e051 Fix typo in panel handler for unloaded config 2022-09-14 13:13:32 -04:00
Andrew
67d465b94c Add debug logging 2022-09-12 15:36:13 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
amcmanu3
2b35da71fc Fix logic with gravatar email 2022-09-09 15:04:45 -04:00
amcmanu3
375df0c27d Only check for gravatar if internet 2022-09-09 15:00:08 -04:00
amcmanu3
e14e795b47 Add schedules to backup restore 
Persist execution command
 2022-09-09 14:49:31 -04:00
amcmanu3
17b6ec9fe3 Cleanup JS errors 2022-09-09 13:16:26 -04:00
Andrew
84838aae4d Fix vterm scroll logic when user is on bottom 2022-09-07 18:16:18 -04:00
Andrew
a0d921ffe3 Cleanup virtual term scroll 
Add scroll to bottom button when scrolled
 2022-09-07 18:02:49 -04:00
Andrew
6a6376ea8a appease the linter 2022-09-07 16:52:27 -04:00
Andrew
d45e32013b Fix backup exclusion issue 2022-09-07 16:51:41 -04:00
Andrew
296a5a46de Add comments. Debug logging 2022-09-07 16:01:42 -04:00
Andrew
7437944988 Fix & issues 2022-09-07 15:56:18 -04:00
Andrew
df7d10886e Fix & with bleach 2022-09-07 14:55:40 -04:00
Andrew
1a9dd53ebe Remove roles url from href 
Fixes trace when clicking "roles config" tab while on roles config page.
 2022-09-07 13:48:18 -04:00
amcmanu3
1b2fef06fb Fix critical bug with unloaded servers 2022-09-05 23:15:07 -04:00
Zedifus
3e29e3c77c Prepare 4.0.13 release base 2022-09-05 01:20:21 +01:00
amcmanu3
011b66e1df Fix server startup after update 2022-09-04 19:06:07 -04:00
amcmanu3
83834286fb Fix creation aesthetic 2022-09-04 18:27:45 -04:00
amcmanu3
e3cf2765f0 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-04 18:01:03 -04:00
amcmanu3
ab2e8cde0f Fix formatting on server creation page. 2022-09-04 18:01:00 -04:00
amcmanu3
76a499f5a4 Fix start server after updates 
Fix update notifs
 2022-09-04 17:50:08 -04:00
Zedifus
b0403a0b1f Merge branch 'dev' into bug/mc-ping-traceback 2022-09-04 21:51:50 +01:00
Zedifus
385ceb9655 Merge branch 'dev' into tweak/password-reset 2022-09-04 21:41:27 +01:00
Zedifus
0bce6f432a Merge branch 'dev' into enhancement/metrics-range 2022-09-04 21:25:45 +01:00
amcmanu3
e9c74be057 Add ability to change metrics scale 2022-09-04 16:21:33 -04:00
Zedifus
7f95f7085d Merge branch 'dev' into feature/bedrock-creation 2022-09-04 21:12:47 +01:00
Zedifus
88d3facc80 Merge branch 'dev' into enhancement/bedrock-update-support 2022-09-04 21:03:31 +01:00
amcmanu3
ceab737667 Update requirement checking for password reset 2022-09-04 14:22:25 -04:00
amcmanu3
a6148a7d8a Make password username lowercase 2022-09-04 13:33:22 -04:00
Andrew
dd56b4be37 update updates 2022-09-03 13:42:30 -04:00
Andrew
1f95ad600c Add return 2022-09-03 13:26:51 -04:00
Andrew
5d688522bd Fix backup logic 2022-09-03 13:23:30 -04:00
Andrew
6559112e1b Fix update logic 2022-09-03 13:16:03 -04:00
Andrew
9a7a1cc5d8 Change elif to else 2022-09-03 12:46:35 -04:00
Iain Powrie
3bdaec7837 Apply 1 suggestion(s) to 1 file(s) 2022-09-03 16:40:59 +00:00
Zedifus
77a858f24e Merge branch 'dev' into bug/import3-servers 2022-09-02 13:27:00 +01:00
amcmanu3
d568b7c664 Fix EULA message for legal reasons 
Make EULA message look prettier
 2022-09-01 14:18:04 -04:00
amcmanu3
99979f668b Fix black formatting 2022-09-01 12:51:54 -04:00
amcmanu3
d5ecfe9128 Add spinner to update button 2022-09-01 12:46:37 -04:00
Iain Powrie
3e370c0ae4 Apply 1 suggestion(s) to 1 file(s) 2022-09-01 14:41:42 +00:00
Andrew
0bc7e584e0 Wrap sock.recv in try/execpt to stop failure 2022-09-01 10:29:47 -04:00
amcmanu3
2becb657ca Put try/except around creation 2022-08-31 20:01:38 -04:00
amcmanu3
bd38fcd6e4 Add try/except around download 2022-08-31 19:59:46 -04:00
amcmanu3
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -04:00
amcmanu3
b274f0d3b0 Remove update url from config 2022-08-31 19:36:43 -04:00
amcmanu3
b445d085c8 Fix no id on import3 servers 2022-08-31 16:11:49 -04:00
Zedifus
96c4fa3bdd Validate bedrock url before download with urllib 
Even though there will be an incredibly small chance of tampering
this is to make bandit happy
"Bandit Test ID B310"
https://stackoverflow.com/a/53040523/18355876
 2022-08-31 20:04:39 +01:00
Zedifus
0c9e10f18a Fix sec overly permissive file permissions 
775 is too permissive for this  file, '-rwxr--r--' is more than enough
B103: Test for setting permissive file permissions
https://bandit.readthedocs.io/en/latest/plugins/b103_set_bad_file_permissions.html
 2022-08-31 19:50:35 +01:00
Zedifus
fdf1a5a41d Add url helper to bedrock update 2022-08-31 19:46:07 +01:00
Zedifus
9350ed07d7 Add bedrock remote url helper 2022-08-31 19:04:04 +01:00
Andrew
0f820433f1 Remove log path from config for bedrock 2022-08-31 12:39:52 -04:00
Andrew
600de2be0c Fix executable backups 
Cleanup after ourselves
 2022-08-31 12:18:52 -04:00
Andrew
266e540374 Add bedrock update support 2022-08-31 11:59:33 -04:00
Andrew
7f412954d7 Fix metrics schedule lag 2022-08-30 17:27:19 -04:00
Zedifus
9f62f6d0ca Prepare 4.0.12 release base 2022-08-28 01:17:55 +01:00
Zedifus
51d123e9eb Merge branch 'dev' into tweak/support-logs-zip-comment 2022-08-27 19:00:38 +01:00
Zedifus
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00
Zedifus
b0b04a6495 Merge branch 'dev' into feature/pretzel-variable-shutdown-timeout 2022-08-27 17:50:50 +01:00
Zedifus
1b4777fbab Merge branch 'dev' into feature/pretzel-users-roles-manager 2022-08-27 17:25:49 +01:00
Zedifus
6f66b77478 Add 'optional' comment to all archival methods 2022-08-27 17:05:13 +01:00
Andrew
b1769ba9a4 Remove manager parameter from add_raw_pass 2022-08-27 11:25:55 -04:00
Andrew
27ad78c14d Make admin manager none on fresh install 2022-08-27 11:17:31 -04:00
Andrew
3c14d0f2ee Appease the linter 2022-08-27 10:44:34 -04:00
Zedifus
7d801ac216 Add date and time to log archive 2022-08-26 16:23:08 +01:00
Zedifus
b8b61649b7 Tidy support string creation and include as comment 2022-08-26 15:57:35 +01:00
Zedifus
d3b7ab048d Add comment arg to make_compressed_archive 
This is an optional arg that will add a comment to zip file
 2022-08-26 15:56:31 +01:00
Andrew
9831705677 Fix height on different viewports 2022-08-22 22:39:39 -04:00
Andrew
1e569300fc Add translations 2022-08-22 20:23:09 -04:00
Andrew
037758accb Working live graph 2022-08-22 20:04:40 -04:00
amcmanu3
6ad9863cbf Still kinda broken, but this is cool 2022-08-22 01:15:18 -04:00
amcmanu3
eec9f0fc95 Remove zooming 2022-08-21 21:53:24 -04:00
amcmanu3
7e5d6fddda Add zoom to chart 2022-08-21 21:47:05 -04:00
Andrew
4225de55e8 Add server metrics graph 2022-08-21 17:04:23 -04:00
Andrew
9d961215a5 Fix logical bug with shutdown log/console prompts 2022-08-21 13:00:24 -04:00
Andrew
d06db6e028 Fix formatting for general users 2022-08-21 12:46:07 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -04:00
amcmanu3
02b6c3b545 Fix logical issues with panel handler 2022-08-20 20:58:46 -04:00
amcmanu3
6b82170d6f Appease the linter 2022-08-20 20:47:15 -04:00
Andrew
0672b9378a Add more secure logic to add/edit users 2022-08-20 18:51:35 -04:00
Andrew
cbbb9f9fd2 Fix clone server not taking into account quotas 2022-08-20 13:45:10 -04:00
Andrew
0f43917083 Remove unused methods 2022-08-20 13:15:44 -04:00
Andrew
cafa720bba Fix server quotas. Removed un-used perms columns 2022-08-20 13:00:20 -04:00
Andrew
245d64ca45 Refactor managed roles to users controller/model 2022-08-20 12:56:38 -04:00
Andrew
31b75b1c50 Remove manager from role when user deleted 2022-08-20 10:24:43 -04:00
Andrew
7a68e08a64 Working role manger super user 
TODO: Remove maanger after user is deleted
 2022-08-20 09:31:33 -04:00
Andrew
552a2e26c2 Working role managers. 
TODO: Add super user select option
 2022-08-20 08:49:38 -04:00
Andrew
56e9aaab01 Regression 2022-08-20 08:34:38 -04:00
Andrew
bd64f0d2ae Initial commit for role managers 2022-08-20 08:32:39 -04:00
amcmanu3
f75286e112 Fix logical issue in panel_handler 2022-08-19 15:14:42 -04:00
amcmanu3
7a98331b1f Add translations. Tweak frontend 2022-08-19 15:08:35 -04:00
amcmanu3
c1d16522d0 Add manager field to users 2022-08-19 13:09:59 -04:00
amcmanu3
b10523ae0a Add import status to working bedrock 2022-08-17 19:07:56 -04:00
amcmanu3
504ffd57f6 Working zip imports 2022-08-17 18:14:16 -04:00
amcmanu3
b5420c083e Starting zip imports 2022-08-17 17:41:44 -04:00
amcmanu3
eea5e329af Refactor and add import_helpers. 
Working jar imports
 2022-08-17 17:22:03 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -04:00
Zedifus
f3590ded0f Prepare 4.0.11 release base 2022-08-14 19:27:19 +01:00
Zedifus
e2a4e096a2 Merge branch 'dev' into bug/backup-reload 2022-08-14 18:36:27 +01:00
Zedifus
b452d06b8e Merge branch 'dev' into tweak/pretzel-users-title 2022-08-14 18:16:11 +01:00
Zedifus
ab5f587f50 Merge branch 'dev' into tweak/pretzel-backup-list 2022-08-14 18:03:30 +01:00
Zedifus
8c3649d0bb Merge branch 'dev' into bug/pretzel-fresh-install 2022-08-14 17:53:22 +01:00
Zedifus
1b9445bde0 Merge branch 'dev' into tweak/pretzel-logout 2022-08-14 17:37:32 +01:00
Zedifus
0a019d46b5 Merge branch 'dev' into bug/reaction 2022-08-14 17:23:33 +01:00
Andrew
1545c1415c Reload backup page on front end 2022-08-12 20:24:11 -04:00
Zedifus
2a316be57f Update offline staff credit.json 
retire staff
 2022-08-11 04:21:33 +01:00
Andrew
893d166c72 More testing 2022-08-08 13:04:36 -04:00
amcmanu3
8e934528c4 Fix users title 2022-08-07 14:45:13 -04:00
Andrew
8adcfbaf45 Updates 2022-08-07 13:23:45 -04:00
Andrew
3f4e9ac0c2 Merge branch 'dev' into enhancement/mobile-app 2022-08-07 12:59:14 -04:00
amcmanu3
f6975912f4 Only list zip files in backups list 2022-08-07 12:19:58 -04:00
amcmanu3
f4660fb36c Make fresh install more efficient 2022-08-07 11:30:00 -04:00
amcmanu3
3b5e3a30cd Log users out when browser tab is closed. 2022-08-07 11:04:56 -04:00
amcmanu3
675912a0b6 Check for number of users in fresh install 2022-08-07 11:04:12 -04:00
Andrew
be7a816f78 Fix reaction tasks not firing 
Fix delay not being accurate
 2022-08-07 01:30:59 -04:00
Zedifus
bb2621c723 Prepare 4.0.10 release base 2022-08-06 02:05:49 +01:00
Zedifus
247678e6c6 Correct offline credits for kofi schema update 2022-08-06 01:47:25 +01:00
amcmanu3
8897856aef Remove Update button when unloaded 
Fix duplicate list issue
 2022-08-05 20:24:42 -04:00
Zedifus
c5d049830e Merge branch 'dev' into bug/unloaded-servers 2022-08-06 01:10:16 +01:00
amcmanu3
5cbb8f7018 Fix broken unloaded servers 2022-08-05 20:04:34 -04:00
Zedifus
3e3c0ff946 Merge branch 'dev' into enhancement/pretzel-schedules 2022-08-06 00:20:31 +01:00
Zedifus
d3a6228d7e Update offline credits.json to schema v2 
Also remove non-perm staff & update promoted staff
 2022-08-05 23:57:54 +01:00
Zedifus
0af2def7b0 Update credits panel to handle v2 schema 2022-08-05 23:39:31 +01:00
Zedifus
13a0500e86 Switch to v2 credits schema 2022-08-05 23:38:32 +01:00
amcmanu3
b039eec857 First commit for unloaded server. Working Frontend 2022-08-05 17:56:44 -04:00
amcmanu3
3c8614f378 Fix traceback when editing schedule 2022-08-05 16:01:26 -04:00
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
amcmanu3
3974b7e8c7 poorly attempt to add "add to home" feature 2022-08-04 19:45:44 -04: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