mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 01:20:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
8425 commits 7 branches 124 tags 230 MiB
Commit graph

8425 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
1e1a974678 Automatic upstream merge postprocessing 
Change-Id: Ia57cedc2fce20341f97c4612adf9e46df93f7cf3
 2021-02-20 15:41:40 +01:00
SpiritCroc
c77e34361a Automatic color correction 
Change-Id: Iafca6ed0e7774dfc3d0f5cf104aa0a9cd8e4c896
 2021-02-20 15:41:40 +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
SpiritCroc
7eb3b7e9cd [TMP] Automatic upstream merge preparation 
Change-Id: I813dbf150890acbef690dca516b2e8369aa860da
 2021-02-20 15:03:24 +01:00
SpiritCroc
7a34fad74e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I12355718b67e0780eaa976b4e8f38301bb7e3753
 2021-02-20 15:03:23 +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
56a787b327
Merge pull request #2862 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.3.1 
Bump realm-gradle-plugin from 10.1.2 to 10.3.1
 2021-02-20 11:28:38 +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
78cd45eaca
Merge pull request #2871 from vector-im/dependabot/gradle/org.sonarsource.scanner.gradle-sonarqube-gradle-plugin-3.1.1 
Bump sonarqube-gradle-plugin from 2.7.1 to 3.1.1
 2021-02-20 11:25:17 +01:00
Benoit Marty
4defabeecc
Merge pull request #2887 from vector-im/dependabot/gradle/com.squareup.okhttp3-okhttp-bom-4.9.1 
Bump okhttp-bom from 4.8.1 to 4.9.1
 2021-02-20 11:24:45 +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
Benoit Marty
273211290b
Merge pull request #2885 from vector-im/dependabot/gradle/org.matrix.gitlab.matrix-org-olm-3.2.1 
Bump olm from 3.1.2 to 3.2.1
 2021-02-20 11:23:50 +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
04e78ec2e9
Merge pull request #2867 from vector-im/dependabot/gradle/retrofit_version-2.9.0 
Bump retrofit_version from 2.6.2 to 2.9.0
 2021-02-20 11:22:06 +01: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
e6eee47059
Merge pull request #2873 from vector-im/dependabot/gradle/androidx.exifinterface-exifinterface-1.3.2 
Bump exifinterface from 1.3.1 to 1.3.2
 2021-02-20 11:18:36 +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]
5aa50a6c60
Bump mockk from 1.9.2.kotlin12 to 1.10.6 
Bumps [mockk](https://github.com/mockk/mockk) from 1.9.2.kotlin12 to 1.10.6.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.9.2.kotlin12...1.10.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 10:07:19 +00:00
Benoit Marty
57f5471075
Merge pull request #2863 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.65 
Bump kluent-android from 1.61 to 1.65
 2021-02-20 11:06:12 +01:00
dependabot[bot]
f2bbfa1b0d
Bump okhttp-bom from 4.8.1 to 4.9.1 
Bumps [okhttp-bom](https://github.com/square/okhttp) from 4.8.1 to 4.9.1.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.8.1...parent-4.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:27:04 +00:00
Benoit Marty
5710dd6d01 Increase again for the WE 2021-02-20 00:24:41 +01:00
dependabot[bot]
6f01e3b99b
Bump mockk-android from 1.9.2.kotlin12 to 1.10.6 
Bumps [mockk-android](https://github.com/mockk/mockk) from 1.9.2.kotlin12 to 1.10.6.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.9.2.kotlin12...1.10.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:23:31 +00:00
dependabot[bot]
e10dc2e5a1
Bump olm from 3.1.2 to 3.2.1 
Bumps olm from 3.1.2 to 3.2.1.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:23:28 +00: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]
d1c49e2a04
Bump exifinterface from 1.3.1 to 1.3.2 
Bumps exifinterface from 1.3.1 to 1.3.2.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:40 +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]
8aab8ff882
Bump sonarqube-gradle-plugin from 2.7.1 to 3.1.1 
Bumps sonarqube-gradle-plugin from 2.7.1 to 3.1.1.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:26 +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]
bfa84e092c
Bump retrofit_version from 2.6.2 to 2.9.0 
Bumps `retrofit_version` from 2.6.2 to 2.9.0.

Updates `retrofit` from 2.6.2 to 2.9.0
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/retrofit/compare/parent-2.6.2...2.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:21:11 +00:00
Benoit Marty
bb99477c13 increase limit 2021-02-20 00:20:54 +01: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]
6df58a796a
Bump realm-gradle-plugin from 10.1.2 to 10.3.1 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.1.2 to 10.3.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.3.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.1.2...v10.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-19 23:18:24 +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