Merge branch 'release/v2.14.0' into develop

# Conflicts: # Config/AppVersion.xcconfig # Podfile
2026-04-17 15:09:31 +02:00 · 2024-01-19 07:34:07 +01:00
parent 604dff68ed e24bdde8c9
commit 103d232337
3 changed files with 49 additions and 1 deletions
--- a/CHANGES_BWI.md
+++ b/CHANGES_BWI.md
@@ -1,3 +1,29 @@
+Changes in BWI project 2.14.0 (2024-01-16)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+- Change federation setting in room settings (disabled) (#5410)
+- Change fedration setting on room creation (disabled) (#4846)
+
+Improvements 🙌:
+- Federation info about users in member details (disabled) (#5204)
+
+Bugfix 🐛:
+- Better handling of permalink prefix on testservers (#5158)
+- Outdated app versions shown as pop up (#5276)
+- Copyright claims for location sharing set correctly from style.json (#5279)
+- Corrected appstore link for app version popup (#5276)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+- Enable Renovate
+- Fix Sonarcube warnings
+
 Changes in BWI project 2.12.1 (2023-12-11)
 ===================================================

--- a/Config/BWIBuildSettings.swift
+++ b/Config/BWIBuildSettings.swift
@@ -207,7 +207,8 @@ class BWIBuildSettings: NSObject {
                      "cca10f6b4b583da69bbd3815ee0fccd193cf0cfd046aee1aeffaa7b5245e8f83",
                      "36a9ec7368bddedd9deb1e2d1c627bd7304865135c9be30b1979659e3ac9ad07",
                      "dbaf8618e8a2f8d681591dfbcc73243c921c10dec69a2e5ee50bc91ca7dedcda",
-                      "ed1af0fd873ec749f17c3b61ce4e481ab1644c132003f97a9c4e36516325788a"
+                      "ed1af0fd873ec749f17c3b61ce4e481ab1644c132003f97a9c4e36516325788a",
+                      "081e6ef90ba86102d678756fd13b07ca744340ad4d58a340e1956dca992f18e3"
    ]
    
    // use a different badge color if the user was mentioned in a room
--- a/Riot/Assets/new_features.html
+++ b/Riot/Assets/new_features.html
@@ -26,6 +26,27 @@
    </style>
 </head>
 <body>
+    <div>
+        <p>
+        <b>Version 2.14.0</b>
+        </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Du kannst jetzt den neuen WYSIWYG Editor in den Einstellungen ein- und ausschalten
+            <li/>In den Nutzerdetails wird die ID des Nutzers angezeigt.
+        </ul>
+        </p>
+        
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Die Copyrighthinweise in den Landkarten werden korrekt angezeigt.
+            <li/>
+        </ul>
+        </p>
+    </div>
    <div>
        <p>
        <b>Version 2.12.1</b>