Merge branch 'dev' into bugfix/schedule-enable

CHANGELOG.md

@@ -5,8 +5,9 @@ TBD
 ### Bug fixes
 - Include tzdata in Docker image ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/604))
 - Fix text/formatting issue on server config page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/602))
+- Bump required version of PyYAML to 6.0.1 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/609))
 ### Tweaks
-TBD
+- Add public status link to login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/608))
 ### Lang
 TBD
 <br><br>

app/frontend/templates/public/login.html

@@ -120,6 +120,11 @@
                     <span class="text-small font-weight-semibold"><a href="https://craftycontrol.com/">Crafty Control
                         {{data['version'] }}</a> </span>
                   </div>
+                  
+                  <div class="text-block text-center my-3">
+                    <a href="/status" class="text-small forgot-password">{{ translate('login', 'viewStatus',
+                      data['lang']) }}</a>
+                  </div>
                 </form>
 
             </div>

app/translations/en_EN.json

@@ -203,7 +203,8 @@
         "forgotPassword": "Forgot Password",
         "login": "Log In",
         "password": "Password",
-        "username": "Username"
+        "username": "Username",
+        "viewStatus": "View Public Status Page"
     },
     "notify": {
         "activityLog": "Activity Logs",

requirements.txt

@@ -12,7 +12,7 @@ pexpect==4.8
 psutil==5.9
 pyOpenSSL==23.2.0
 pyjwt==2.4.0
-PyYAML==5.4
+PyYAML==6.0.1
 requests==2.31
 termcolor==1.1
 tornado==6.3.2