Skip to content

Commit 1ac04b0

Browse files
committed
Merge branch 'develop' into hughns/msc3824-oidc-aware
2 parents 51f227a + 83798ef commit 1ac04b0

File tree

61 files changed

+707
-104
lines changed

Some content is hidden

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

61 files changed

+707
-104
lines changed

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- run: |
1212
npm install --save-dev @babel/plugin-transform-flow-strip-types
1313
- name: Danger
14-
uses: danger/danger-js@11.2.0
14+
uses: danger/danger-js@11.2.1
1515
with:
1616
args: "--dangerfile ./tools/danger/dangerfile.js"
1717
env:

.github/workflows/quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
yarn add danger-plugin-lint-report --dev
6767
- name: Danger lint
6868
if: always()
69-
uses: danger/danger-js@11.2.0
69+
uses: danger/danger-js@11.2.1
7070
with:
7171
args: "--dangerfile ./tools/danger/dangerfile-lint.js"
7272
env:

CHANGES.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
Changes in Element v1.5.20 (2023-01-10)
2+
=======================================
3+
4+
Features ✨
5+
----------
6+
- "[Rich text editor] Add list formatting buttons to the rich text editor" ([#7887](https://github.com/vector-im/element-android/issues/7887))
7+
8+
Bugfixes 🐛
9+
----------
10+
- ReplyTo are not updated if the original message is edited or deleted. ([#5546](https://github.com/vector-im/element-android/issues/5546))
11+
- Observe ViewEvents only when resumed and ensure ViewEvents are not lost. ([#7724](https://github.com/vector-im/element-android/issues/7724))
12+
- [Session manager] Missing info when a session does not support encryption ([#7853](https://github.com/vector-im/element-android/issues/7853))
13+
- Reduce number of crypto database transactions when handling the sync response ([#7879](https://github.com/vector-im/element-android/issues/7879))
14+
- [Voice Broadcast] Stop listening if we reach the last received chunk and there is no last sequence number ([#7899](https://github.com/vector-im/element-android/issues/7899))
15+
- Handle network error on API `rooms/{roomId}/threads` ([#7913](https://github.com/vector-im/element-android/issues/7913))
16+
17+
In development 🚧
18+
----------------
19+
- [Poll] Render active polls list of a room
20+
- [Poll] Render past polls list of a room ([#7864](https://github.com/vector-im/element-android/issues/7864))
21+
22+
Other changes
23+
-------------
24+
- fix: increase font size for messages ([#5717](https://github.com/vector-im/element-android/issues/5717))
25+
- Add trim to username input on the app side and SDK side when sign-in ([#7111](https://github.com/vector-im/element-android/issues/7111))
26+
27+
128
Changes in Element v1.5.18 (2023-01-02)
229
=======================================
330

Gemfile.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ GEM
127127
xcpretty (~> 0.3.0)
128128
xcpretty-travis-formatter (>= 0.0.3)
129129
gh_inspector (1.1.3)
130-
git (1.11.0)
130+
git (1.13.0)
131+
addressable (~> 2.8)
131132
rchardet (~> 1.8)
132133
google-apis-androidpublisher_v3 (0.25.0)
133134
google-apis-core (>= 0.7, < 2.a)

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ buildscript {
2727
classpath 'com.google.firebase:firebase-appdistribution-gradle:3.1.1'
2828
classpath 'com.google.gms:google-services:4.3.14'
2929
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730'
30-
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
31-
classpath "com.likethesalad.android:stem-plugin:2.2.3"
30+
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
31+
classpath "com.likethesalad.android:stem-plugin:2.3.0"
3232
classpath 'org.owasp:dependency-check-gradle:7.4.4'
3333
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
3434
classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
@@ -48,7 +48,7 @@ plugins {
4848
id "com.google.devtools.ksp" version "1.7.22-1.0.8"
4949

5050
// Dependency Analysis
51-
id 'com.autonomousapps.dependency-analysis' version "1.17.0"
51+
id 'com.autonomousapps.dependency-analysis' version "1.18.0"
5252
// Gradle doctor
5353
id "com.osacky.doctor" version "0.8.1"
5454
}

changelog.d/5546.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/7724.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/7853.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/7864.wip

Lines changed: 0 additions & 2 deletions
This file was deleted.

changelog.d/7879.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)