From 46be4ca6d148c14c27385aaeeee2880e7e9bf7cd Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Tue, 31 May 2022 22:11:07 +0200
Subject: [PATCH 1/2] :bug: Fix problem with font loading

---
 frontend/src/app/util/text_svg_position.cljs | 22 +++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/util/text_svg_position.cljs b/frontend/src/app/util/text_svg_position.cljs
index 007e60cd7..5e00aa731 100644
--- a/frontend/src/app/util/text_svg_position.cljs
+++ b/frontend/src/app/util/text_svg_position.cljs
@@ -7,6 +7,7 @@
 (ns app.util.text-svg-position
   (:require
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.geom.point :as gpt]
    [app.common.transit :as transit]
    [app.main.fonts :as fonts]
@@ -43,13 +44,20 @@
   [^js node]
 
   (let [styles (js/getComputedStyle node)
-        font (.getPropertyValue styles "font")]
-    (if (dom/check-font? font)
-      (p/resolved font)
-      (let [font-id (.getPropertyValue styles "--font-id")]
-        (-> (fonts/ensure-loaded! font-id)
-            (p/then #(when (not (dom/check-font? font))
-                       (load-font font))))))))
+        font (.getPropertyValue styles "font")
+        font (if (or (not font) (empty? font))
+               ;; Firefox 95 won't return the font correctly.
+               ;; We can get the font shorthand with the font-size + font-family
+               (dm/str (.getPropertyValue styles "font-size")
+                       " "
+                       (.getPropertyValue styles "font-family"))
+               font)
+
+        font-id (.getPropertyValue styles "--font-id")]
+
+    (-> (fonts/ensure-loaded! font-id)
+        (p/then #(when (not (dom/check-font? font))
+                   (load-font font))))))
 
 (defn calc-text-node-positions
   [base-node viewport zoom]

From 0b149dd30251dc90e4779f9e7289f57064452104 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Wed, 1 Jun 2022 10:41:08 +0200
Subject: [PATCH 2/2] :arrow_up: Update to 1.13.3-beta

---
 CHANGES.md  | 12 ++++++++++++
 version.txt |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6a31eae5b..64657c165 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,18 @@
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)
 
+## 1.13.3-beta
+
+### :bug: Bugs fixed
+
+- Fix docker dependencies
+- Sets invitations expirations to 7 days
+- Add safety measure for text positions
+- Fix old texts with opacity and no fill
+- Remove default font on team change
+- Fix github auth without name
+- Fix problems with font loading in Firefox 95
+
 ## 1.13.2-beta
 
 ### :bug: Bugs fixed
diff --git a/version.txt b/version.txt
index 03f0c34ec..d946af738 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.13.2-beta
+1.13.3-beta