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
2,550 Commits 12 Branches 45 Tags 104 MiB
d7d27b00c4
Commit Graph

2550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iain Powrie
f500735e32 Merge branch 'bug/port-constraint' into 'dev' 
Add port constraint for all server creation & api

See merge request crafty-controller/crafty-4!479
 2022-10-05 21:21:07 +00:00
Zedifus
2d24682ee4 Update changelog !479 2022-10-05 22:13:55 +01:00
Zedifus
c1374b5c7f Merge branch 'dev' into bug/port-constraint 2022-10-05 22:12:14 +01:00
Iain Powrie
7a81652395 Merge branch 'bug/schedule-disable' into 'dev' 
Fix scheduled task disable

See merge request crafty-controller/crafty-4!478
 2022-10-05 21:09:05 +00:00
Zedifus
da37c28712 Update changelog !478 2022-10-05 22:05:13 +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
27d33f79c6 update changelog 2022-10-04 23:17:27 +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
Iain Powrie
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
Zedifus
43a582fc8c Update changelog !476 2022-10-03 22:28:30 +01:00
Zedifus
4d74a1e3c0 Merge branch 'dev' into bug/zip-import-conditional 2022-10-03 22:26:22 +01:00
Iain Powrie
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
amcmanu3
03320c375a Fix conditional issue with zip imports/uploads 2022-10-03 15:38:45 -04:00
Silversthorn
1f6042be07 update changelog 2022-10-03 18:54:30 +02: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
Iain Powrie
ba8e9dc123 Merge branch 'dev' into 'master' 
v4.0.15

See merge request crafty-controller/crafty-4!474
 2022-10-02 20:46:56 +00:00
Iain Powrie
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
Zedifus
a6b22c0fb8 Update changelog !473 2022-10-02 21:29:48 +01:00
Zedifus
0ab8a2d80e Merge branch 'dev' into bug/websocket-clients 2022-10-02 21:16:31 +01:00
Iain Powrie
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
Zedifus
cd0486fe11 Update changelog !472 2022-10-02 21:10:44 +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
Iain Powrie
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
Zedifus
ccfed613d7 Update changelog !471 2022-10-02 19:55:45 +01:00
Zedifus
7cc8503941 Merge branch 'dev' into enhancement/themes 2022-10-02 19:52:56 +01:00
Iain Powrie
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
Zedifus
91e065c59c Update changelog !470 2022-10-02 19:42:55 +01:00
Zedifus
f9a918e014 Merge branch 'dev' into bug/api-stdin 2022-10-02 19:40:13 +01:00
Iain Powrie
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
Andrew
cb064f95df Fix set size changed during iteration 2022-10-02 14:29:36 -04:00
Zedifus
2fc7bcbcde Update changelog !469 2022-10-02 19:27:22 +01: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