Commit Graph

3540 Commits

Author SHA1 Message Date
2e212cc788 Add port constraint for all server creation & api 2022-10-04 15:55:52 -04:00
f558388a0f Update themes to include all colors 2022-10-04 13:31:37 -04:00
2706ffddbe Merge branch 'bug/zip-import-conditional' into 'dev'
Fix conditional issue with zip imports/uploads

See merge request crafty-controller/crafty-4!476
2022-10-03 21:34:07 +00:00
43a582fc8c Update changelog !476 2022-10-03 22:28:30 +01:00
4d74a1e3c0 Merge branch 'dev' into bug/zip-import-conditional 2022-10-03 22:26:22 +01:00
f497135066 Merge branch 'dev-fixed-sidebar' into 'dev'
Fixed Sidebar

See merge request crafty-controller/crafty-4!475
2022-10-03 21:17:27 +00:00
03320c375a Fix conditional issue with zip imports/uploads 2022-10-03 15:38:45 -04:00
1f6042be07 update changelog 2022-10-03 18:54:30 +02:00
99693324dc Fix scrolling of sidebar 2022-10-03 18:48:49 +02:00
6688085292 Prepare 4.0.16 release base 2022-10-02 22:23:59 +01:00
ba8e9dc123 Merge branch 'dev' into 'master'
v4.0.15

See merge request crafty-controller/crafty-4!474
v4.0.15-beta
2022-10-02 20:46:56 +00:00
a8fc02b3fe Merge branch 'bug/websocket-clients' into 'dev'
Fix set size changed during iteration

See merge request crafty-controller/crafty-4!473
2022-10-02 20:32:07 +00:00
a6b22c0fb8 Update changelog !473 2022-10-02 21:29:48 +01:00
0ab8a2d80e Merge branch 'dev' into bug/websocket-clients 2022-10-02 21:16:31 +01:00
d63b0299f4 Merge branch 'feature/upload-import' into 'dev'
Add upload import functionality.

See merge request crafty-controller/crafty-4!472
2022-10-02 20:14:36 +00:00
cd0486fe11 Update changelog !472 2022-10-02 21:10:44 +01:00
352a3e12e7 Fix minor bugs with uploads import 2022-10-02 15:54:13 -04:00
5f8c0dab4c Merge branch 'dev' into 'feature/upload-import'
# Conflicts:
#   app/frontend/templates/server/wizard.html
2022-10-02 19:10:05 +00:00
f809833aec Merge branch 'enhancement/themes' into 'dev'
Add Basic Themes to Crafty

See merge request crafty-controller/crafty-4!471
2022-10-02 19:00:04 +00:00
ccfed613d7 Update changelog !471 2022-10-02 19:55:45 +01:00
7cc8503941 Merge branch 'dev' into enhancement/themes 2022-10-02 19:52:56 +01:00
7cd237d65b Merge branch 'bug/api-stdin' into 'dev'
Fix bug with API stdin

See merge request crafty-controller/crafty-4!470
2022-10-02 18:48:16 +00:00
91e065c59c Update changelog !470 2022-10-02 19:42:55 +01:00
f9a918e014 Merge branch 'dev' into bug/api-stdin 2022-10-02 19:40:13 +01:00
a2aa9ad58e Merge branch 'bug/schedule-type-error' into 'dev'
Traceback on schedule creation

See merge request crafty-controller/crafty-4!469
2022-10-02 18:37:48 +00:00
cb064f95df Fix set size changed during iteration 2022-10-02 14:29:36 -04:00
2fc7bcbcde Update changelog !469 2022-10-02 19:27:22 +01:00
dc218eb9d5 Remove java specific settings from bedrock upload 2022-09-28 18:23:12 -04:00
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
f090bf8c6f Add task to check for old files every 12 hours 2022-09-27 22:57:24 -04:00
ab344cbff4 Add zip upload to bedrock servers 2022-09-27 22:49:52 -04:00
b9bd654e58 Add upload import functionality.
Update gitignore
2022-09-27 22:06:22 -04:00
31a8366186 Fix tooltip colors 2022-09-26 21:41:22 -04:00
3d82b61007 Add comments to CSS file.
Update ronald theme
2022-09-26 21:34:54 -04:00
8e1534e268 Add arguments to API routes 2022-09-26 21:31:44 -04:00
3eb87209de Fix color issues with dropdown 2022-09-26 21:24:00 -04:00
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
05f08773a3 Add themes to users DB 2022-09-26 21:23:16 -04:00
0cba81788e Add translation 2022-09-26 21:22:56 -04:00
95188a053d Fix navigation colors 2022-09-25 22:36:17 -04:00
c7a292a662 Fix notification color 2022-09-25 22:23:37 -04:00
baa441d427 Add light. Fix login 2022-09-25 22:18:36 -04:00
ca91debea1 Set base.html origin back to default 2022-09-25 17:52:24 -04:00
e6121b06a6 Add dark mode. Refactor code to accept themes 2022-09-25 17:52:01 -04:00
d7de340807 Initial commit for themes/black 2022-09-25 12:45:22 -04:00
046943c250 Fix bug with API stdin 2022-09-25 12:14:01 -04:00
eaa68751b2 Fix type error on interval check. 2022-09-25 11:17:44 -04:00
8cada1c450 Prepare 4.0.15 release base 2022-09-23 03:36:15 +01:00
47a06d2706 Merge branch 'dev' into 'master'
v4.0.14

See merge request crafty-controller/crafty-4!468
v4.0.14-beta
2022-09-23 02:26:32 +00:00
372d8fff37 Merge branch 'bug/websocket-set-subscription' into 'dev'
self.clients was already a set. cannot subscript

See merge request crafty-controller/crafty-4!467
2022-09-23 02:20:01 +00:00