Skip to content

Commit

Permalink
Merge branch 'release/2.13.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
yostyle committed Oct 1, 2024
2 parents 7a262ad + 48f5829 commit 53c15ea
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
13 changes: 10 additions & 3 deletions TCHAP_CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
Changes in Tchap 2.13.5 (2024-10-01)
====================================

Features ✨
----------
- Activation des appels vidéos pour DINUM. ([#1098](https://github.com/tchapgouv/tchap-android/issues/1098))

Changes in Tchap 2.13.4 (2024-09-19)
====================================

Features ✨
----------
- Activation des appels vidéos pour Éducation. ([#1106](https://github.com/tchapgouv/tchap-android/issues/1106))
- Activation des appels vidéos pour Éducation en beta externe. ([#1106](https://github.com/tchapgouv/tchap-android/issues/1106))

Bugfixes 🐛
----------
Expand All @@ -15,7 +22,7 @@ Changes in Tchap 2.13.3 (2024-08-02)

Features ✨
----------
- Activation des appels vidéos pour DINUM uniquement. ([#1098](https://github.com/tchapgouv/tchap-android/issues/1098))
- Activation des appels vidéos pour DINUM en beta externe. ([#1098](https://github.com/tchapgouv/tchap-android/issues/1098))

Changes in Tchap 2.13.2 (2024-08-01)
====================================
Expand Down Expand Up @@ -56,7 +63,7 @@ Changes in Tchap 2.12.0 (2024-07-22)

Features ✨
----------
- Forcer la génération du code de récupération et la sauvegarde automatique. ([#988](https://github.com/tchapgouv/tchap-android/issues/988))
- Forcer la génération du code de récupération et la sauvegarde automatique en beta externe. ([#988](https://github.com/tchapgouv/tchap-android/issues/988))

Improvements 🙌
--------------
Expand Down
2 changes: 1 addition & 1 deletion towncrier.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.towncrier]
version = "2.13.4"
version = "2.13.5"
directory = "changelog.d"
filename = "TCHAP_CHANGES.md"
name = "Changes in Tchap"
Expand Down
2 changes: 1 addition & 1 deletion vector-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 4
ext.versionPatch = 5

static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
Expand Down
3 changes: 1 addition & 2 deletions vector-config/src/tchap/res/values/config-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
<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>
<item>agent.education.tchap.gouv.fr</item>
</string-array>
</resources>

0 comments on commit 53c15ea

Please sign in to comment.