Commit Graph

2488 Commits

Author SHA1 Message Date
Iain Powrie
7823fbed85 Merge branch 'tweak/server-directories' into 'dev'
Make server directories non-configurable

See merge request crafty-controller/crafty-4!511
2022-12-21 15:54:47 +00:00
Zedifus
8b5cbad8ab Update changelog !511 2022-12-21 15:51:07 +00:00
Andrew
a1e8b7afe7 Make server directories non-configurable 2022-12-17 12:21:15 -05:00
Iain Powrie
37071a2d05 Merge branch 'bug/zip-server-upload' into 'dev'
Fix root dir select in upload import

See merge request crafty-controller/crafty-4!508
2022-12-17 00:25:44 +00:00
Zedifus
8a32d22f7e Update changelog !507 2022-12-17 00:10:04 +00:00
Zedifus
cffa58da3b Merge branch 'dev' into bug/zip-server-upload 2022-12-17 00:07:15 +00:00
Iain Powrie
f945bbe63a Merge branch 'bug/import-dir-check' into 'dev'
Remove Pathlib from sub path check

See merge request crafty-controller/crafty-4!507
2022-12-17 00:05:34 +00:00
Zedifus
0519105b45 Update changelog !508 2022-12-17 00:02:38 +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
Iain Powrie
95e21d9245 Merge branch 'bug/server-import-copy-loop' into 'dev'
Be sure a user cannot server import crafty dir

See merge request crafty-controller/crafty-4!506
2022-12-07 15:14:01 +00:00
Zedifus
1e9bb97bdc Update changelog !506 2022-12-07 14:33:47 +00:00
Zedifus
0bdd01f668 Merge branch 'dev' into bug/server-import-copy-loop 2022-12-07 14:32:03 +00:00
Iain Powrie
b007eb96a2 Merge branch 'bug/public-backgrounds' into 'dev'
Fix background key not on public pages

See merge request crafty-controller/crafty-4!505
2022-12-07 14:29:12 +00:00
Zedifus
9a5bafe489 Update changelog !505 2022-12-07 14:14:55 +00:00
Zedifus
94d7b9901c Merge branch 'dev' into bug/public-backgrounds 2022-12-07 14:09:30 +00:00
Iain Powrie
175fee2d15 Merge branch 'bug/status-page-colors' into 'dev'
Fix colors on public pages.

See merge request crafty-controller/crafty-4!504
2022-12-07 13:55:26 +00:00
Zedifus
05ab568249 Update changelog !504 2022-12-07 13:47:41 +00:00
Zedifus
c2f086554c Merge branch 'dev' into bug/status-page-colors 2022-12-07 13:44:53 +00:00
Iain Powrie
da2c8ce0ef Merge branch 'bug/plus-sign-path' into 'dev'
Fix plus sign in path bug with downloads & uploads

See merge request crafty-controller/crafty-4!502
2022-12-07 13:42:37 +00:00
Zedifus
0fca232aff Update changelog !502 2022-12-07 13:38:39 +00:00
Zedifus
d127fc6e3d Merge branch 'dev' into bug/plus-sign-path 2022-12-07 13:33:19 +00:00
Iain Powrie
4aa0c30d62 Merge branch 'bug/port-online' into 'dev'
Fix port not showing on dash while server online

See merge request crafty-controller/crafty-4!503
2022-12-07 13:28:25 +00:00
Zedifus
f337d00887 Update changelog !503 2022-12-07 13:23:26 +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
Iain Powrie
ccf0ed9356 Merge branch 'tweak/public-background' into 'dev'
Make background available to all public pages

See merge request crafty-controller/crafty-4!499
2022-12-01 01:09:09 +00:00
Zedifus
c47b543840 Update changelog !499 2022-12-01 01:08:28 +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
Zedifus
125f662e4e Tweak CL 2022-11-30 23:48:41 +00:00
Iain Powrie
03418dc768 Merge branch 'feature/custom-login-background' into 'dev'
Add custom login backgrounds

See merge request crafty-controller/crafty-4!494
2022-11-30 23:37:43 +00:00
Zedifus
36bb3db704 Merge branch 'dev' into feature/custom-login-background 2022-11-30 23:31:39 +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
Iain Powrie
d0f8488ea1 Merge branch 'devops/bump-image-base-to-jammy' into 'dev'
Docker | Bump ubuntu base

See merge request crafty-controller/crafty-4!497
2022-11-30 22:09:41 +00:00
Zedifus
f6235ff02b Update changelog !497 2022-11-30 22:03:38 +00:00
Zedifus
01add23f69 Bump ubuntu base
Removed openjdk 16 as backport for jammy doesn't exist, most functions of 16 are in 17
2022-11-30 21:50:37 +00:00
Zedifus
2bdd870eaa Update changelog !494 2022-11-30 21:10:44 +00:00