mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-26 02:48: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
cd66e62454 "home server" -> "homeserver" (#3404) 2021-05-26 12:44:04 +02:00
ganfra
e67cb0eae7 Merge branch 'develop' into feature/fga/call_transfer 2021-05-26 12:26:34 +02:00
ganfra
bd8e46c84f Call transfer: start branching consult first action 2021-05-26 12:09:59 +02:00
SpiritCroc
3b2f09e80d Merge remote-tracking branch 'AquaWolf/feature/conversations' into sc 
Change-Id: Idbbe13f56d988900ade365c3d582bd03799d245c

Conflicts:
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
 2021-05-26 10:55:56 +02:00
SpiritCroc
63a608593f Automatic SchildiChat string correction 
Change-Id: I42fc475df42bf0f4a8c7f9b62610c6eff3583143
 2021-05-26 10:44:25 +02:00
SpiritCroc
6693b398bb Automatic upstream merge postprocessing 
Change-Id: Iff3f2521a41455cfc94afc1b4e0ad961c0d64ce8
 2021-05-26 10:44:23 +02:00
SpiritCroc
9f11fcf87e Automatic color correction 
Change-Id: Ie9ef96a3a4cfa5ef0d0618282a8727028589e9c7
 2021-05-26 10:44:23 +02:00
SpiritCroc
6c06462ec9 Merge tag 'v1.1.8' into sc 
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2021-05-26 10:44:19 +02:00
SpiritCroc
6e60fd7328 [TMP] Automatic upstream merge preparation 
Change-Id: Ic0b3e2a1ac115db029101589e77e16cf4b38d314
 2021-05-26 08:48:20 +02:00
SpiritCroc
1b6ddb5949 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ib94348dd875279692a53465e4b4d13cfdbb27e16
 2021-05-26 08:48:19 +02:00
dependabot[bot]
2703097294
Bump daggerVersion from 2.35.1 to 2.36 
Bumps `daggerVersion` from 2.35.1 to 2.36.

Updates `dagger` from 2.35.1 to 2.36
- [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.1...dagger-2.36)

Updates `dagger-compiler` from 2.35.1 to 2.36
- [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.1...dagger-2.36)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-26 06:00:27 +00:00
Benoit Marty
680837611a Version++ 2021-05-25 18:13:09 +02:00
Benoit Marty
f543600b17 Merge branch 'release/1.1.8' into main 2021-05-25 18:12:00 +02:00
Benoit Marty
249bd18b30 Merge branch 'release/1.1.8' into develop 2021-05-25 18:11:59 +02:00
Benoit Marty
504507a6cc Prepare release 1.1.8 2021-05-25 18:11:26 +02:00
Benoit Marty
ae1f1a27de
Merge pull request #3408 from vector-im/feature/bma/wl_fix 
Fix lint issue
 2021-05-25 15:55:42 +02:00
Benoit Marty
03496c36dc Fix lint issue 2021-05-25 15:29:38 +02:00
Benoit Marty
9ab5e3dfee
Merge pull request #3407 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-05-25 15:26:46 +02:00
ganfra
8eeae51cc6 Call transfer: prepare code for consult feature 2021-05-25 15:21:54 +02:00
Weblate
1cc2e8b000 Merge branch 'origin/develop' into Weblate. 2021-05-25 11:06:53 +00:00
B.O.S.S
cc8182445e Translated using Weblate (Polish) 
Currently translated at 85.3% (2094 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-05-25 11:06:46 +00:00
Ngô Ngọc Đức Huy
089566b5d9 Translated using Weblate (Vietnamese) 
Currently translated at 21.5% (529 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-05-25 11:06:43 +00:00
Dat Ng
f2c7b6508a Translated using Weblate (Vietnamese) 
Currently translated at 21.5% (529 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-05-25 11:06:43 +00:00
Quang Trung
3301df44fb Translated using Weblate (Vietnamese) 
Currently translated at 21.5% (529 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-05-25 11:06:43 +00:00
Viorel-Cătălin Răpițeanu
9546889236 Translated using Weblate (Romanian) 
Currently translated at 6.8% (167 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-25 11:06:39 +00:00
waclaw66
d99ac94bf9 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-25 11:06:39 +00:00
Hivaa
552d763f83 Translated using Weblate (Persian) 
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/fa/
 2021-05-25 11:06:38 +00:00
Quang Trung
bd3aa4024a Translated using Weblate (Vietnamese) 
Currently translated at 22.2% (4 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/vi/
 2021-05-25 11:06:37 +00:00
Tuomas Hietala
a21867e380 Translated using Weblate (Finnish) 
Currently translated at 72.2% (13 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
 2021-05-25 11:06:37 +00:00
LinAGKar
3e1631c0e5 Translated using Weblate (Swedish) 
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/sv/
 2021-05-25 11:06:36 +00:00
Benoit Marty
0fbfd27149
Merge pull request #3403 from vector-im/dependabot/gradle/kotlin_version-1.5.10 
Bump kotlin_version from 1.5.0 to 1.5.10
 2021-05-25 12:12:53 +02:00
SpiritCroc
c97024ee3c rageshake: Remove useless title addition in issue title 
Change-Id: I56de1ae9dbd9a569504d7ef1a5c66efd1ad414b2
 2021-05-25 11:28:03 +02:00
SpiritCroc
d527e2039c Rageshake: add label "can contact" 
Change-Id: I76eafb3b65ff76f531e577b9693dff25f2c3f878
 2021-05-25 11:25:57 +02:00
SpiritCroc
95b5efe3f4 Disable missed space beta feedback 
Change-Id: Ia6813fd5d8575f7ba1b682ba79bce0138fce5f20
 2021-05-25 11:15:17 +02:00
Benoit Marty
8110e9b2ab Also upgrade coroutine library to 1.5.0 2021-05-25 10:56:36 +02:00
Benoit Marty
b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi 
Feature/fga/authenticated jitsi
 2021-05-25 10:24:54 +02:00
dependabot[bot]
b311173385
Bump kotlin_version from 1.5.0 to 1.5.10 
Bumps `kotlin_version` from 1.5.0 to 1.5.10.

Updates `kotlin-gradle-plugin` from 1.5.0 to 1.5.10
- [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.5.0...v1.5.10)

Updates `kotlin-stdlib-jdk7` from 1.5.0 to 1.5.10
- [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.5.0...v1.5.10)

Updates `kotlin-stdlib` from 1.5.0 to 1.5.10
- [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.5.0...v1.5.10)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-25 06:14:09 +00:00
tanmatsu
8e45b69c7d Translated using Weblate (Romanian) 
Currently translated at 6.6% (163 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-22 21:34:37 +00:00
Viorel-Cătălin Răpițeanu
edc2e7e61e Translated using Weblate (Romanian) 
Currently translated at 6.6% (163 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-22 21:34:37 +00:00
Viorel-Cătălin Răpițeanu
a14c00e669 Translated using Weblate (Romanian) 
Currently translated at 11.1% (2 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ro/
 2021-05-22 21:34:33 +00:00
SpiritCroc
27cedd62d1 Limit picture upscale factor 
Change-Id: I11ea154db505d352ba19d0dbba57c915e3c1d458
 2021-05-22 14:55:48 +02:00
SpiritCroc
4f46f470d6 Increment version 
Change-Id: I08b244059c9619a0adfe900c0aac569525cee9ad
 2021-05-22 10:12:03 +02:00
tanmatsu
b034870242 Translated using Weblate (Romanian) 
Currently translated at 4.0% (99 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-21 19:15:45 +00:00
Viorel-Cătălin Răpițeanu
5ec1ab5b2d Translated using Weblate (Romanian) 
Currently translated at 4.0% (99 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-21 19:15:43 +00:00
Viorel-Cătălin Răpițeanu
fd8295eb6c Translated using Weblate (Romanian) 
Currently translated at 2.7% (67 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-21 17:53:49 +00:00
tanmatsu
67ec1b4434 Translated using Weblate (Romanian) 
Currently translated at 2.7% (67 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-21 17:53:49 +00:00
Viorel-Cătălin Răpițeanu
509b0f5a41 Translated using Weblate (Romanian) 
Currently translated at 2.2% (56 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-21 17:51:22 +00:00
tanmatsu
3a5724d900 Translated using Weblate (Romanian) 
Currently translated at 2.2% (56 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-21 17:51:22 +00:00
Viorel-Cătălin Răpițeanu
7e7d245d59 Translated using Weblate (Romanian) 
Currently translated at 2.2% (55 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-21 17:50:59 +00:00
tanmatsu
b6cbd76849 Translated using Weblate (Romanian) 
Currently translated at 2.2% (55 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-05-21 17:50:59 +00:00