filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,206 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

593 Commits

Author SHA1 Message Date
Benoit Marty 1b84039407
Merge pull request #3288 from vector-im/dependabot/gradle/androidx.media-media-1.3.1 
Bump media from 1.3.0 to 1.3.1
 2021-05-12 20:58:23 +02:00
Benoit Marty 796bb80868
Merge pull request #3252 from vector-im/dependabot/gradle/com.github.chrisbanes-PhotoView-2.3.0 
Bump PhotoView from 2.1.4 to 2.3.0
 2021-05-12 16:51:12 +02:00
dependabot[bot] cbd9ec33fe
Bump android-snowfall from 1.2.0 to 1.2.1 
Bumps [android-snowfall](https://github.com/JetradarMobile/android-snowfall) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/JetradarMobile/android-snowfall/releases)
- [Changelog](https://github.com/JetradarMobile/android-snowfall/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetradarMobile/android-snowfall/compare/1.2.0...1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 14:50:50 +00:00
Benoit Marty dcc37ec292
Merge pull request #3276 from vector-im/dependabot/gradle/daggerVersion-2.35.1 
Bump daggerVersion from 2.35 to 2.35.1
 2021-05-12 16:50:39 +02:00
dependabot[bot] 58dfe0f924
Bump daggerVersion from 2.35 to 2.35.1 
Bumps `daggerVersion` from 2.35 to 2.35.1.

Updates `dagger` from 2.35 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1)

Updates `dagger-compiler` from 2.35 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 14:50:20 +00:00
Benoit Marty 4b87413b5f
Merge pull request #3278 from vector-im/dependabot/gradle/nl.dionsegijn-konfetti-1.3.2 
Bump konfetti from 1.2.6 to 1.3.2
 2021-05-12 16:50:10 +02:00
Benoit Marty 2709c1e99b
Merge pull request #3321 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-22.0.0 
Bump firebase-messaging from 21.1.0 to 22.0.0
 2021-05-12 16:49:27 +02:00
Benoit Marty a42a9b5e32 Version++ 2021-05-12 15:15:24 +02:00
dependabot[bot] 3ddf181224
Bump firebase-messaging from 21.1.0 to 22.0.0 
Bumps firebase-messaging from 21.1.0 to 22.0.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 05:58:36 +00:00
Philipp Neumann f7d7362a85
Merge branch 'develop' into feature/conversations 2021-05-11 09:41:04 +02:00
dependabot[bot] 711dfe41b7
Bump media from 1.3.0 to 1.3.1 
Bumps media from 1.3.0 to 1.3.1.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-06 07:11:17 +00:00
dependabot[bot] 314ace9208
Bump konfetti from 1.2.6 to 1.3.2 
Bumps [konfetti](https://github.com/DanielMartinus/Konfetti) from 1.2.6 to 1.3.2.
- [Release notes](https://github.com/DanielMartinus/Konfetti/releases)
- [Commits](https://github.com/DanielMartinus/Konfetti/compare/v1.2.6...v1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-05 07:12:55 +00:00
SpiritCroc 39359f7d24 Merge remote-tracking branch 'upstream/develop' into spaces 
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
	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/summary/RoomSummaryDataSource.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
 2021-05-02 12:12:52 +02:00
SpiritCroc ca21a3fc43 Increment version 
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
 2021-05-02 10:03:17 +02:00
dependabot[bot] 5a53838194
Bump PhotoView from 2.1.4 to 2.3.0 
Bumps [PhotoView](https://github.com/Baseflow/PhotoView) from 2.1.4 to 2.3.0.
- [Release notes](https://github.com/Baseflow/PhotoView/releases)
- [Commits](https://github.com/Baseflow/PhotoView/compare/2.1.4...2.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-30 07:06:20 +00:00
Benoit Marty faef2fba9a Enable login v2 by default, but keep the possibility to use v1 2021-04-29 15:57:52 +02:00
Benoit Marty 55f1f56fec `master` branch has been renamed to `main` 
Also in project vector-im/jitsi_libre_maven
 2021-04-29 12:29:52 +02:00
Benoit Marty 264eb3b0a2
Merge pull request #3246 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.22 
Bump libphonenumber from 8.12.21 to 8.12.22
 2021-04-29 11:12:29 +02:00
dependabot[bot] 7593c3f03d
Bump libphonenumber from 8.12.21 to 8.12.22 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.21 to 8.12.22.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.21...v8.12.22)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 07:18:14 +00:00
Valere 0d3c2b4bef Fix space filtering 2021-04-28 11:15:58 +02:00
Philipp Neumann dd7c264483 Added shortcut for conversation notifications 2021-04-28 09:54:05 +02:00
Benoit Marty 8b5d86f68d
Merge pull request #3228 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.5.0 
Bump zxcvbn from 1.4.1 to 1.5.0
 2021-04-26 21:38:10 +02:00
dependabot[bot] 49d1b3e583
Bump zxcvbn from 1.4.1 to 1.5.0 
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.1...1.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-26 14:31:37 +00:00
dependabot[bot] ed9db95aa0
Bump fragment-ktx from 1.3.2 to 1.3.3 
Bumps fragment-ktx from 1.3.2 to 1.3.3.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-26 14:27:59 +00:00
Benoit Marty e3a667cbc6
Merge pull request #3220 from vector-im/dependabot/gradle/daggerVersion-2.35 
Bump daggerVersion from 2.34.1 to 2.35
 2021-04-26 16:27:39 +02:00
Benoit Marty 43b17be7a7
Merge pull request #3216 from vector-im/dependabot/gradle/epoxy_version-4.5.0 
Bump epoxy_version from 4.4.4 to 4.5.0
 2021-04-26 16:26:46 +02:00
dependabot[bot] 7575959c4a
Bump daggerVersion from 2.34.1 to 2.35 
Bumps `daggerVersion` from 2.34.1 to 2.35.

Updates `dagger` from 2.34.1 to 2.35
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35)

Updates `dagger-compiler` from 2.34.1 to 2.35
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-23 07:05:44 +00:00
dependabot[bot] bb48fea116
Bump epoxy_version from 4.4.4 to 4.5.0 
Bumps `epoxy_version` from 4.4.4 to 4.5.0.

Updates `epoxy` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-glide-preloading` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-processor` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-paging` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-20 17:59:41 +00:00
Benoit Marty fe9bd38115
Merge pull request #3175 from vector-im/dependabot/gradle/daggerVersion-2.34.1 
Bump daggerVersion from 2.34 to 2.34.1
 2021-04-20 19:58:48 +02:00
Benoit Marty 47134c39af
Merge pull request #3174 from vector-im/dependabot/gradle/big_image_viewer_version-1.8.0 
Bump big_image_viewer_version from 1.7.1 to 1.8.0
 2021-04-20 19:58:36 +02:00
Benoit Marty 5e3d8a5424
Merge pull request #3173 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.4.1 
Bump zxcvbn from 1.4.0 to 1.4.1
 2021-04-20 19:58:12 +02:00
SpiritCroc 2ae0fb8886 Merge tag 'v1.1.6' into sc 
Change-Id: I80d2ce9bdcb22c2fcc9795d3a5c727cb5ba772a6
 2021-04-16 15:32:18 +02:00
Benoit Marty 19427fbfec merge hotfix to develop 2021-04-16 14:36:15 +02:00
Benoit Marty 72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
SpiritCroc 28c5f036c8 Merge tag 'v1.1.5' into sc 
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
 2021-04-15 12:29:59 +02:00
Benoit Marty 9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty 59637c4a6b Revert to Realm 10.3.1 to fix issue with migration 
Waiting for https://github.com/realm/realm-java/issues/7402
 2021-04-14 21:54:07 +02:00
dependabot[bot] 30b415e77e
Bump daggerVersion from 2.34 to 2.34.1 
Bumps `daggerVersion` from 2.34 to 2.34.1.

Updates `dagger` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Updates `dagger-compiler` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:09:19 +00:00
dependabot[bot] 39f304a57b
Bump big_image_viewer_version from 1.7.1 to 1.8.0 
Bumps `big_image_viewer_version` from 1.7.1 to 1.8.0.

Updates `BigImageViewer` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `GlideImageLoader` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `ProgressPieIndicator` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `GlideImageViewFactory` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:09:03 +00:00
dependabot[bot] afe617357d
Bump zxcvbn from 1.4.0 to 1.4.1 
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.0...1.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:08:48 +00:00
SpiritCroc 0e601aa8f0 Merge tag 'v1.1.4' into sc 
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

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/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
 2021-04-13 09:28:13 +02:00
SpiritCroc d329f08162 Increment version 
Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5
 2021-04-12 10:57:35 +02:00
Benoit Marty 6d46bfc260
Merge pull request #3148 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.1.0 
Bump firebase-messaging from 21.0.1 to 21.1.0
 2021-04-09 16:39:05 +02:00
Benoit Marty d40f2ef463
Merge pull request #3139 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0 
Bump recyclerview from 1.2.0-rc01 to 1.2.0
 2021-04-09 16:38:53 +02:00
Benoit Marty 8d1b56d526
Merge pull request #3138 from vector-im/dependabot/gradle/androidx.media-media-1.3.0 
Bump media from 1.2.1 to 1.3.0
 2021-04-09 16:38:39 +02:00
Benoit Marty 388e4eb112
Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34 
Bump daggerVersion from 2.33 to 2.34
 2021-04-09 16:38:25 +02:00
Benoit Marty bec6cfc46d Version++ 2021-04-09 12:42:59 +02:00
Marcus Hoffmann 1f37da276e propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs 
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
Change-Id: Ifadfef30a6b3f3040e98713fa21dbc4e2ee94a9b
 2021-04-09 12:25:47 +02:00
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc 
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
 2021-04-09 11:57:11 +02:00
dependabot[bot] b5b651244b
Bump firebase-messaging from 21.0.1 to 21.1.0 
Bumps firebase-messaging from 21.0.1 to 21.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-09 07:25:53 +00:00
dependabot[bot] 68efa63de4
Bump recyclerview from 1.2.0-rc01 to 1.2.0 
Bumps recyclerview from 1.2.0-rc01 to 1.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:33 +00:00
dependabot[bot] 3ca00969c5
Bump media from 1.2.1 to 1.3.0 
Bumps media from 1.2.1 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:22:02 +00:00
dependabot[bot] 505b01ad97
Bump daggerVersion from 2.33 to 2.34 
Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-08 07:19:20 +00:00
Marcus Hoffmann 62038e8a89 propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs 
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
 2021-04-06 20:55:48 +02:00
Benoit Marty 7d88d038f5
Merge pull request #3102 from vector-im/dependabot/gradle/moshi_version-1.12.0 
Bump moshi_version from 1.11.0 to 1.12.0
 2021-04-06 14:22:12 +02:00
dependabot[bot] 0addb3aeee
Bump libphonenumber from 8.12.20 to 8.12.21 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.20 to 8.12.21.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.20...v8.12.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-06 07:20:12 +00:00
dependabot[bot] fcc635ac8f
Bump moshi_version from 1.11.0 to 1.12.0 
Bumps `moshi_version` from 1.11.0 to 1.12.0.

Updates `moshi-adapters` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Updates `moshi-kotlin-codegen` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-02 07:19:53 +00:00
Benoit Marty c0913711d6
Merge pull request #3059 from vector-im/dependabot/gradle/epoxy_version-4.4.4 
Bump epoxy_version from 4.4.3 to 4.4.4
 2021-03-31 17:57:05 +02:00
dependabot[bot] 57df510ecb
Bump stetho from 1.5.1 to 1.6.0 
Bumps [stetho](https://github.com/facebook/stetho) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/facebook/stetho/releases)
- [Changelog](https://github.com/facebook/stetho/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/stetho/compare/v1.5.1...v1.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-31 06:58:20 +00:00
dependabot[bot] 980d057b4a
Bump epoxy_version from 4.4.3 to 4.4.4 
Bumps `epoxy_version` from 4.4.3 to 4.4.4.

Updates `epoxy` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-glide-preloading` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-processor` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-paging` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-29 14:46:27 +00:00
Benoit Marty 11a56dacb6
Merge pull request #3054 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.2 
Bump fragment-ktx from 1.3.0 to 1.3.2
 2021-03-25 13:57:02 +01:00
dependabot[bot] ee1059f1db
Bump fragment-ktx from 1.3.0 to 1.3.2 
Bumps fragment-ktx from 1.3.0 to 1.3.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-25 06:33:50 +00:00
dependabot[bot] 30515492ca
Bump recyclerview from 1.2.0-beta02 to 1.2.0-rc01 
Bumps recyclerview from 1.2.0-beta02 to 1.2.0-rc01.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-25 06:31:57 +00:00
dependabot[bot] 973e111dad
Bump epoxy_version from 4.4.2 to 4.4.3 
Bumps `epoxy_version` from 4.4.2 to 4.4.3.

Updates `epoxy` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-glide-preloading` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-processor` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-paging` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-18 12:12:17 +00:00
Benoit Marty 2f2bc758d7
Merge pull request #3022 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.20 
Bump libphonenumber from 8.12.19 to 8.12.20
 2021-03-18 13:11:41 +01:00
Benoit Marty 3078adf0da Version++ 2021-03-18 10:40:33 +01:00
dependabot[bot] 8e85d5515d
Bump libphonenumber from 8.12.19 to 8.12.20 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.19 to 8.12.20.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.19...v8.12.20)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-18 07:18:33 +00:00
Benoit Marty 5edf7ca520 Version++ 2021-03-16 22:31:25 +01:00
SpiritCroc 699ad4eaeb Merge tag 'v1.1.1' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-03-14 10:58:57 +01:00
Benoit Marty b5fa61c8aa
Merge pull request #2983 from vector-im/dependabot/gradle/com.schibsted.spain-barista-3.9.0 
Bump barista from 3.8.0 to 3.9.0
 2021-03-11 22:44:54 +01:00
Benoit Marty 4b8c59a23b Fix crash on ViewSource of event 2021-03-11 14:14:55 +01:00
dependabot[bot] 507eba3ddb
Bump barista from 3.8.0 to 3.9.0 
Bumps barista from 3.8.0 to 3.9.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-10 21:08:12 +00:00
Benoit Marty 4e3ad91c67 Version++ 2021-03-10 22:05:31 +01:00
Benoit Marty 263ad899d8 Setup com.likethesalad.android:string-reference to have compilation time build of Strings resource with the app_name 2021-03-03 17:30:57 +01:00
Onuray Sahin 8b39eabc0f Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin a623395585 Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin ae648c3e11 Make outbound key sharing strategy configurable. 2021-03-02 18:49:11 +01:00
dependabot[bot] a9f923591d
Bump barista from 3.7.0 to 3.8.0 
Bumps barista from 3.7.0 to 3.8.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-02 15:32:08 +00:00
Benoit Marty 7d7e4a0e6d
Merge pull request #2945 from vector-im/dependabot/gradle/big_image_viewer_version-1.7.1 
Bump big_image_viewer_version from 1.7.0 to 1.7.1
 2021-03-02 16:30:57 +01:00
dependabot[bot] 161804be0d
Bump big_image_viewer_version from 1.7.0 to 1.7.1 
Bumps `big_image_viewer_version` from 1.7.0 to 1.7.1.

Updates `BigImageViewer` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `GlideImageLoader` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `ProgressPieIndicator` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `GlideImageViewFactory` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-02 10:39:41 +00:00
Benoit Marty 32e7845c2b
Merge pull request #2943 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.19 
Bump libphonenumber from 8.12.18 to 8.12.19
 2021-03-02 11:39:38 +01:00
dependabot[bot] 8c87716013
Bump libphonenumber from 8.12.18 to 8.12.19 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.18 to 8.12.19.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.18...v8.12.19)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-02 06:59:54 +00:00
dependabot[bot] 5f29668c27
Bump epoxy_version from 4.4.1 to 4.4.2 
Bumps `epoxy_version` from 4.4.1 to 4.4.2.

Updates `epoxy` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-glide-preloading` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-processor` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-paging` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-02 06:57:55 +00:00
Benoit Marty f7bcc521d2
Merge pull request #2917 from vector-im/dependabot/gradle/epoxy_version-4.4.1 
Bump epoxy_version from 4.4.0 to 4.4.1
 2021-03-01 10:56:22 +01:00
Benoit Marty 3a20792668
Merge pull request #2918 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0-beta02 
Bump recyclerview from 1.2.0-beta01 to 1.2.0-beta02
 2021-03-01 10:56:10 +01:00
SpiritCroc ff08370cd7 Increment version 
Change-Id: I8bf35900b2ab99c1cacd7d360ce653918cea200b
 2021-02-26 12:59:31 +01:00
dependabot[bot] f6123d8dfd
Bump daggerVersion from 2.32 to 2.33 
Bumps `daggerVersion` from 2.32 to 2.33.

Updates `dagger` from 2.32 to 2.33
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33)

Updates `dagger-compiler` from 2.32 to 2.33
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-26 07:14:10 +00:00
dependabot[bot] 8c23b0561b
Bump recyclerview from 1.2.0-beta01 to 1.2.0-beta02 
Bumps recyclerview from 1.2.0-beta01 to 1.2.0-beta02.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-25 07:20:31 +00:00
dependabot[bot] 6ec8be0d35
Bump epoxy_version from 4.4.0 to 4.4.1 
Bumps `epoxy_version` from 4.4.0 to 4.4.1.

Updates `epoxy` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-glide-preloading` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-processor` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-paging` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-25 07:18:51 +00:00
dependabot[bot] 76923ad88a Bump alerter from 5.1.2 to 7.0.1 
Bumps [alerter](https://github.com/Tapadoo/Alerter) from 5.1.2 to 7.0.1.
- [Release notes](https://github.com/Tapadoo/Alerter/releases)
- [Changelog](https://github.com/Tapadoo/Alerter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Tapadoo/Alerter/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-21 16:16:55 +01:00
dependabot[bot] 4465d87eb8 Bump browser from 1.2.0 to 1.3.0 
Bumps browser from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-21 11:10:00 +01:00
Benoit Marty 370651ab56 Dependabot will create only 1 PR to upgrade RxBinding dependencies 2021-02-21 10:43:35 +01:00
Benoit Marty c985639691
Merge pull request #2883 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0-beta01 
Bump recyclerview from 1.2.0-alpha06 to 1.2.0-beta01
 2021-02-21 00:09:48 +01:00
Benoit Marty 580c48d4f9
Merge pull request #2868 from vector-im/dependabot/gradle/com.google.android-flexbox-2.0.1 
Bump flexbox from 1.1.1 to 2.0.1
 2021-02-21 00:09:15 +01:00
Benoit Marty e612e66ac9
Merge pull request #2865 from vector-im/dependabot/gradle/com.jakewharton.rxbinding3-rxbinding-material-3.1.0 
Bump rxbinding-material from 3.0.0 to 3.1.0
 2021-02-21 00:08:16 +01:00
Benoit Marty ec2493c03c
Merge pull request #2869 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.0 
Bump fragment-ktx from 1.3.0-beta01 to 1.3.0
 2021-02-21 00:07:56 +01:00
Benoit Marty 4a510d583d
Merge pull request #2876 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.5.0 
Bump work-runtime-ktx from 2.4.0 to 2.5.0
 2021-02-21 00:07:28 +01:00
Benoit Marty ff4643be8c
Merge pull request #2858 from vector-im/dependabot/gradle/io.reactivex.rxjava2-rxkotlin-2.4.0 
Bump rxkotlin from 2.3.0 to 2.4.0
 2021-02-21 00:07:01 +01:00
SpiritCroc ca0b360875 Merge tag 'v1.1.0' into sc 
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
 2021-02-20 15:41:01 +01:00
Benoit Marty 5a54899835
Merge pull request #2866 from vector-im/dependabot/gradle/big_image_viewer_version-1.7.0 
Bump big_image_viewer_version from 1.6.2 to 1.7.0
 2021-02-20 11:29:08 +01:00
Benoit Marty 183c104ff3
Merge pull request #2874 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.4.0 
Bump zxcvbn from 1.2.7 to 1.4.0
 2021-02-20 11:26:34 +01:00
Benoit Marty d4532089a9
Merge pull request #2870 from vector-im/dependabot/gradle/nl.dionsegijn-konfetti-1.2.6 
Bump konfetti from 1.2.5 to 1.2.6
 2021-02-20 11:26:08 +01:00
Benoit Marty 7eda5e1ef5
Merge pull request #2884 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.9.0 
Bump lazythreetenbp from 0.7.0 to 0.9.0
 2021-02-20 11:24:14 +01:00
dependabot[bot] 5320d16406
Bump work-runtime-ktx from 2.4.0 to 2.5.0 
Bumps work-runtime-ktx from 2.4.0 to 2.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:22:58 +00:00
dependabot[bot] 94faa2dc11
Bump rxbinding-material from 3.0.0 to 3.1.0 
Bumps [rxbinding-material](https://github.com/JakeWharton/RxBinding) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/JakeWharton/RxBinding/releases)
- [Changelog](https://github.com/JakeWharton/RxBinding/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/RxBinding/compare/3.0.0...3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:22:09 +00:00
Benoit Marty 40785e9a40
Merge pull request #2877 from vector-im/dependabot/gradle/com.jakewharton.rxbinding3-rxbinding-appcompat-3.1.0 
Bump rxbinding-appcompat from 3.0.0 to 3.1.0
 2021-02-20 11:21:11 +01:00
dependabot[bot] a7adcbcd78
Bump rxkotlin from 2.3.0 to 2.4.0 
Bumps [rxkotlin](https://github.com/ReactiveX/RxKotlin) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/ReactiveX/RxKotlin/releases)
- [Commits](https://github.com/ReactiveX/RxKotlin/compare/2.3.0...2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:20:10 +00:00
dependabot[bot] a5a857f036
Bump recyclerview from 1.2.0-alpha06 to 1.2.0-beta01 
Bumps recyclerview from 1.2.0-alpha06 to 1.2.0-beta01.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:19:35 +00:00
Benoit Marty 1a4617af17
Merge pull request #2872 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.0.1 
Bump firebase-messaging from 21.0.0 to 21.0.1
 2021-02-20 11:19:28 +01:00
dependabot[bot] c069582007
Bump fragment-ktx from 1.3.0-beta01 to 1.3.0 
Bumps fragment-ktx from 1.3.0-beta01 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:19:23 +00:00
Benoit Marty 17ddab585a
Merge pull request #2878 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.18 
Bump libphonenumber from 8.10.23 to 8.12.18
 2021-02-20 11:19:05 +01:00
Benoit Marty 120ed41507
Merge pull request #2860 from vector-im/dependabot/gradle/androidx.autofill-autofill-1.1.0 
Bump autofill from 1.0.0 to 1.1.0
 2021-02-20 11:18:10 +01:00
Benoit Marty dcb96593ec
Merge pull request #2881 from vector-im/dependabot/gradle/com.google.android.material-material-1.3.0 
Bump material from 1.3.0-alpha04 to 1.3.0
 2021-02-20 11:17:51 +01:00
Benoit Marty a489ddda87
Merge pull request #2879 from vector-im/dependabot/gradle/epoxy_version-4.4.0 
Bump epoxy_version from 4.1.0 to 4.4.0
 2021-02-20 11:08:03 +01:00
dependabot[bot] 3ba71390b2
Bump lazythreetenbp from 0.7.0 to 0.9.0 
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.7.0 to 0.9.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.7.0...0.9.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:23:10 +00:00
dependabot[bot] 108a81d338
Bump material from 1.3.0-alpha04 to 1.3.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0-alpha04 to 1.3.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0-alpha04...1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:22:53 +00:00
dependabot[bot] 0226a0cba3
Bump epoxy_version from 4.1.0 to 4.4.0 
Bumps `epoxy_version` from 4.1.0 to 4.4.0.

Updates `epoxy` from 4.1.0 to 4.4.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.1.0...4.4.0)

Updates `epoxy-glide-preloading` from 4.1.0 to 4.4.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.1.0...4.4.0)

Updates `epoxy-processor` from 4.1.0 to 4.4.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.1.0...4.4.0)

Updates `epoxy-paging` from 4.1.0 to 4.4.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.1.0...4.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:22:34 +00:00
dependabot[bot] dfc57d1985
Bump libphonenumber from 8.10.23 to 8.12.18 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.10.23 to 8.12.18.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.10.23...v8.12.18)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:22:13 +00:00
dependabot[bot] ebd1dab02f
Bump rxbinding-appcompat from 3.0.0 to 3.1.0 
Bumps [rxbinding-appcompat](https://github.com/JakeWharton/RxBinding) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/JakeWharton/RxBinding/releases)
- [Changelog](https://github.com/JakeWharton/RxBinding/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/RxBinding/compare/3.0.0...3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:22:11 +00:00
dependabot[bot] 2cbd154516
Bump zxcvbn from 1.2.7 to 1.4.0 
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.2.7 to 1.4.0.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.2.7...1.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:42 +00:00
dependabot[bot] 1a965bbbf9
Bump firebase-messaging from 21.0.0 to 21.0.1 
Bumps firebase-messaging from 21.0.0 to 21.0.1.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:36 +00:00
dependabot[bot] 4b7c445b74
Bump konfetti from 1.2.5 to 1.2.6 
Bumps [konfetti](https://github.com/DanielMartinus/Konfetti) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/DanielMartinus/Konfetti/releases)
- [Commits](https://github.com/DanielMartinus/Konfetti/compare/v1.2.5...v1.2.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:15 +00:00
dependabot[bot] 5a4915e817
Bump flexbox from 1.1.1 to 2.0.1 
Bumps [flexbox](https://github.com/google/flexbox-layout) from 1.1.1 to 2.0.1.
- [Release notes](https://github.com/google/flexbox-layout/releases)
- [Commits](https://github.com/google/flexbox-layout/compare/1.1.1...2.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:14 +00:00
dependabot[bot] 612dd21264
Bump big_image_viewer_version from 1.6.2 to 1.7.0 
Bumps `big_image_viewer_version` from 1.6.2 to 1.7.0.

Updates `BigImageViewer` from 1.6.2 to 1.7.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.6.2...v1.7.0)

Updates `GlideImageLoader` from 1.6.2 to 1.7.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.6.2...v1.7.0)

Updates `ProgressPieIndicator` from 1.6.2 to 1.7.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.6.2...v1.7.0)

Updates `GlideImageViewFactory` from 1.6.2 to 1.7.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.6.2...v1.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:18:49 +00:00
dependabot[bot] 7d287d7c63
Bump kluent-android from 1.61 to 1.65 
Bumps kluent-android from 1.61 to 1.65.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:18:28 +00:00
dependabot[bot] 2c065b8c43
Bump autofill from 1.0.0 to 1.1.0 
Bumps autofill from 1.0.0 to 1.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:18:19 +00:00
Benoit Marty e50d2f7809
Merge pull request #2856 from vector-im/dependabot/gradle/junit-junit-4.13.2 
Bump junit from 4.13 to 4.13.2
 2021-02-20 00:13:21 +01:00
Benoit Marty f8e0fdba48
Merge pull request #2855 from vector-im/dependabot/gradle/daggerVersion-2.32 
Bump daggerVersion from 2.31 to 2.32
 2021-02-20 00:13:06 +01:00
Benoit Marty 160db6ada5
Merge pull request #2854 from vector-im/dependabot/gradle/com.jakewharton.rxbinding3-rxbinding-3.1.0 
Bump rxbinding from 3.0.0 to 3.1.0
 2021-02-20 00:12:46 +01:00
Benoit Marty 88104cecf6
Merge pull request #2853 from vector-im/dependabot/gradle/com.googlecode.htmlcompressor-htmlcompressor-1.5.2 
Bump htmlcompressor from 1.4 to 1.5.2
 2021-02-20 00:12:30 +01:00
Benoit Marty ea1f533501
Merge pull request #2852 from vector-im/dependabot/gradle/androidx.sharetarget-sharetarget-1.1.0 
Bump sharetarget from 1.0.0 to 1.1.0
 2021-02-20 00:12:10 +01:00
Benoit Marty 61043ee58a
Merge pull request #2851 from vector-im/dependabot/gradle/com.google.zxing-core-3.4.1 
Bump core from 3.3.3 to 3.4.1
 2021-02-19 23:44:20 +01:00
dependabot[bot] 2c605d9ffb
Bump junit from 4.13 to 4.13.2 
Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.2.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.2.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:31 +00:00
dependabot[bot] 7a81eec6d8
Bump daggerVersion from 2.31 to 2.32 
Bumps `daggerVersion` from 2.31 to 2.32.

Updates `dagger` from 2.31 to 2.32
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.31...dagger-2.32)

Updates `dagger-compiler` from 2.31 to 2.32
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.31...dagger-2.32)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:23 +00:00
dependabot[bot] 5a70e3c638
Bump rxbinding from 3.0.0 to 3.1.0 
Bumps [rxbinding](https://github.com/JakeWharton/RxBinding) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/JakeWharton/RxBinding/releases)
- [Changelog](https://github.com/JakeWharton/RxBinding/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/RxBinding/compare/3.0.0...3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:16 +00:00
dependabot[bot] aeb96bb1c0
Bump htmlcompressor from 1.4 to 1.5.2 
Bumps htmlcompressor from 1.4 to 1.5.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:08 +00:00
dependabot[bot] 062c415fc2
Bump sharetarget from 1.0.0 to 1.1.0 
Bumps sharetarget from 1.0.0 to 1.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:07 +00:00
dependabot[bot] 0c0119d85c
Bump core from 3.3.3 to 3.4.1 
Bumps [core](https://github.com/zxing/zxing) from 3.3.3 to 3.4.1.
- [Release notes](https://github.com/zxing/zxing/releases)
- [Changelog](https://github.com/zxing/zxing/blob/master/CHANGES)
- [Commits](https://github.com/zxing/zxing/compare/zxing-3.3.3...zxing-3.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:06 +00:00
dependabot[bot] ff5d613e23
Bump glide_version from 4.11.0 to 4.12.0 
Bumps `glide_version` from 4.11.0 to 4.12.0.

Updates `glide` from 4.11.0 to 4.12.0
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/4.11.0...v4.12.0)

Updates `compiler` from 4.11.0 to 4.12.0
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/4.11.0...v4.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 21:52:06 +00:00
Benoit Marty 747a5ded1a Version++ 2021-02-19 21:10:27 +01:00
Benoit Marty 809c0e720e Prepare release 1.1.0 2021-02-19 19:30:38 +01:00
SpiritCroc 4418821058 Increment version 
Change-Id: I0a0b686aa4cdbaa636bf06286c8a108ac8d8079b
 2021-02-19 14:39:57 +01:00
Benoit Marty 80a6823af4 Remove transitive dependency 2021-02-10 16:55:07 +01:00
Benoit Marty 1ec4424c0a Upgrade Jitsi library from 2.9.3 to 3.1.0 2021-02-10 12:15:32 +01:00
SpiritCroc 04f4e13230 Merge tag 'v1.0.17' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
 2021-02-10 11:05:22 +01:00
Benoit Marty aaeca96336 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-09 21:23:55 +01:00
Benoit Marty 08b65b57e4 Version++ 2021-02-09 21:08:46 +01:00
ganfra 0ed327646a Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-08 16:45:15 +01:00
Benoit Marty 1212bb8d70 Change app name from "Element (Riot.im)" to "Element" 2021-02-08 12:39:35 +01:00
SpiritCroc c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
ganfra 6cd462f852 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-04 16:52:06 +01:00
Benoit Marty d11ed8c4ef Version++ 2021-02-04 15:17:46 +01:00
Benoit Marty a65f846929 Version++ 2021-02-03 17:09:32 +01:00
ganfra f4fd8af3b4 Merge branch 'develop' into feature/fga/voip_v1_start 2021-01-29 18:46:19 +01:00
ganfra 940563f663 Merge branch 'feature/fga/voip_dial_pad' into feature/fga/voip_v1_start 2021-01-29 16:37:46 +01:00
SpiritCroc 417bf48dd1 Increment version 
Change-Id: Ic68c2a792c589c03f6fe274e937ebfa18a69b47a
 2021-01-23 11:58:10 +01:00
Benoit Marty 4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration 
Migrate to Android 11, API 30.
 2021-01-22 17:17:04 +01:00
ganfra d29ab94617 VoIP: start reworking audio device management [WIP] 2021-01-21 13:03:33 +01:00
SpiritCroc 53c498b728 Merge tag 'v1.0.14' into sc 
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	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/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-01-16 11:21:09 +01:00
ganfra 2c0b7ce0f4 Dagger: update to 2.31 and use new AssistedInject 2021-01-15 15:23:24 +01:00
Benoit Marty 72ee1ace48 Version++ 2021-01-15 11:14:59 +01:00
ganfra fae1382429 VoIP: introduce DialPadFragment by reusing lib (AOSP extract) 2021-01-07 11:15:37 +01:00
Onuray Sahin 23623b8895 Migrate to Android 11, API 30. 2021-01-04 17:12:49 +03:00
SpiritCroc 7ecf8073ef Increment version 
Change-Id: Icd9bbfe6db69fc8a7b2de5626f4292d3664f4c5e
 2020-12-27 11:29:47 +01:00
ganfra 14288b545b Merge branch 'develop' into feature/fga/voip_v1_start 2020-12-22 11:38:41 +01:00
SpiritCroc 8da4044de6 Merge tag 'v1.0.13' into sc 
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
 2020-12-22 09:24:31 +01:00
Benoit Marty 2b780a8b76
Merge pull request #2542 from vector-im/feature/bma/view_bindings 
View bindings
 2020-12-18 15:57:34 +01:00
Benoit Marty 0518e5f18d Version++ 2020-12-18 11:03:01 +01:00
Benoit Marty 706736273c Migrate to ViewBindings (#1072) - WIP 2020-12-16 00:46:52 +01:00
Benoit Marty 838340bbc8 Remove dependency to Butterknife 2020-12-15 20:33:55 +01:00
SpiritCroc 38b82fb823 Merge tag 'v1.0.12' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values-v23/theme_status.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/values/theme_status.xml

Note to self: need to check if URL preview works with wrap_content

Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
 2020-12-15 15:55:14 +01:00
Benoit Marty 6cdb192955 Version++ 2020-12-15 14:18:35 +01:00
Valere 7da8b13cde Chat Effects 2020-12-15 09:39:16 +01:00
Onuray Sahin d54571d0a6 Emoji library added with Google style. 2020-12-09 18:45:33 +03:00
ganfra 76ed775f6f VoIP: start to show in-app notification 2020-12-09 11:17:49 +01:00
SpiritCroc 3defe44eff Increment version 
Change-Id: Ic7a599e412c312fb5489500d2eb7ee1808a0b6bb
 2020-12-05 11:02:41 +01:00
ganfra efec711ced Merge branch 'develop' into feature/fga/voip_v1_start 2020-12-03 13:01:54 +01:00
Benoit Marty c4577f28b2 Remove unnecessary dependency (we have -ktx dependency) 2020-12-02 16:43:52 +01:00
Benoit Marty 89a7ec6d4b Use fragment-ktx and preference-ktx dependencies (fix lint issue KtxExtensionAvailable) 2020-12-02 12:46:15 +01:00
Benoit Marty 42bc4d2445 Upgrade some dependencies and Kotlin version 2020-12-02 12:09:56 +01:00
ganfra 4a3f0c8898 VoIP: update in call ui (blur) 2020-12-01 18:36:00 +01:00
SpiritCroc 0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
 2020-11-29 12:51:43 +01:00
Benoit Marty b84d7f0834 Version** 2020-11-27 20:42:02 +01:00
SpiritCroc ac89fb97f8 Increment version 
Change-Id: Ic11038b22a85eb4ee863bb865439ae3c9751da1b
 2020-11-24 16:13:49 +01:00
Benoit Marty 07c805a019 Create sanity test with all screens path 
Introduce `com.schibsted.spain:barista`
 2020-11-09 16:56:20 +01:00
SpiritCroc 164848e0aa Increment version 
Change-Id: Id0642c0e557b85b4209713028ba7c1d1223a070d
 2020-11-07 11:37:55 +01:00
SpiritCroc 58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 2020-11-05 13:15:55 +01:00
Benoit Marty 17fed39b27 Version++ 2020-11-04 16:00:16 +01:00
SpiritCroc 07e6cf2a8d Increment version 
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
 2020-11-02 13:20:05 +01:00
Benoit Marty 60556d0fa0 Version code: apply workaround from https://issuetracker.google.com/issues/171133218 2020-10-22 16:10:08 +02:00
Benoit Marty c05147a019 Merge branch 'hotfix/bma/versionCode' into develop 2020-10-19 12:31:35 +02:00
Benoit Marty a59c92f55a Fix issue with VersionCode 2020-10-19 12:29:20 +02:00
SpiritCroc 5853709c97 Increment version 
Change-Id: Id0f9498606265ff48842ca210358ee1541b18c38
 2020-10-17 17:05:03 +02:00
SpiritCroc 44d3c0118a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_legacy.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/view_avatar_selector.xml
 2020-10-17 15:28:18 +02:00
Benoit Marty 1b7158a61d Version++ 2020-10-16 17:34:10 +02:00
ganfra 9bf615e90c Fix composer: update constraints layout and fix some glitches 2020-10-16 11:24:59 +02:00
SpiritCroc ca60a769d2 Increment version 
Change-Id: I7ffc24a91c8960d0fdbba2881dc887bb09e43721
 2020-10-13 15:42:19 +02:00
Constantin Wartenburger 7e5ee8f951
Made it backwards compatible 2020-10-11 22:09:19 +02:00
Benoit Marty 9e0ebc94c5 Upgrade other dependencies, and remove unused dependencies 2020-10-06 15:44:30 +02:00
Benoit Marty 1a0dba7422 Upgrade Moshi to `1.11.0`, Dagger to `2.29.1`, Epoxy to `4.1.0` 2020-10-06 14:47:57 +02:00