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

11432 commits

This branch
This branch
All branches
Author SHA1 Message Date
Valere
d758d5c270 Fix / Kick user dialog for spaces talks about rooms 2021-09-09 14:20:38 +02:00
SpiritCroc
4b241a00a3 Refactor power-level based display name color updates 
Use similar mechanism as recently added for isDirect changes.

Change-Id: Ida304ae2cc2fbe85cc4b47cb32d6c343cd5e2bd6
 2021-09-09 12:48:41 +02:00
SpiritCroc
f4d8f78ac7 Fix timeline rebuild on DM state change 
Needs slightly different handling after
50a042683b "Architecture: get rid of RoomSummariesHolder as it can lead to errors"

Change-Id: I1d34ca5058d93a73dc26c3b2fee7f8a296ec4880
 2021-09-09 12:12:31 +02:00
SpiritCroc
25b11084f4 Merge branch 'merge_v1.2.1' into sc 
Change-Id: I003540479c02eae32fdeee7230ef11e5d373e9b0
 2021-09-09 11:30:00 +02:00
SpiritCroc
ca40676070 Automatic SchildiChat string correction 
Change-Id: Ie159d8065491758645b608d097daee74e61d1000
 2021-09-09 10:59:34 +02:00
SpiritCroc
4d3f0d734e Automatic upstream merge postprocessing 
Change-Id: I4ba951dbf6b6d874ac22d3f22f84bebb03f5e8bc
 2021-09-09 10:59:33 +02:00
SpiritCroc
11093ee015 Add back unifiedpush strings, but to SC strings 
Change-Id: Idea333c040aaf761d080e2ca15f463549da94efa
 2021-09-09 10:55:42 +02:00
SpiritCroc
133579d066 Merge tag 'v1.2.1' into sc 
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a

Conflicts:
	build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/di/VectorComponent.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/composer/VoiceMessageRecorderView.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/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2021-09-09 10:51:12 +02:00
SpiritCroc
fc2775d86a Fix Fastfile 
Change-Id: Id98dd7c3f1e56775a88a4401407e518265250d95
 2021-09-09 10:16:11 +02:00
Benoit Marty
3fcfe7000f Update user agent: MatrixAndroidSDK_X is replaced by MatrixAndroidSdk2 2021-09-09 09:59:06 +02:00
Benoit Marty
5a5d4fda2d DSL value has shorter alias now 2021-09-09 09:55:24 +02:00
Benoit Marty
529a7aedcb Cleanup useless values 2021-09-09 09:55:24 +02:00
Benoit Marty
6a1409ba59 Better management of SDK version 2021-09-09 09:55:24 +02:00
SpiritCroc
3b85ab988b [TMP] Automatic upstream merge preparation 
Change-Id: I2893c4d5476417ed6eb7d0c7ec3bf7b68338a8f3
 2021-09-09 09:41:38 +02:00
SpiritCroc
99ada07157 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ibfce6aea9c9404a43e9adc6de365626ad4d43e5e
 2021-09-09 09:41:38 +02:00
SpiritCroc
832f0e0e5b Increment version 
Change-Id: Ia225fd512fb1bccd7a2277a2e6f423c8f7ef8969
 2021-09-09 09:39:24 +02:00
SpiritCroc
e05e8086ac Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: I9c8799d9134d422275587cce76b6003a213d57aa
 2021-09-09 09:37:46 +02:00
Niels Bouma
b0d444a381 Translated using Weblate (Dutch) 
Currently translated at 100.0% (90 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nl/
 2021-09-09 09:36:45 +02:00
pixelcode
41dcb7cc83 Translated using Weblate (German) 
Currently translated at 95.5% (86 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2021-09-09 09:36:45 +02:00
SpiritCroc
452a641a39 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Ibc1289c38d5bf9229ad00dd39ae194a1417bb842
 2021-09-09 09:36:01 +02:00
Benoit Marty
d773fb4135 Also upgrade kotlin_coroutines_version to 1.5.1 2021-09-08 22:39:37 +02:00
Benoit Marty
34edc79450 Fix warning "Opt-in requirement marker annotation on override requires the same marker on base declaration (will be an error in 1.6)" 2021-09-08 22:39:37 +02:00
dependabot[bot]
13878c8e7e Bump kotlin_version from 1.5.21 to 1.5.30 
Bumps `kotlin_version` from 1.5.21 to 1.5.30.

Updates `kotlin-gradle-plugin` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30)

Updates `kotlin-stdlib-jdk7` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30)

Updates `kotlin-stdlib` from 1.5.21 to 1.5.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk7
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-08 22:39:20 +02:00
Benoit Marty
9914fb2d0f Version++ 2021-09-08 19:15:08 +02:00
Benoit Marty
ed2c21781a Merge branch 'release/1.2.1' into main 2021-09-08 19:14:28 +02:00
Benoit Marty
af36b5b4b7 Merge branch 'release/1.2.1' into develop 2021-09-08 19:14:26 +02:00
Benoit Marty
13d379badf Create changelog for fastlane 2021-09-08 17:56:01 +02:00
Benoit Marty
e72bc699e9 Fix issue in link 2021-09-08 17:53:13 +02:00
Benoit Marty
5169a8ed10 Run towncrier 2021-09-08 17:52:11 +02:00
Benoit Marty
b47ecf0271 rename file 2021-09-08 17:51:11 +02:00
Benoit Marty
2239d710db Handle missing descriptions for SQ 2021-09-08 17:30:02 +02:00
Benoit Marty
fcd72fd9e3
Merge pull request #3991 from vector-im/feature/fga/fix_memory_leak_room_detail 
Fix memory leak on RoomDetailFragment
 2021-09-08 17:28:26 +02:00
ganfra
3119de42fb Fix memory leak on RoomDetailFragment 2021-09-08 16:47:53 +02:00
Benoit Marty
5c86eb0877
Merge pull request #3988 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-09-08 16:09:42 +02:00
Weblate
5e9be4860d Merge branch 'origin/develop' into Weblate. 2021-09-08 13:44:59 +00:00
Besnik Bleta
478802d60e Translated using Weblate (Albanian) 
Currently translated at 3.4% (1 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2021-09-08 13:44:35 +00:00
Le Dang Trung
f1fe9d83fe Translated using Weblate (Vietnamese) 
Currently translated at 34.9% (914 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-09-08 13:44:35 +00:00
Ihor Hordiichuk
b8f896d914 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (29 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-09-08 13:44:19 +00:00
Ihor Hordiichuk
081206db1c Translated using Weblate (Ukrainian) 
Currently translated at 81.3% (2126 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-08 13:44:18 +00:00
Niels Bouma
efe03ec681 Translated using Weblate (Dutch) 
Currently translated at 51.4% (1345 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-09-08 13:44:12 +00:00
Fjoerfoks
7baf407e13 Translated using Weblate (Frisian) 
Currently translated at 33.8% (884 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-09-08 13:44:09 +00:00
waclaw66
0f5007f0ba Translated using Weblate (Czech) 
Currently translated at 100.0% (2615 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-09-08 13:44:07 +00:00
Benoit Marty
88bb845910
Merge pull request #3984 from vector-im/feature/ons/fix_voice_message_rendering 
Fix rendering voice message if the waveform data is corrupted
 2021-09-08 15:21:33 +02:00
Valere
b1c95e32eb Better room preview, use room Summary API if available 2021-09-08 13:55:22 +02:00
Onuray Sahin
3bd392a55d Code review fixes. 2021-09-08 13:44:52 +03:00
Onuray Sahin
1df867f345 Fix rendering voice message if the waveform data is corrupted. 2021-09-08 13:20:56 +03:00
Valere
a41bec9476 Fix missing branch in when 2021-09-07 15:16:38 +02:00
Niels Bouma
ad81164b38 Translated using Weblate (Dutch) 
Currently translated at 100.0% (90 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nl/
 2021-09-07 15:06:18 +02:00
Valere
99123bf0cc Add invite by email screen in create space flow 2021-09-07 14:10:57 +02:00
Ihor Hordiichuk
a139eb71e1 Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:04:31 +00:00