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

9663 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeanne Lavoie
fbb77b7332 Translated using Weblate (German) 
Currently translated at 99.9% (2362 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-04-11 17:34:20 +00:00
Thibault Martin
4fcbf718ca Translated using Weblate (French) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-04-11 17:34:20 +00:00
Dominic Fischer
35667db29c
Lint 2021-04-11 11:35:28 +01:00
Dominic Fischer
759528f19a Missed another spot 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-04-11 10:54:17 +01:00
SpiritCroc
0320bf2d05 SC dark themes: less bright bottom sheet / day separator 
Change-Id: I806f21c85ead59870d2a11bd1c5d3f101ac39325
 2021-04-11 10:28:33 +02:00
Ariko
9ce12a1b28 Translated using Weblate (French) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-04-10 16:15:59 +00:00
Dominic Fischer
7ee87a0d4b Merge branch 'develop' into suspend_functions_1 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2021-04-10 16:50:30 +01:00
Dominic Fischer
66db67e857 Missed a spot 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2021-04-10 16:43:16 +01:00
Jeff Huang
f0e75d0634 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-04-10 08:02:23 +00:00
Besnik Bleta
67cbe6ebb0 Translated using Weblate (Albanian) 
Currently translated at 99.4% (2351 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-04-10 08:02:23 +00:00
Auri B. P
6443dd6c4d Translated using Weblate (Catalan) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2021-04-10 08:02:18 +00:00
Thibault Martin
fad3a60bc4 Translated using Weblate (French) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-04-10 08:02:18 +00:00
Jeff Huang
a7be6a61ef Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-04-10 08:02:17 +00:00
Nikita Epifanov
f68eae5891 Translated using Weblate (Russian) 
Currently translated at 99.4% (2351 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2021-04-10 08:02:16 +00:00
Vivek K J
007134da12 Translated using Weblate (Malayalam) 
Currently translated at 26.6% (629 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
 2021-04-10 08:02:16 +00:00
Nikita Epifanov
ceca81f0ab Translated using Weblate (Russian) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
 2021-04-10 08:02:13 +00:00
Jeanne Lavoie
bdb4e2dab8 Translated using Weblate (German) 
Currently translated at 99.9% (2362 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-04-10 08:02:12 +00:00
waclaw66
4561dc8c64 Translated using Weblate (Czech) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-04-10 08:02:12 +00:00
random
55d4304620 Translated using Weblate (Italian) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-04-10 08:02:12 +00:00
Thibault Martin
e4c664edaf Translated using Weblate (French) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-04-10 08:02:11 +00:00
Auri B. P
931bd1042b Translated using Weblate (Catalan) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
 2021-04-10 08:02:11 +00:00
Ihor Hordiichuk
f4959ba553 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-04-10 08:02:10 +00:00
Priit Jõerüüt
e0a79af93a Translated using Weblate (Estonian) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2021-04-10 08:02:10 +00:00
random
166817411c Translated using Weblate (Italian) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2021-04-10 08:02:09 +00:00
Priit Jõerüüt
91e85f56d8 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-04-10 08:02:09 +00:00
Benoit Marty
a9ef58912f http -> https 
Fix the followinf error, since gradle 7: `Using insecure protocols with repositories, without explicit opt-in, is unsupported. Switch Maven repository 'maven2(http://dl.bintray.com/piasy/maven)' to redirect to a secure protocol (like HTTPS) or allow insecure protocols. See https://docs.gradle.org/7.0/dsl/org.gradle.api.artifacts.repositories.UrlArtifactRepository.html#org.gradle.api.artifacts.repositories.UrlArtifactRepository:allowInsecureProtocol for more details.`
 2021-04-10 08:45:27 +02:00
gradle-update-robot
e404589544 Update Gradle Wrapper from 6.8.3 to 7.0. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2021-04-10 01:06:51 +00:00
Benoit Marty
a1209c83bb New store descriptions 2021-04-09 19:58:29 +02:00
Benoit Marty
38b49916e2 Small cleanup 2021-04-09 17:05:09 +02:00
Benoit Marty
37226a1641 Small cleanup 2021-04-09 16:58:41 +02:00
Benoit Marty
6d46bfc260
Merge pull request #3148 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-21.1.0 
Bump firebase-messaging from 21.0.1 to 21.1.0
 2021-04-09 16:39:05 +02:00
Benoit Marty
d40f2ef463
Merge pull request #3139 from vector-im/dependabot/gradle/androidx.recyclerview-recyclerview-1.2.0 
Bump recyclerview from 1.2.0-rc01 to 1.2.0
 2021-04-09 16:38:53 +02:00
Benoit Marty
8d1b56d526
Merge pull request #3138 from vector-im/dependabot/gradle/androidx.media-media-1.3.0 
Bump media from 1.2.1 to 1.3.0
 2021-04-09 16:38:39 +02:00
Benoit Marty
388e4eb112
Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34 
Bump daggerVersion from 2.33 to 2.34
 2021-04-09 16:38:25 +02:00
SpiritCroc
6a8cd9a329 Fix sometimes overlapping URL preview text with timestamp 
Change-Id: Ib441c2d0a447051b4dde2990111f748f1f3f2d66
 2021-04-09 12:54:40 +02:00
Benoit Marty
bec6cfc46d Version++ 2021-04-09 12:42:59 +02:00
Benoit Marty
0a326015ef Merge branch 'release/1.1.4' 2021-04-09 12:41:04 +02:00
Benoit Marty
08477cf581 Merge branch 'release/1.1.4' into develop 2021-04-09 12:41:02 +02:00
Benoit Marty
5ee8cf7ebf Prepare release 1.1.4 2021-04-09 12:40:11 +02:00
Marcus Hoffmann
1f37da276e propagate jitsi LIBRE_BUILD exclusion rules to not pull in gms libs 
Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: 7a64bf006e/android/sdk/build.gradle (L53)

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
Change-Id: Ifadfef30a6b3f3040e98713fa21dbc4e2ee94a9b
 2021-04-09 12:25:47 +02:00
SpiritCroc
16c06f5f62 Automatic SchildiChat string correction 
Change-Id: If21ffd3164e94d6d668f4057ecd4afbeb36dd83d
 2021-04-09 11:57:24 +02:00
SpiritCroc
235cfa48ee Automatic upstream merge postprocessing 
Change-Id: I4b019ba99e9d48b57791e1bf33ccca553ae40483
 2021-04-09 11:57:22 +02:00
SpiritCroc
6aa6f3e01b Merge tag 'v1.1.3' into sc 
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
 2021-04-09 11:57:11 +02:00
SpiritCroc
5bfc106a33 [TMP] Automatic upstream merge preparation 
Change-Id: I8850efdce1c1c8d1b1ff08471634d012810d95a4
 2021-04-09 11:55:41 +02:00
SpiritCroc
2407c905fe Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I0a3b0614e9533b7c572205eb571c21afa325cc7e
 2021-04-09 11:55:41 +02:00
SpiritCroc
61e9bfce5b pre_merge.sh: Fix when last merge was not tagged 
Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
 2021-04-09 11:55:15 +02:00
Benoit Marty
93bc5abcb5 Update the Emoji source file 2021-04-09 10:32:11 +02:00
Benoit Marty
5311bacfff ktlint 2021-04-09 10:26:28 +02:00
Benoit Marty
da7c2e38f6
Merge pull request #3140 from vector-im/feature/bca/verification_as_per_web 
Fix EW-EA compatibility for verification
 2021-04-09 10:24:01 +02:00
Benoit Marty
0d9990b2e3
Merge pull request #3147 from oogm/develop 
Update import_emojis.py to retain keyword order
 2021-04-09 10:00:47 +02:00