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

2749 Commits

This Branch
This Branch
All Branches
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
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
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