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

10040 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
95714e55b0
Merge pull request #3324 from vector-im/feature/bma/doc_register 
Add documentation on LoginWizard and RegistrationWizard (#3303)
 2021-05-14 12:29:10 +02:00
Benoit Marty
c27b7aec26 Add more doc 2021-05-14 11:44:44 +02:00
SpiritCroc
dd85e14223 Footer read receipt image: add missing content description 
Change-Id: Ic385e628e432a457bda8b12ad196d01992103375
 2021-05-14 11:41:16 +02:00
Benoit Marty
d6e3bb59f4 Minor cleanup on the doc 2021-05-14 11:39:12 +02:00
Benoit Marty
946208a84d Add documentation on LoginWizard and RegistrationWizard (#3303) 
ee
 2021-05-14 11:39:12 +02:00
SpiritCroc
9d82829863 Proper color for public room icon 
Change-Id: I090b59b6abe8dc920d04e1c348d34ea613ae98e9
 2021-05-14 11:37:59 +02:00
SpiritCroc
f77cd75530 Fix tint for draft icon 
Change-Id: I3ad22d439151acf7b3cb7a09084f2f652f838f1c
 2021-05-14 11:37:48 +02:00
Benoit Marty
dca4a31fc6 Fix a problem with database migration on nightly builds (#3335) 2021-05-14 11:26:24 +02:00
Thibault Martin
e09230b3cf Translated using Weblate (French) 
Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-05-13 13:34:43 +00:00
Jeff Huang
0375034873 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-05-13 13:34:42 +00:00
random
e61c38818e Translated using Weblate (Italian) 
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-05-13 13:34:41 +00:00
Thibault Martin
5a4b6b7351 Translated using Weblate (French) 
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-05-13 13:34:39 +00:00
Jeanne Lavoie
7289f28bab Translated using Weblate (French (Canada)) 
Currently translated at 98.1% (2409 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr_CA/
 2021-05-13 13:34:38 +00:00
Priit Jõerüüt
915d82f835 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-05-13 13:34:35 +00:00
libexus
39ee7bbff7 Translated using Weblate (German) 
Currently translated at 99.7% (2449 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-05-13 13:34:33 +00:00
zeritti
82bb0f19dd Translated using Weblate (Czech) 
Currently translated at 100.0% (2454 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-05-13 13:34:31 +00:00
SpiritCroc
af0108ffc6 Drawer button: reduce size 
This looked out of place, as it was considerably larger then the icon
found in other apps.
22dp would be even closer to other apps, but 24dp will make the unread
counter badge look less detached.

Change-Id: Icecbc1f99da90c2f237dda8a165c3cd8d2644aef
 2021-05-13 15:05:12 +02:00
Philipp Neumann
74b8660a44
Merge branch 'develop' into feature/conversations 2021-05-13 14:19:59 +02:00
Benoit Marty
393ef3845e
Merge pull request #3330 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.23 
Bump libphonenumber from 8.12.22 to 8.12.23
 2021-05-13 11:15:14 +02:00
Benoit Marty
413145ad29
Merge pull request #3328 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.5.0 
Bump realm-gradle-plugin from 10.4.0 to 10.5.0
 2021-05-13 11:13:40 +02:00
dependabot[bot]
90f6f9f7c1
Bump libphonenumber from 8.12.22 to 8.12.23 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.22 to 8.12.23.
- [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.22...v8.12.23)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-13 06:30:31 +00:00
dependabot[bot]
cd9b8c55f4
Bump realm-gradle-plugin from 10.4.0 to 10.5.0 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.4.0 to 10.5.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.5.0/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.4.0...v10.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-13 06:27:41 +00:00
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
ebbfa901d1
Merge pull request #3326 from vector-im/feature/bma/buildTools30 
Sign APK with build tools 30.0.3
 2021-05-12 20:56:22 +02:00
dependabot[bot]
3c0ac0a576
Bump kotlin_version from 1.4.32 to 1.5.0 
Bumps `kotlin_version` from 1.4.32 to 1.5.0.

Updates `kotlin-gradle-plugin` from 1.4.32 to 1.5.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Updates `kotlin-stdlib-jdk7` from 1.4.32 to 1.5.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Updates `kotlin-stdlib` from 1.4.32 to 1.5.0
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 14:51:49 +00: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
Benoit Marty
c68fc5fd10
Merge pull request #3254 from vector-im/dependabot/gradle/com.github.jetradarmobile-android-snowfall-1.2.1 
Bump android-snowfall from 1.2.0 to 1.2.1
 2021-05-12 16:51:04 +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
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