Merge branch 'release/2.14.0'

tchapgouv · Nov 26, 2024 · 460eea3 · 460eea3
2 parents e4d5055 + 88d6cdf
commit 460eea3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md
@@ -1,3 +1,10 @@
+Changes in Tchap 2.14.0 (2024-11-26)
+====================================
+
+Features ✨
+----------
+ - Activation des appels vidéos sur toutes les instances. ([#1136](https://github.com/tchapgouv/tchap-android/issues/1136))
+
 Changes in Tchap 2.13.11 (2024-11-16)
 =====================================
 

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

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -33,11 +33,11 @@ knit {
 
 // Note: 2 digits max for each value
 ext.versionMajor = 2
-ext.versionMinor = 13
+ext.versionMinor = 14
 // 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 = 11
+ext.versionPatch = 0
 
 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
@@ -5,10 +5,5 @@
     <bool name="tchap_is_thread_enabled">false</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>
-        <item>agent.education.tchap.gouv.fr</item>
-        <item>agent.tchap.gouv.fr</item>
-        <item>agent.intradef.tchap.gouv.fr</item>
-    </string-array>
+    <string-array name="tchap_is_visio_supported_homeservers" translatable="false" />
 </resources>