filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,511 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

8511 Commits

Author SHA1 Message Date
Benoit Marty bebb956005 Try to fix crash about UrlPreview (#2640) 2021-02-22 17:44:11 +01:00
Benoit Marty b38ff46af4
Merge pull request #2896 from vector-im/feature/bma/dependabot 
Upgrade dependencies
 2021-02-22 12:22:43 +01:00
Benoit Marty cf1c23c2c9
Merge pull request #2897 from ShadowJonathan/patch-1 
Fix spelling in CONTRIBUTING.md
 2021-02-22 10:50:40 +01:00
Benoit Marty e162ebdf91
Merge pull request #2831 from vector-im/feature/bma/hs_version 
Fetch homeserver type and version and display in a new setting screen and add info in rageshakes
 2021-02-22 10:29:16 +01:00
Jonathan de Jong a348571e32
Fix spelling 2021-02-21 19:19:46 +01:00
Benoit Marty ef3d8f365a Changelog 2021-02-21 16:52:19 +01:00
Benoit Marty 88964d8cf7 Also bump kotlin_coroutines_version to recommended version 1.4.2 2021-02-21 16:24:40 +01:00
dependabot[bot] d444e91ba8 Bump kotlin_version from 1.4.21 to 1.4.30 
Bumps `kotlin_version` from 1.4.21 to 1.4.30.

Updates `kotlin-gradle-plugin` from 1.4.21 to 1.4.30

Updates `kotlin-stdlib-jdk7` from 1.4.21 to 1.4.30
- [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.4.21...v1.4.30)

Updates `kotlin-stdlib` from 1.4.21 to 1.4.30
- [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.4.21...v1.4.30)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-21 16:23:46 +01:00
Benoit Marty f617a8d77f Fix compilation issue after upgrade of alerter from 5.1.2 to 7.0.1 2021-02-21 16:20:57 +01: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
Benoit Marty dd3a395d11 Fix compilation issue after upgrade of browser from 1.2.0 to 1.3.0 2021-02-21 16:11:49 +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 bf48978065 Fix compilation issue after upgrade of realmfieldnameshelper from 1.1.1 to 2.0.0 2021-02-21 11:08:42 +01:00
dependabot[bot] fd3c41a250 Bump realmfieldnameshelper from 1.1.1 to 2.0.0 
Bumps [realmfieldnameshelper](https://github.com/cmelchior/realmfieldnameshelper) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/cmelchior/realmfieldnameshelper/releases)
- [Changelog](https://github.com/cmelchior/realmfieldnameshelper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cmelchior/realmfieldnameshelper/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-21 10:45:15 +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 e99b86cde8
Merge pull request #2864 from vector-im/dependabot/gradle/org.robolectric-robolectric-4.5.1 
Bump robolectric from 4.3 to 4.5.1
 2021-02-21 10:39:02 +01:00
SpiritCroc 7994c14e15 Automatic SchildiChat string correction 
Change-Id: Ic228a19f5f6216fc00f8af60d2fff2ea5d0d3b0a
 2021-02-21 10:36:10 +01:00
SpiritCroc ed5d2930ce Update string correction 
Change-Id: Idda999f81445f0ccfbabe5b3ac1c78bccdca1dca
 2021-02-21 10:36:06 +01:00
SpiritCroc f4d0993a2b Enable semi-automatic correct_strings.sh-patching 
Change-Id: I072f2ff71e862a1a140c8879754669f7231745c2
 2021-02-21 10:35:55 +01:00
vachan-maker 206f19401f Translated using Weblate (Malayalam) 
Currently translated at 9.5% (198 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
 2021-02-21 07:34:09 +00:00
waclaw66 b37505112b Translated using Weblate (Czech) 
Currently translated at 63.6% (7 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-02-21 07:34:06 +00:00
Nikita Epifanov 60dad59025 Translated using Weblate (Russian) 
Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
 2021-02-21 07:34:05 +00:00
XoseM 8250a64e34 Translated using Weblate (Galician) 
Currently translated at 85.8% (194 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
 2021-02-21 07:34:05 +00:00
waclaw66 58ab82a477 Translated using Weblate (Czech) 
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2021-02-21 07:34:05 +00:00
Jeff Huang 2f8169c26d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-02-21 07:34:05 +00:00
GokdenizK eb14341f9f Translated using Weblate (Turkish) 
Currently translated at 72.1% (1502 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
 2021-02-21 07:34:05 +00:00
Nikita Epifanov 823ba386d9 Translated using Weblate (Russian) 
Currently translated at 99.5% (2072 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2021-02-21 07:34:04 +00:00
dependabot[bot] 471620c4c6
Bump robolectric from 4.3 to 4.5.1 
Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.3 to 4.5.1.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.3...robolectric-4.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-20 23:12:11 +00:00
Benoit Marty 75b74eaca8
Merge pull request #2886 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.10.6 
Bump mockk-android from 1.9.2.kotlin12 to 1.10.6
 2021-02-21 00:11:50 +01:00
Benoit Marty 9e33e6bc4e
Merge pull request #2882 from vector-im/dependabot/gradle/io.mockk-mockk-1.10.6 
Bump mockk from 1.9.2.kotlin12 to 1.10.6
 2021-02-21 00:11:08 +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 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