From a278777b9c08409efe5bbaa3d3c2a8a81c7d3ea5 Mon Sep 17 00:00:00 2001 From: yostyle Date: Thu, 23 May 2024 09:27:44 +0200 Subject: [PATCH 1/2] Remove security excpetion for openmaptiles.github.io --- towncrier.toml | 2 +- vector-app/build.gradle | 2 +- vector/src/withpinning/res/xml/network_security_config.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/towncrier.toml b/towncrier.toml index 2269978d6e..558b719f8d 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.11.4" + version = "2.11.5" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 7e3264abb7..af841c8220 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -37,7 +37,7 @@ ext.versionMinor = 11 // 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' diff --git a/vector/src/withpinning/res/xml/network_security_config.xml b/vector/src/withpinning/res/xml/network_security_config.xml index 5f97166eaa..d4059276fa 100644 --- a/vector/src/withpinning/res/xml/network_security_config.xml +++ b/vector/src/withpinning/res/xml/network_security_config.xml @@ -13,7 +13,6 @@ firebaseinstallations.googleapis.com - openmaptiles.github.io From f16eb4862286f5719dde0068813c8080f2f9e2d3 Mon Sep 17 00:00:00 2001 From: yostyle Date: Thu, 23 May 2024 09:48:47 +0200 Subject: [PATCH 2/2] Update changelog --- TCHAP_CHANGES.md | 4 ++-- changelog.d/1049.bugfix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/1049.bugfix diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index 52bbf21734..33378e8db3 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -11,7 +11,7 @@ Changes in Tchap 2.11.3 (2024-05-14) Features ✨ ---------- - - Activation des appels vocaux pour toutes les instances. ([#1043](https://github.com/tchapgouv/tchap-android/issues/1043)) + - Activation des appels vocaux pour toutes les instances en beta externe. ([#1043](https://github.com/tchapgouv/tchap-android/issues/1043)) Other changes ------------- @@ -23,7 +23,7 @@ Changes in Tchap 2.11.2 (2024-04-30) Features ✨ ---------- - - Activation des appels vocaux pour les instances Diplomatie et Finances ([#1038](https://github.com/tchapgouv/tchap-android/issues/1038)) + - Activation des appels vocaux pour les instances Diplomatie et Finances en beta externe ([#1038](https://github.com/tchapgouv/tchap-android/issues/1038)) Improvements 🙌 -------------- diff --git a/changelog.d/1049.bugfix b/changelog.d/1049.bugfix deleted file mode 100644 index 20be5adcce..0000000000 --- a/changelog.d/1049.bugfix +++ /dev/null @@ -1 +0,0 @@ -Ajout d'une exception de sécurité pour le domaine openmaptiles.github.io \ No newline at end of file