Commit Graph

9662 Commits

Author SHA1 Message Date
Benoit Marty 756e690cc1
Merge pull request #3256 from vector-im/dependabot/gradle/org.sonarsource.scanner.gradle-sonarqube-gradle-plugin-3.2.0
Bump sonarqube-gradle-plugin from 3.1.1 to 3.2.0
2021-05-12 16:50:48 +02: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 b8d936e9f1
Merge pull request #3311 from vector-im/gradlew-update-7.0.1
Update Gradle Wrapper from 7.0 to 7.0.1
2021-05-12 16:49:35 +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 dfc8860ade Fix avatar sample after PR merge 2021-05-12 16:43:46 +02:00
Benoit Marty 87953e7150
Merge pull request #3310 from vector-im/feature/bma/samples
Improve layout preview regarding avatars
2021-05-12 16:36:33 +02:00
SpiritCroc 808e381e09 No need to give spaces feedback to us
Change-Id: Ie169ddff49368e0871036403ff0fab1ccea74f9a
2021-05-12 16:29:36 +02:00
Benoit Marty 31df08477e Cleanup Travis config. 2021-05-12 16:24:20 +02:00
Benoit Marty 278b0d7f75 Sign APK with build tools 30.0.3 2021-05-12 16:20:55 +02:00
SpiritCroc 077e1b6896 Fix compile after merge
Change-Id: I499115f40f75f07cdd0e42dafa2b17695d27e9b5
2021-05-12 16:16:20 +02:00
SpiritCroc 5c68ccf67d Automatic SchildiChat string correction
Change-Id: I5dff99fe89769fe352b2ff8d9f7c6b2814d48862
2021-05-12 16:01:51 +02:00
SpiritCroc 19605b0cdc Automatic upstream merge postprocessing
Change-Id: Iad909d733876af3c770cd5bad26a971bd5b74dc2
2021-05-12 16:01:49 +02:00
SpiritCroc db6cfd3054 Merge tag 'v1.1.7' into sc
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2021-05-12 16:01:36 +02:00
SpiritCroc 38b4da547e [TMP] Automatic upstream merge preparation
Change-Id: I1f5c1f52159efe0485c11056da07d3e8b1aeacba
2021-05-12 15:45:50 +02:00
SpiritCroc 51b4ebdda7 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I8f600d6c60e381d3948645ebe77b35bbc6dc5ae8
2021-05-12 15:45:49 +02:00
SpiritCroc 2269e0f1ed Merge branch 'spaces' into sc
Change-Id: Ia2a25202fab4e5be3c4800bb5cb6ab47fc828bac
2021-05-12 15:44:01 +02:00
Benoit Marty a42a9b5e32 Version++ 2021-05-12 15:15:24 +02:00
Benoit Marty a9c966b8de Merge branch 'release/1.1.7' into main 2021-05-12 15:14:06 +02:00
Benoit Marty 355ee3133c Merge branch 'release/1.1.7' into develop 2021-05-12 15:14:04 +02:00
Benoit Marty 2f37c703a4 Prepare release 1.1.7 2021-05-12 15:13:51 +02:00
Benoit Marty b06bd403ca
Merge pull request #3322 from vector-im/feature/bca/spaces_feedback
Add option to send beta feedback
2021-05-12 14:55:54 +02:00
Benoit Marty 72e343ad5a Better wording 2021-05-12 14:26:20 +02:00
Benoit Marty 6af9fda7df Fix lint issue 2021-05-12 14:06:59 +02:00
Benoit Marty 5d052cda79 Increase clickable area (no layout rendering change) 2021-05-12 13:55:47 +02:00
Benoit Marty 0d5b66f92b Flatten View hierarchy 2021-05-12 13:53:03 +02:00
Valere 391e952fbd Review + design update 2021-05-12 12:23:14 +02:00
Valere df3d3b63c8 Code review 2021-05-12 11:04:54 +02:00
Valere aefcb4841b Cleaning 2021-05-12 10:47:52 +02:00
Valere eb18b23528 Add option to send beta feedback 2021-05-12 10:47:52 +02:00
Benoit Marty 03f2b516a0 Please the code quality checker 2021-05-12 10:17:33 +02:00
Benoit Marty 56d0699bc7
Merge pull request #3312 from vector-im/feature/bca/spaces_polish
Spaces various fixes and polish
2021-05-12 10:09:36 +02:00
Valere 1799dcbd0c Fix lint 2021-05-12 09:20:55 +02:00
Jeanne Lavoie 8e28b31170 Translated using Weblate (French)
Currently translated at 99.5% (2442 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2021-05-12 06:07:14 +00: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
Valere 0de56e2993 Code Review 2021-05-11 19:11:15 +02:00
Valere eb9fadaebf user error when no space support on HS
remove buggy separators on add room; design update
2021-05-11 17:34:55 +02:00
Benoit Marty bdc3f189ee
Merge pull request #3314 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-05-11 15:09:37 +02:00
Valere 91d8ee2a81 Space panel room ordering 2021-05-11 14:45:30 +02:00
Benoit Marty 824a8a5c66 Fix copyright 2021-05-11 14:06:49 +02:00
Benoit Marty 91be2b6f3f Add test and handle system upgrade 2021-05-11 14:06:49 +02:00
Benoit Marty cef4cf09ec Create a BuildVersionSdkIntProvider to be able to inject it and do some test
To merge with BuildVersionSdkIntProvider

To merge with fix add module

To merge with fix buildVersionSdkIntProvider
2021-05-11 13:52:08 +02:00
Benoit Marty f31c44963b Cleanup the existing code 2021-05-11 13:52:08 +02:00
SpiritCroc e9e522603d Message footer: handle small width/height pictures
Change-Id: Ib8554c5057f09277cb9ef2a29a57d3a85cf35417
2021-05-11 12:21:41 +02:00
Valere f9820cde58 Fixes on unread badges 2021-05-11 11:36:17 +02:00
Valere 14144dc99d Default all in home + lab flag 2021-05-11 10:45:07 +02:00
Valere 24a32f2b7e Subspace more hierarchy depth + fix bad notification count 2021-05-11 10:07:34 +02:00
Weblate d9ffff70a6 Merge branch 'origin/develop' into Weblate. 2021-05-11 07:55:27 +00:00
Hivaa 631d8510ed Translated using Weblate (Persian)
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2021-05-11 07:53:01 +00:00