Skip to content

Commit 3333d86

Browse files
hughnshughns
committed
Merge branch 'develop' into hughns/msc3824-oidc-aware
2 parents 1ac04b0 + 0cdbcea commit 3333d86

File tree

103 files changed

+2689
-370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+2689
-370
lines changed

‎SECURITY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Reporting a Vulnerability
2+
3+
**If you've found a security vulnerability, please report it to security@matrix.org**
4+
5+
For more information on our security disclosure policy, visit https://www.matrix.org/security-disclosure-policy/

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ plugins {
4545
// Detekt
4646
id "io.gitlab.arturbosch.detekt" version "1.22.0"
4747
// Ksp
48-
id "com.google.devtools.ksp" version "1.7.22-1.0.8"
48+
id "com.google.devtools.ksp" version "1.8.0-1.0.8"
4949

5050
// Dependency Analysis
5151
id 'com.autonomousapps.dependency-analysis' version "1.18.0"

‎changelog.d/4025.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix can't get out of a verification dialog

‎changelog.d/7824.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[Poll] Warning message on decryption failure of some events

‎changelog.d/7829.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Handle exceptions when listening a voice broadcast

‎changelog.d/7832.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[Voice Broadcast] Fix unexpected "live broadcast" in the room list

‎changelog.d/7845.wip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[Voice Broadcast] Only display a notification on the first voice chunk

‎changelog.d/7864.wip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[Poll] History list: Load more UI mechanism

‎changelog.d/7936.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade to Kotlin 1.8

‎changelog.d/7938.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix rendering of edited polls

0 commit comments

Comments
 (0)