From 4840bd7a505ad6836795863cd3ee5afb6f0c77bb Mon Sep 17 00:00:00 2001
From: lokonli <sander.lokerse@gmail.com>
Date: Tue, 27 Dec 2022 17:17:52 +0100
Subject: [PATCH 1/5] v3.10.0-beta

---
 docs/releasenotes/releasenotes.rst |  5 +++++
 version.txt                        | 17 ++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/docs/releasenotes/releasenotes.rst b/docs/releasenotes/releasenotes.rst
index d66ba8cf..c0b22068 100644
--- a/docs/releasenotes/releasenotes.rst
+++ b/docs/releasenotes/releasenotes.rst
@@ -8,6 +8,11 @@ For Dashticz's **master** version Release Notes go to: https://dashticz.readthed
 Recent changes
 ---------------
 
+v3.10.0 Beta (27-12-2022)
+-------------------------
+
+Beta version derived from v3.10 Master.
+
 V3.10 Master (27-12-2022)
 ---------------------------
 
diff --git a/version.txt b/version.txt
index 8408d50e..86e2ab4f 100644
--- a/version.txt
+++ b/version.txt
@@ -1,17 +1,8 @@
 {
-"version": "3.10",
-"branch": "master",
-"last_changes": "Master version",
+"version": "3.10.0",
+"branch": "Beta",
+"last_changes": "Beta version derived from 3.10 master",
 "changelog" : {
-            "3.9.8": "Dials: show on state for dimmers",
-            "3.9.7": "KNMI weather, dials update delay",
-            "3.9.6": "Fix blinds open/close for new Domoticz version (build>14535)",
-            "3.9.5": "iOS 10 compatibility",
-            "3.9.4": "Color picker for RGB dials",
-            "3.9.3": "Up/down dials",
-            "3.9.2": "Update caching behavior",
-            "3.9.1": "Update FontAwesome, Popper, Iro, Swiper",
-            "3.9.0": "Beta version derived from 3.9 master",
-            "3.9": "Master version"
+            "3.10": "Master version"
             }
 }

From 0248c35d86ea44a5143942c42e2a3662df7bf731 Mon Sep 17 00:00:00 2001
From: Lokonli <sander.lokerse@gmail.com>
Date: Tue, 27 Dec 2022 23:24:39 +0100
Subject: [PATCH 2/5] Update version.txt

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 86e2ab4f..f24f7faf 100644
--- a/version.txt
+++ b/version.txt
@@ -1,6 +1,6 @@
 {
 "version": "3.10.0",
-"branch": "Beta",
+"branch": "beta",
 "last_changes": "Beta version derived from 3.10 master",
 "changelog" : {
             "3.10": "Master version"

From 3f518b4537b0c08873fb53e7a9a8765e857169b2 Mon Sep 17 00:00:00 2001
From: lokonli <sander.lokerse@gmail.com>
Date: Tue, 27 Dec 2022 23:45:52 +0100
Subject: [PATCH 3/5] Publictransfort: fix OVAPI

---
 docs/releasenotes/releasenotes.rst | 8 ++++++++
 js/components/publictransport.js   | 2 +-
 version.txt                        | 5 +++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/releasenotes/releasenotes.rst b/docs/releasenotes/releasenotes.rst
index c0b22068..c97c5322 100644
--- a/docs/releasenotes/releasenotes.rst
+++ b/docs/releasenotes/releasenotes.rst
@@ -8,6 +8,14 @@ For Dashticz's **master** version Release Notes go to: https://dashticz.readthed
 Recent changes
 ---------------
 
+v3.10.0.1 Beta (27-12-2022)
+-------------------------
+
+Fixes
+~~~~~
+
+* Publictransport: Fix for OVAPI (SSL certificate expired)
+
 v3.10.0 Beta (27-12-2022)
 -------------------------
 
diff --git a/js/components/publictransport.js b/js/components/publictransport.js
index 674d38e2..b798d7a3 100644
--- a/js/components/publictransport.js
+++ b/js/components/publictransport.js
@@ -114,7 +114,7 @@
         renderer: renderTpl
       },
       ovapi: {
-        dataURL: _CORS_PATH + 'https://v0.ovapi.nl/' + (block.tpc ? 'tpc/' + block.tpc : 'stopareacode/' + block.station),
+        dataURL: _CORS_PATH + 'http://v0.ovapi.nl/' + (block.tpc ? 'tpc/' + block.tpc : 'stopareacode/' + block.station),
         transformer: transformOvapi,
         tpl: 'pubtrans_ov',
         renderer: renderTpl
diff --git a/version.txt b/version.txt
index f24f7faf..c9ed6ba6 100644
--- a/version.txt
+++ b/version.txt
@@ -1,8 +1,9 @@
 {
-"version": "3.10.0",
+"version": "3.10.0.1",
 "branch": "beta",
-"last_changes": "Beta version derived from 3.10 master",
+"last_changes": "Publictransport: Fix for OVAPI",
 "changelog" : {
+            "3.10.0": "Beta derived from 3.10",
             "3.10": "Master version"
             }
 }

From 1c23db716f0edcd4cbc635f877872532a373f37d Mon Sep 17 00:00:00 2001
From: Lokonli <sander.lokerse@gmail.com>
Date: Tue, 27 Dec 2022 23:50:22 +0100
Subject: [PATCH 4/5] Update loader.js

---
 js/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/loader.js b/js/loader.js
index cd12a060..8b87d84a 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -1,6 +1,6 @@
 /*global loadFiles dashtype */
 
-var _DASHTICZ_VERSION=57;
+var _DASHTICZ_VERSION=58;
 var head = document.getElementsByTagName('head')[0],
  script = document.createElement('script');
  

From 3908fa51585e7297c5500eeeee0f57b99ee0fb06 Mon Sep 17 00:00:00 2001
From: lokonli <sander.lokerse@gmail.com>
Date: Tue, 27 Dec 2022 23:52:53 +0100
Subject: [PATCH 5/5] v3.10.0.1 master: Fix for OVAPI

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index c9ed6ba6..9f7cd6bf 100644
--- a/version.txt
+++ b/version.txt
@@ -1,6 +1,6 @@
 {
 "version": "3.10.0.1",
-"branch": "beta",
+"branch": "master",
 "last_changes": "Publictransport: Fix for OVAPI",
 "changelog" : {
             "3.10.0": "Beta derived from 3.10",