see CHANGELOG

unclehowell · May 22, 2024 · 0d8e08c · 0d8e08c
1 parent 87f772a
commit 0d8e08c
Show file tree

Hide file tree

Showing 4 changed files with 262 additions and 193 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [0.0.1-rtw.15] - Q2/2024
+May-22 - Adding the new client-side cache method to the GUI which doubles up as the homeserver GUI and online interactive demo  
 May-21 - Modified the gui a bit with the new client-side cache method of showing/hiding apps - our alternative to install/uninstall  
 May-20 - Fixed client-side cache app install - visible at static/gui-new/  
 May-19 - Fixed issue in static/_treeview.json causing it not to load in static/index.html    

diff --git a/static/gui/app-store/apps/002-001/fetch.html b/static/gui/app-store/apps/002-001/fetch.html
@@ -1,32 +1,4 @@
-<<<<<<< HEAD
-<!doctype html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-        <head>
-        <meta charset="utf-8">
-
-        <script src="../../../dashboard/js/jquery-3.3.1.min.js"></script>
-
-           <script>
-
-           if (window.location.href.indexOf("datro.") > -1) {
-           window.location.href = 'https://' + 'demo.jellyfin.org/stable/web/index.html' ;
-           }
-
-           if(document.URL.indexOf("datro.") <= -1){
-           window.location.href = 'https://' + window.location.hostname + window.location.port + ':8089'  ;
-           }
-
-        </script> 
-
-        <meta http-equiv="Page-Enter" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
-        <meta http-equiv="Page-Exit" content="progid:DXImageTransform.Microsoft.Fade(Duration=0.5)">
-</head>
-<body id="body">
-</body>
-</html>
-=======
-<!doctype html>
+<!Doctype html>
 <!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
         <head>
@@ -37,11 +9,11 @@
            <script>
 
            if (window.location.href.indexOf("datro.") > -1) {
-           window.location.href = 'https://' + 'jellyfin.bucklerfamilyestate.com' ;
+           window.location.href = 'https://' + 'demo.jellyfin.org/stable/web/index.html' ;
            }
 
            if(document.URL.indexOf("datro.") <= -1){
-           window.location.href = 'https://' + window.location.hostname + window.location.port + ':8089'  ;
+           window.location.href = 'http://' + window.location.hostname + window.location.port + ':8089'  ;
            }
 
         </script> 
@@ -52,4 +24,4 @@
 <body id="body">
 </body>
 </html>
->>>>>>> 741d0a0ca1ee372699f08f24b26ce103144db70c
+