Merge branch 'release/2.13.7'

tchapgouv · Oct 31, 2024 · b6ee9d3 · b6ee9d3
2 parents e9520c1 + 1ce6c6c
commit b6ee9d3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,10 @@
+Changes in Tchap 2.13.7 (2024-10-31)
+====================================
+
+Features ✨
+----------
+- Ne pas forcer la génération du code de récupération et la sauvegarde automatique en production.
+
 Changes in Tchap 2.13.6 (2024-10-30)
 ====================================
 

diff --git a/towncrier.toml b/towncrier.toml
@@ -1,5 +1,5 @@
 [tool.towncrier]
-    version = "2.13.6"
+    version = "2.13.7"
     directory = "changelog.d"
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 13
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 6
+ext.versionPatch = 7
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml
@@ -3,7 +3,7 @@
     <bool name="tchap_is_cross_signing_enabled">true</bool>
     <bool name="tchap_is_key_backup_enabled">true</bool>
     <bool name="tchap_is_thread_enabled">false</bool>
-    <bool name="tchap_is_secure_backup_required">true</bool>
+    <bool name="tchap_is_secure_backup_required">false</bool>
 
     <string-array name="tchap_is_visio_supported_homeservers" translatable="false">
         <item>agent.dinum.tchap.gouv.fr</item>