Skip to content

Commit 7badf77

Browse files
authored
Merge branch 'develop' into feature/nfe/app_layout_tests
2 parents 32fcdad + 31a0a04 commit 7badf77

File tree

282 files changed

+3686
-1155
lines changed

Some content is hidden

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

282 files changed

+3686
-1155
lines changed

CHANGES.md

Lines changed: 43 additions & 0 deletions

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ 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'
30+
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
3131
classpath "com.likethesalad.android:stem-plugin:2.2.3"
32-
classpath 'org.owasp:dependency-check-gradle:7.4.1'
32+
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"
3535
classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'

changelog.d/2965.bugfix

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

changelog.d/5546.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ReplyTo are not updated if the original message is edited or deleted.

changelog.d/7111.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add trim to username input on the app side and SDK side when sign-in

changelog.d/7475.bugfix

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

changelog.d/7724.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Observe ViewEvents only when resumed and ensure ViewEvents are not lost.

changelog.d/7746.feature

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

changelog.d/7767.feature

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

0 commit comments

Comments
 (0)