1aa3337cba
Merge tag 'v1.6.3' into sc
...
tag
Change-Id: I59d0cd559bb0aba334dc8662500670d91d00906c
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
2023-06-27 20:13:46 +02:00
36b97b1647
Merge branch 'main' of github.com:vector-im/element-android into jonny/feat/rich-text-mentions
2023-06-09 16:05:46 +01:00
f440628208
Merge tag 'v1.6.2' into sc
...
Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
2023-06-05 14:59:06 +02:00
7f8a19f194
Bump org.checkerframework:checker from 3.34.0 to 3.35.0 ( #8497 )
2023-06-02 09:59:16 +00:00
d9c1ec588d
Merge tag 'v1.6.0' into sc
...
v1.6.0
Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b
Conflicts:
library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/build.gradle
vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
vector/src/main/res/layout/dialog_disclaimer_content.xml
vector/src/main/res/xml/vector_settings_help_about.xml
2023-05-22 14:19:46 +02:00
2d1dcd34c0
Add mentions to rich text editor
2023-05-18 13:09:26 +01:00
9fbf34f7e5
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.10 to 1.8.21
...
Bumps [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.8.10 to 1.8.21.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.10...v1.8.21 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-05-05 09:09:58 +00:00
aaa6e7255c
Merge pull request #8385 from vector-im/dependabot/gradle/org.checkerframework-checker-3.34.0
...
Bump org.checkerframework:checker from 3.33.0 to 3.34.0
2023-05-03 14:18:35 +02:00
492115d702
Bump org.checkerframework:checker from 3.33.0 to 3.34.0
...
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework ) from 3.33.0 to 3.34.0.
- [Release notes](https://github.com/typetools/checker-framework/releases )
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.33.0...checker-framework-3.34.0 )
---
updated-dependencies:
- dependency-name: org.checkerframework:checker
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-05-02 23:58:54 +00:00
48f4ad412f
Jitsi 8.1.1
2023-05-02 14:38:40 +02:00
acdf419768
Merge tag 'v1.5.32' into sc
...
Note: mainly conflicts in differing implementations to fix duplicate
read receipts.
After a quick glance at the upstream implementation, my first impression
is that we likely want to keep our downstream implementation:
- Better performance by checking for the more recent receipt in the SDK
upon receipt receival, instead on rendering the timeline
- null seems to always map to main, which caused us jumping receipts in
the past, which we have addressed by now
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
Change-Id: I47ae2afe5fcbe77a4fec69374d83821b94a431de
2023-04-20 10:53:09 +02:00
3e1b59d062
Merge branch 'develop' into feature/bca/rust_flavor
2023-04-06 08:53:20 +02:00
9490ddf53f
Merge pull request #8301 from vector-im/dependabot/gradle/org.checkerframework-checker-3.33.0
...
Bump org.checkerframework:checker from 3.32.0 to 3.33.0
2023-04-06 08:48:32 +02:00
965ba93de4
Merge tag 'v1.5.30' into sc
...
Version 1.5.30
Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9
Conflicts:
dependencies.gradle
dependencies_groups.gradle
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
vector/src/main/res/drawable/ic_composer_rich_text_save.xml
2023-04-05 11:28:26 +02:00
dcf0541fe0
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.14.0 to 0.16.0
...
Bumps [com.gabrielittner.threetenbp:lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp ) from 0.14.0 to 0.16.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases )
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md )
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.14.0...0.16.0 )
---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-04-04 00:02:23 +00:00
8480c41c3d
Bump org.checkerframework:checker from 3.32.0 to 3.33.0
...
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework ) from 3.32.0 to 3.33.0.
- [Release notes](https://github.com/typetools/checker-framework/releases )
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.32.0...checker-framework-3.33.0 )
---
updated-dependencies:
- dependency-name: org.checkerframework:checker
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-04-03 23:58:28 +00:00
927f7757cd
Merge branch 'develop' into feature/bca/rust_flavor
2023-03-28 17:17:35 +02:00
483879c5ef
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.13.0 to 0.14.0 ( #8275 )
...
Bumps [com.gabrielittner.threetenbp:lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp ) from 0.13.0 to 0.14.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases )
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md )
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.13.0...0.14.0 )
---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-24 09:28:28 +01:00
68f05e0687
Bump androidx.emoji2:emoji2 from 1.2.0 to 1.3.0 ( #8266 )
...
Bumps androidx.emoji2:emoji2 from 1.2.0 to 1.3.0.
---
updated-dependencies:
- dependency-name: androidx.emoji2:emoji2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-23 08:18:03 +01:00
5f185c51e7
Merge branch 'develop' into feature/bca/rust_flavor
2023-03-09 18:21:41 +01:00
19881a9f70
Merge tag 'v1.5.28' into sc
...
Change-Id: Ic5e1c79d3c39476375bf795bb7a1abb67c664f94
Conflicts:
dependencies.gradle
vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
2023-03-08 20:27:57 +01:00
7c23776ea1
Bump org.checkerframework:checker from 3.30.0 to 3.32.0 ( #8197 )
...
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework ) from 3.30.0 to 3.32.0.
- [Release notes](https://github.com/typetools/checker-framework/releases )
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.30.0...checker-framework-3.32.0 )
---
updated-dependencies:
- dependency-name: org.checkerframework:checker
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-07 15:53:34 +00:00
5988a6374b
Merge pull request #8101 from vector-im/dependabot/gradle/androidx.browser-browser-1.5.0
...
Bump androidx.browser:browser from 1.4.0 to 1.5.0
2023-03-02 13:59:59 +01:00
a331d907ce
Bump com.posthog.android:posthog from 2.0.2 to 2.0.3
...
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android ) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/PostHog/posthog-android/releases )
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md )
- [Commits](https://github.com/PostHog/posthog-android/compare/2.0.2...2.0.3 )
---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-23 23:58:26 +00:00
38c8e30541
Merge tag 'v1.5.26' into sc
...
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d
Conflicts:
dependencies.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
vector/src/main/res/drawable/ic_rich_composer_add.xml
vector/src/main/res/drawable/ic_rich_composer_send.xml
2023-02-23 11:55:21 +01:00
e9a2cf4834
Bump com.posthog.android:posthog from 2.0.1 to 2.0.2 ( #8155 )
...
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android ) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/PostHog/posthog-android/releases )
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md )
- [Commits](https://github.com/PostHog/posthog-android/compare/2.0.1...2.0.2 )
---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-22 08:44:53 +01:00
9521814f32
Support webp rendering in the timeline
...
Change-Id: I701cc96bdc466e1de961222e30d25289a159557e
2023-02-19 10:10:42 +01:00
35b7860ec2
Bump androidx.browser:browser from 1.4.0 to 1.5.0
...
Bumps androidx.browser:browser from 1.4.0 to 1.5.0.
---
updated-dependencies:
- dependency-name: androidx.browser:browser
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-08 23:03:07 +00:00
51274af2fe
Merge tag 'v1.5.24' into sc
...
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
4ba84ddc82
Merge pull request #8064 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.8.10
...
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10
2023-02-07 14:30:50 +01:00
b48e6f5d71
Merge branch 'develop' into feature/bca/rust_flavor
2023-02-06 10:29:00 +01:00
cfd598b3dd
Bump org.checkerframework:checker from 3.29.0 to 3.30.0
...
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework ) from 3.29.0 to 3.30.0.
- [Release notes](https://github.com/typetools/checker-framework/releases )
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.29.0...checker-framework-3.30.0 )
---
updated-dependencies:
- dependency-name: org.checkerframework:checker
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-02 23:04:17 +00:00
a8be83917a
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10
...
Bumps [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.8.0 to 1.8.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-02 23:03:38 +00:00
af26b10ee2
Bump com.posthog.android:posthog from 2.0.0 to 2.0.1
...
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android ) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/PostHog/posthog-android/releases )
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md )
- [Commits](https://github.com/PostHog/posthog-android/compare/2.0.0...2.0.1 )
---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 23:13:55 +00:00
d8bd92c413
Merge tag 'v1.5.22' into sc
...
Change-Id: I3e8db4d0d0d6afa0f47c9daa0f809410938674e0
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/CheckIfCanReplyEventUseCase.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
2023-01-26 19:49:36 +01:00
d4cb55eeaa
Merge tag 'v1.5.20' into sc
...
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680
Conflicts:
dependencies.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
vector/src/main/res/xml/vector_settings_advanced_settings.xml
2023-01-13 14:50:46 +01:00
c0397875f0
Merge branch 'develop' into feature/bca/rust_flavor
2023-01-12 14:51:03 +01:00
242596744a
Use Fragment 1.6.0 alpha to fix issue with test
...
https://issuetracker.google.com/issues/128612536
2023-01-11 12:13:45 +01:00
d686d7aab2
Project property value can only be strings.
...
Fix
> Failed to notify project evaluation listener.
> Could not create task ':element-android:matrix-sdk-android:compileDebugAndroidTestKotlin'.
> Could not create task of type 'KotlinCompile'.
> class java.util.LinkedHashMap cannot be cast to class java.lang.String (java.util.LinkedHashMap and java.lang.String are in module java.base of loader 'bootstrap')
2023-01-11 12:13:00 +01:00
2614911631
Bump kotlin-reflect from 1.7.22 to 1.8.0
...
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.7.22 to 1.8.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 12:13:00 +01:00
4c4f3ff11d
Merge pull request #7810 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.13.0
...
Bump lazythreetenbp from 0.12.0 to 0.13.0
2023-01-10 14:21:14 +01:00
3bae04c04a
Merge branch 'develop' into feature/bca/rust_flavor
2023-01-09 23:46:14 +01:00
b8da53b3bb
Bump checker from 3.27.0 to 3.29.0 ( #7903 )
...
Bumps [checker](https://github.com/typetools/checker-framework ) from 3.27.0 to 3.29.0.
- [Release notes](https://github.com/typetools/checker-framework/releases )
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.27.0...checker-framework-3.29.0 )
---
updated-dependencies:
- dependency-name: org.checkerframework:checker
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-06 11:56:11 +00:00
3f3db1abda
Bump lazythreetenbp from 0.12.0 to 0.13.0
...
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp ) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases )
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md )
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.12.0...0.13.0 )
---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-16 23:01:56 +00:00
87100a8536
Merge remote-tracking branch 'upstream/develop' into sc
...
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28
Conflicts:
vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2022-12-07 14:56:07 +01:00
03379a6636
Merge branch 'develop' into feature/bca/rust_flavor
2022-12-03 11:15:46 +01:00
c20500ab7a
Merge pull request #7590 from vector-im/dependabot/gradle/com.adevinta.android-barista-4.3.0
...
Bump barista from 4.2.0 to 4.3.0
2022-12-01 14:34:53 +01:00
a9b970832e
Merge branch 'develop' into feature/bca/rust_flavor
2022-11-30 11:05:32 +01:00
b58050f496
Bump kotlin-reflect from 1.7.21 to 1.7.22 ( #7665 )
...
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin ) from 1.7.21 to 1.7.22.
- [Release notes](https://github.com/JetBrains/kotlin/releases )
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md )
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-30 09:13:47 +00:00
3eeca39c4b
Merge tag 'v1.5.8' into sc
...
Release 1.5.8
Change-Id: I763148cfe6bb2155682637ce4c339951441b87ce
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
vector/src/main/res/layout/fragment_timeline.xml
2022-11-18 16:11:16 +01:00
SpiritCroc
David Langley
dependabot[bot]
jonnyandrew
Benoit Marty
Benoit Marty
valere
Florian Renaud