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,002 Commits 12 Branches 45 Tags 104 MiB
3673134048
Commit Graph

2023 Commits

Author SHA1 Message Date
Silversthorn
15fee87709 Improving display for hidden parts 2023-02-02 23:48:12 +01:00
Silversthorn
137ae3041f Improving Forms Displays for upload files and server creation 2023-02-02 23:47:54 +01:00
amcmanu3
c22a073f2f Add space after gear 2023-02-01 17:34:07 -05:00
amcmanu3
42b564de1c Fix error codes 2023-02-01 17:16:08 -05:00
amcmanu3
bb482b8381 Use response text for errors on uploads. 
Overhaul
 2023-02-01 17:09:39 -05:00
amcmanu3
20ce8996d7 Add better upload feedback for users 2023-02-01 15:43:17 -05:00
amcmanu3
238b8da4d9 Add upload progress bar for file uploads 2023-02-01 15:31:43 -05:00
Silversthorn
7949db65ac Improving Switches on Config Server Page 2023-01-31 20:20:08 +01:00
amcmanu3
5bccfab7b6 add ignored names in conditional 2023-01-31 13:53:27 -05:00
amcmanu3
750e4f40c0 Remove "my secret" from authentication 2023-01-31 13:30:41 -05:00
amcmanu3
6e0805a8a1 Lol uncomment the fix 2023-01-31 13:14:01 -05:00
amcmanu3
ed30cbd4cb Refactor public handler keys 2023-01-31 13:11:28 -05:00
amcmanu3
683c9cecba Add background key to server_handler page_data 2023-01-31 13:11:03 -05:00
amcmanu3
d160054bb3 Add translations 2023-01-30 23:32:45 -05:00
amcmanu3
819e84ec4c Translate additions to backups page 2023-01-30 23:27:40 -05:00
amcmanu3
43c11f80b8 Appease the linter 2023-01-30 19:11:37 -05:00
amcmanu3
82dc20e94a Remove print statements 2023-01-30 18:35:04 -05:00
amcmanu3
e43c63a8b7 Fix db not found issue 
Add page feedback.
 2023-01-30 18:31:46 -05:00
amcmanu3
d273589f2e Fix front end 2023-01-30 17:23:25 -05:00
amcmanu3
73233181be Fix typo on front end 2023-01-30 15:39:09 -05:00
amcmanu3
552ed8a5a6 Append /servers/ on the input field 2023-01-30 15:30:11 -05:00
amcmanu3
863ded782a Add move servers dir functionality 2023-01-30 15:23:10 -05:00
amcmanu3
aaefcb913b Append to subdir function for windows mapping 2023-01-30 15:22:40 -05:00
amcmanu3
3a763178d7 Merge branch 'dev' into tweak/master-server-dir-config 2023-01-30 12:14:58 -05:00
Zedifus
3eeb00e524 Prepare 4.0.21 release base 2023-01-30 00:24:35 +00:00
Zedifus
5699aa40e8 Merge branch 'dev' into enhancement/auto_log-dash 2023-01-29 23:35:34 +00:00
Iain Powrie
4300cab1b9 Merge branch 'refactor/config-json' into 'dev' 
Managed config.json refactor

See merge request crafty-controller/crafty-4!485
 2023-01-29 23:33:55 +00:00
amcmanu3
3f3595acb4 Sort config.json in alphabetical order 2023-01-29 18:21:04 -05:00
amcmanu3
af654bc89f Make the color look nicer 2023-01-29 17:25:44 -05:00
amcmanu3
d24c3c5ba0 Add red color to reset values 2023-01-29 17:05:17 -05:00
amcmanu3
bd8e12f884 Fix wording in reset 2023-01-29 17:00:28 -05:00
amcmanu3
2d9529ba0c Add cookie secret to DB 
Allow users to reset cookie and api secret
Add Crafty row to table on fresh install
Change inserts to updates for crafty settings table.
 2023-01-29 16:54:02 -05:00
amcmanu3
02273580f6 Appease the linter AGAIN 2023-01-29 15:20:27 -05:00
amcmanu3
5ab224d17e Appease the linter 2023-01-29 15:18:10 -05:00
amcmanu3
040536f320 Merge branch 'dev' into bugfix/file-tree-reload 2023-01-29 15:13:02 -05:00
Zedifus
aa2ba4f8cf Merge branch 'dev' into refactor/config-json 2023-01-29 20:00:09 +00:00
amcmanu3
8ee274a927 Remove config.json from repo. 
Remove version checking.
Move master config to helpers.
Add config.json when not found on start.
 2023-01-29 14:54:25 -05:00
Zedifus
52459a4cf6 Merge branch 'dev' into enhancement/config-json 2023-01-29 19:26:43 +00:00
Zedifus
14d444b90c Merge branch 'dev' into tweak/server-stats-db-hidden 2023-01-29 18:59:29 +00:00
amcmanu3
3c2b2e8a87 Add better feedback for files that finish upload 2023-01-28 21:50:45 -05:00
amcmanu3
d31a0a0512 Fix root directory uploads 2023-01-28 20:35:58 -05:00
amcmanu3
e0541b1ec0 Change file tree doesn't reload on upload/delete 2023-01-28 19:10:27 -05:00
Silversthorn
8b62814f17 Add Default redirection to Dashboard to prevent login if the user is connected 2023-01-28 16:43:27 +01:00
Silversthorn
d01dfe40db Merge branch 'dev' into enhancement/config-json 2023-01-28 01:37:41 +01:00
amcmanu3
afdb9d9386 Use ignored_names as class variable in helpers 2023-01-27 17:36:23 -05:00
Zedifus
e217c63fdf Merge branch 'dev' into bug/ReworkDefautPublicHandler 2023-01-27 19:59:12 +00:00
Zedifus
55523b3ce4 Merge branch 'dev' into tweak/raknet-icon-failure 2023-01-27 19:47:22 +00:00
Zedifus
b5d259bce7 Merge branch 'dev' into feature/backup-echo 2023-01-27 19:39:05 +00:00
Zedifus
84592c178e Merge branch 'dev' into refactor/scheduled-task-queue 2023-01-27 19:30:03 +00:00
Zedifus
bfe9d2082b Merge branch 'dev' into tweak/backup-file-time- 2023-01-27 19:20:58 +00:00
Zedifus
e8d2414815 Merge branch 'dev' into bugfix/schedule-restore 2023-01-27 19:05:50 +00:00
Zedifus
e61941613a Merge branch 'dev' into dev-transparent-login 2023-01-27 18:40:01 +00:00
Andrew
8a5cc6d1e6 Set up back end for master server dir 2023-01-26 19:21:39 -05:00
Silversthorn
bc2776c666 Be good with the linter 2023-01-26 22:26:41 +01:00
Silversthorn
d97a792987 Remove public page to use direct login as status one 
Rework HTTP Handler as we redirect all trafic to HTTPS
 2023-01-25 23:26:04 +01:00
Silversthorn
4248174041 Fixing Double Migration at Startup 2023-01-25 23:20:45 +01:00
Andrew
58f6448784 Move sleep into shutdown block 2023-01-21 13:16:01 -05:00
Andrew
248a5a63a9 Include option for after command 2023-01-21 13:13:02 -05:00
Silversthorn
0a418363b0 Improving Display of Panel Config Pages 2023-01-21 12:29:08 +01:00
Silversthorn
03d236f1a0 Enhance Visual for the selectpicker 2023-01-21 09:53:46 +01:00
Andrew
fa9be860bd Move raknet icon failure to a debug log 2023-01-20 17:42:39 -05:00
Andrew
cf9ad77879 Add option to run command before backup 2023-01-20 17:35:30 -05:00
amcmanu3
2e810b1544 Fix button covers 2023-01-19 16:20:23 -05:00
amcmanu3
04f7876e9f Add selectpicker. Make select look nicer 2023-01-19 14:09:21 -05:00
amcmanu3
634edb0e8b Remove unused import 2023-01-19 12:06:37 -05:00
amcmanu3
7ee86f3ce1 Fix logic issue 2023-01-19 12:06:29 -05:00
amcmanu3
27981619c4 Fix rollback table name 2023-01-19 11:57:11 -05:00
amcmanu3
60785500b9 Remove commands table 2023-01-19 11:47:07 -05:00
amcmanu3
dfa2f5fb1e Remove antequeted code after moving from db 2023-01-19 11:28:00 -05:00
amcmanu3
efd3bef029 Use queues for scheduled task disapatch 2023-01-19 11:27:33 -05:00
Andrew
868b324547 Black config_json. Add feedback on submit 2023-01-18 18:00:50 -05:00
Silversthorn
ba415c1168 Fixing display of dropdown select 2023-01-18 22:44:26 +01:00
Silversthorn
caf7dd2fac Improving enable of all languages 2023-01-18 22:42:17 +01:00
Silversthorn
6f92d44d62 fixing messing with config.json file 2023-01-18 22:26:47 +01:00
Silversthorn
4573feaa9a Merge branch 'dev-transparent-login' of gitlab.com:crafty-controller/crafty-4 into dev-transparent-login 2023-01-18 22:17:03 +01:00
Silversthorn
c0fff12f39 Fix center position for login background to center 2023-01-18 22:16:51 +01:00
Silversthorn
35d33ef51c Improving config_json form and Fixing disabled languages 2023-01-18 22:01:23 +01:00
Andrew
33b9026e8e Fix delete. Remove secondary selection box 2023-01-18 14:40:01 -05:00
Andrew
0d85b55c06 Allow file paths with symbols for background 2023-01-18 14:35:35 -05:00
Silversthorn
71c5d46296 Improving Login Display in Panel Config 2023-01-17 22:02:37 +01:00
Silversthorn
9fc7a0523e Improve display of the login form on settings 2023-01-17 21:48:17 +01:00
Silversthorn
7984ca8157 Add Personalized Transparency for Login Page's Form 2023-01-17 20:40:16 +01:00
amcmanu3
6dfabab4af Set backup filename to use same time as schedule 2023-01-17 10:27:55 -05:00
Andrew
ede865bf33 Appease the linter and fix stinky code 2023-01-16 15:16:43 -05:00
Andrew
2e25ed84c5 Remove print statements 2023-01-16 14:30:55 -05:00
Andrew
1802a7e7ef Add backup preservation 
Add update job to bedrock
 2023-01-16 14:15:45 -05:00
Andrew
944d01ab19 Fix schedule restores 2023-01-16 11:20:15 -05:00
Andrew
dc7b682ce6 Fix merge conflict issues 2023-01-15 19:09:29 -05:00
Andrew
07220f68bf Merge branch 'enhancement/config-json' of gitlab.com:crafty-controller/crafty-4 into enhancement/config-json 2023-01-15 18:58:28 -05:00
Andrew
8d8b065e41 Working config.json from page 2023-01-15 18:57:22 -05:00
amcmanu3
99ccfb2228 Remove submit function 2023-01-14 22:24:20 -05:00
amcmanu3
f9064eb15f Turn it into a list for a fresh start at this 2023-01-14 22:22:37 -05:00
Andrew
bea48d9059 Add better formatting for lists. 2023-01-10 14:12:33 -05:00
Andrew
5d3dbc6f9c Fix security 2023-01-09 19:01:05 -05:00
Silversthorn
3c11f0120d Rework panel config for login page 2023-01-10 00:53:47 +01:00
Andrew
4f4ec16a9b Make config editable from Crafty 2023-01-09 18:52:45 -05:00
Andrew
4031b74e00 Hide server stats db from users 2023-01-09 16:34:12 -05:00
Andrew
199c8a4fe6 Fix local java server imports 2023-01-08 00:32:08 -05:00
Zedifus
d7d27b00c4 Prepare 4.0.20 release base 2023-01-07 18:56:13 +00:00
Iain Powrie
505d7321d3 Merge branch 'lang/create-czech-translation' into 'dev' 
Added Czech translation

See merge request crafty-controller/crafty-4!519
 2023-01-07 16:03:04 +00:00
Andrew
52ef76e15b Replace google ping for ntp for usability in china 2023-01-03 10:14:10 -08:00
Zedifus
205d111251 Merge branch 'dev' into bug/unzip-logic 2023-01-02 22:48:42 +00:00
Zedifus
aaffe69cb3 Merge branch 'dev' into bug/nested-reaction 2023-01-02 22:10:22 +00:00
Zedifus
a03f44144b Merge branch 'dev' into tweak/start-timeout-warning 2023-01-02 21:36:35 +00:00
Zedifus
6c2a63f1e8 Merge branch 'dev' into bug/server-config-save 2023-01-02 21:18:49 +00:00
Zedifus
c80d357f13 Fix CodeQuality, line length 2023-01-02 20:59:29 +00:00
Andrew
4922998b14 Remove extra task definition 2023-01-02 14:34:08 -05:00
Andrew
985178b993 Update zip import status 2023-01-02 14:26:42 -05:00
Andrew
872489d125 Remove useless block in unzip method 
This was causing an error.
 2023-01-02 12:20:18 -05:00
Andrew
9ebdbbf5af Fix bug where nested reaction tasks would stack 2023-01-01 23:13:07 -05:00
Andrew
1daaecc790 Remove un-needed log messages 2022-12-29 19:05:55 -05:00
Makhuta
6f76ad653f Add Czech translation 2022-12-28 16:03:58 +00:00
amcmanu3
60e393d7cf Make qol changes to startup warning 2022-12-28 00:20:06 -05:00
Andrew
47e2635b20 Set a timeout on server launch to display warn 2022-12-27 09:45:39 -05:00
Andrew
ddaac25060 Run forge installer for all versions of forge 2022-12-23 20:14:41 -05:00
Andrew
88cd991b7e Fix bug where server_path variable was still used 
I'm dumb and I fixed a bug I created.
 2022-12-22 20:59:45 -05:00
Silversthorn
9dac0b5d85 Adding Forge Installer Compaptibility with old versions 2022-12-22 19:32:56 +01:00
Andrew
d5cc4529b0 Add try/except for not finding run file 2022-12-21 21:55:21 -05:00
Zedifus
3c0330de38 Merge branch 'dev' into refactor/config-json 2022-12-21 16:19:16 +00:00
Zedifus
2889c060e6 Merge branch 'dev' into tweak/server-port-explained 2022-12-21 16:11:13 +00:00
Zedifus
5c10dd884f Merge branch 'dev' into bug/windows-path-java-override 2022-12-21 16:04:28 +00:00
Zedifus
edfa147a8b Merge branch 'dev' into bug/mac-m1-stats 2022-12-21 15:56:05 +00:00
Andrew
ec50a80e1f Add warning icon 2022-12-19 19:48:15 -05:00
Andrew
7f629d21e9 Update translation 
Make it so warning appears all the time
 2022-12-19 19:42:40 -05:00
Andrew
0bd4dd7e69 Add popover to server port to explain it's purpose 2022-12-19 18:42:05 -05:00
amcmanu3
262ec80db8 Remove print statement 2022-12-19 17:47:31 -05:00
amcmanu3
9004feff37 Fix windows slash escape java override 2022-12-19 17:44:04 -05:00
amcmanu3
fbc506f2fd Fix issues after merge conflicts 2022-12-19 17:15:26 -05:00
Andrew
3ab57f116c Merge branch 'dev' into 'refactor/config-json' 
# Conflicts:
#   app/classes/shared/helpers.py
 2022-12-19 22:13:10 +00:00
amcmanu3
76cedc9392 Fix stats error on mac M1 chips 2022-12-19 11:54:24 -05:00
Andrew
a1e8b7afe7 Make server directories non-configurable 2022-12-17 12:21:15 -05:00
Zedifus
cffa58da3b Merge branch 'dev' into bug/zip-server-upload 2022-12-17 00:07:15 +00:00
Andrew
6572dc5e10 Appease the linter 2022-12-16 18:47:36 -05:00
Andrew
8c6bb38224 Fix location of loop check. 2022-12-15 18:58:10 -05:00
Andrew
c74aeb5dde Fix id mismatch zip upload import 2022-12-15 18:48:15 -05:00
Andrew
551020f738 Create our own check function 2022-12-14 14:54:52 -05:00
Andrew
9f939ae40e Trying one more thing 2022-12-14 12:24:00 -05:00
Andrew
6f510976f0 Attempting to add method for posixpath 2022-12-14 12:21:04 -05:00
Andrew
ac1b94d35b Change Path return PosixPath to purepath 2022-12-14 12:02:38 -05:00
Zedifus
0bdd01f668 Merge branch 'dev' into bug/server-import-copy-loop 2022-12-07 14:32:03 +00:00
Zedifus
94d7b9901c Merge branch 'dev' into bug/public-backgrounds 2022-12-07 14:09:30 +00:00
Zedifus
c2f086554c Merge branch 'dev' into bug/status-page-colors 2022-12-07 13:44:53 +00:00
Zedifus
d127fc6e3d Merge branch 'dev' into bug/plus-sign-path 2022-12-07 13:33:19 +00:00
Andrew
98da08bde6 Appease the linter 2022-12-06 15:11:36 -05:00
Andrew
55c527bfdb Be sure a user cannot server import crafty dir 2022-12-06 15:09:11 -05:00
Andrew
b133a7bdea Fix background key not on public pages 2022-12-03 20:48:22 -05:00
Andrew
4baaec8752 Fix colors on public pages. 2022-12-02 13:06:10 -05:00
Andrew
48a6f98cb5 Fix port not showing on dash while server online 2022-11-30 21:50:55 -05:00
Andrew
0c9ee0e0e0 Fix plus sign in path bug with downloads & uploads 2022-11-30 20:28:24 -05:00
Zedifus
17744b72ae Prepare 4.0.19 release base 2022-12-01 01:18:40 +00:00
Zedifus
c5a888a2c0 Merge branch 'dev' into tweak/public-background 2022-12-01 01:03:26 +00:00
Andrew
206dc956cf Make background available to all public pages 
Move background to top of html for better loading
 2022-11-30 19:53:10 -05:00
Zedifus
74f71606f3 Prepare 4.0.18 release base 2022-12-01 00:20:18 +00:00
Andrew
6a693fd2ca Merge branch 'feature/custom-login-background' of gitlab.com:crafty-controller/crafty-4 into feature/custom-login-background 2022-11-30 18:14:42 -05:00
Andrew
9bd0bd2f7e Make the zedifus changes. 2022-11-30 18:14:37 -05:00
Zedifus
4543fcd03f Merge branch 'dev' into feature/custom-login-background 2022-11-30 21:08:53 +00:00
Zedifus
58d32ca4de Merge branch 'dev' into enhancement/dashboard-port 2022-11-30 20:51:52 +00:00
Andrew
b2182919ff Fix dir does not exist. 2022-11-30 15:51:12 -05:00
Zedifus
1addde000c Merge branch 'dev' into feature/forge-install 2022-11-30 19:53:16 +00:00
Andrew
2782e927d7 Add port tooltip over status on dash 2022-11-28 19:45:53 -05:00
Andrew
e8564566ed Appease the linter 2022-11-19 18:21:10 -05:00
Silversthorn
671a5188c2 Adding French Translations 2022-11-19 23:28:57 +01:00
Silversthorn
b4dca8b27f Merge branch 'feature/forge-install' of gitlab.com:crafty-controller/crafty-4 into feature/forge-install 2022-11-19 23:20:26 +01:00
Silversthorn
004049f6da Using Regex to Extract Infos from Forge Scripts 2022-11-19 23:20:21 +01:00
Andrew
32cdde0616 Fix failed imports 2022-11-19 16:13:44 -05:00
Andrew
4e17c1ea5e Add installing status 2022-11-19 15:45:29 -05:00
Andrew
b95d71bfbc Appease the linter 2022-11-19 14:45:24 -05:00
Andrew
e42af36103 Make sure import status persists through install 2022-11-19 14:41:15 -05:00
Andrew
ad4603aafb Add automated forge server creation installs 2022-11-19 13:45:18 -05:00
amcmanu3
46740f7cbf Fix type error on delete 2022-11-09 14:20:37 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Andrew
a66b95e607 Fix no port on bedrock server creation 2022-10-28 22:16:10 -04:00
Zedifus
48b8b9d084 Merge branch 'dev' into refactor/config-json 2022-10-23 21:30:41 +01:00
Zedifus
cd93b468b3 Prepare 4.0.17 release base 
Also remove badges from README, as gitlab already handles this in a different section
 2022-10-23 21:24:10 +01:00
Zedifus
5a2dc555f8 Merge branch 'dev' into feature/log-filter 2022-10-22 20:45:24 +01:00
Zedifus
ba968cfd71 Merge branch 'dev' into bug/backup-refresh 2022-10-22 20:39:05 +01:00
Zedifus
1f842574c4 Merge branch 'dev' into tweak/stats-clients 2022-10-22 20:26:18 +01:00
Zedifus
eb617bb292 Merge branch 'dev' into feature/update-url-autoset 2022-10-22 20:14:41 +01:00
Zedifus
1f2ff2345d Rename functions for readability 2022-10-22 19:43:59 +01:00
Zedifus
2599658321 Fix word list display on page load 
Whoopsie
 2022-10-22 19:37:16 +01:00
Zedifus
cb6e034f30 Guard against duplicate filters 
This protects against adding multiple filters of the same thing
 2022-10-22 19:28:13 +01:00
Zedifus
f3e41861d2 Remove guard on whitspace 
We can just trim instead
 2022-10-22 19:24:06 +01:00
Zedifus
a2a8b6449f Tidy comments and declaration order 
Declare functions before the function that uses it
 2022-10-22 19:04:57 +01:00
Zedifus
eaf5ae3664 Tidy turbo long lines for scroll-less readability 2022-10-22 18:50:48 +01:00
Zedifus
fd906d56e8 Clear input field after we've grabbed the value 
Reduce repetition of code
 2022-10-22 18:18:00 +01:00
Zedifus
1217f93c05 Hoist sanatise declaration 
Function should be declared before trhe functions that use it, not after
 2022-10-22 18:11:54 +01:00
Zedifus
6437f4fbd5 Break up if/else into guard clauses 2022-10-22 18:08:35 +01:00
amcmanu3
34cda5a081 Fix backups refresh causing issues on firefox 2022-10-21 16:48:51 -04:00
Andrew
23b3e642a0 Only collect server stats when clients 2022-10-20 15:33:51 -04:00
Andrew
c2f5daf8e9 Remove feature for modded servers 2022-10-20 15:05:58 -04:00
Andrew
2d5d263852 Automatically set update url for server creation 2022-10-20 14:58:43 -04:00
Andrew
4707489310 More regex 2022-10-20 14:12:51 -04:00
Andrew
241a33542b Fix JS breaking symbols 2022-10-20 13:52:16 -04:00
Andrew
e576a69d39 Merge branch 'feature/log-filter' of gitlab.com:crafty-controller/crafty-4 into feature/log-filter 2022-10-20 10:04:45 -07:00
Andrew
cbe7ad9a39 Change variable naming to make more sense 2022-10-20 10:01:20 -07:00
Iain Powrie
b21d0d82f2 Apply 5 suggestion(s) to 1 file(s) 2022-10-18 04:22:06 +00:00
Silversthorn
a0454ad3f1 Fix server_stats db file when deleting server 2022-10-15 10:13:17 +02:00
Andrew
51f507c4f8 Add comments 2022-10-13 12:25:29 -07:00
Andrew
3f2e50a5dd Add config compare to not overwrite user changes 2022-10-13 12:17:31 -07:00
Andrew
3b813a6849 Fix splice error 2022-10-13 00:01:53 -04:00
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