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

13250 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
f3393e120b Automatic SchildiChat string correction 
Change-Id: I042cd791b33f88c68df1f9a4b593e9cc968a6c65
 2021-12-05 13:51:40 +01:00
SpiritCroc
1bcf341ec3 Automatic upstream merge postprocessing 
Change-Id: I35fd8386a4640b7bc8010d3d5d8384b235f4bd06
 2021-12-05 13:51:40 +01:00
SpiritCroc
4b63a9f939 Merge tag 'v1.3.9' into sc 
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861

Conflicts:
	vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
	vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
	vector/src/main/java/im/vector/app/VectorApplication.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/composer/MessageComposerViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
 2021-12-05 13:46:55 +01:00
SpiritCroc
cd2021d5ec [TMP] Automatic upstream merge preparation 
Change-Id: Id9ef970ed0d0c41e8b78677352c43cb25e0fe0da
 2021-12-05 13:23:05 +01:00
SpiritCroc
2af702451d Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I2d3cc21e2a4562cfddceb57c74ef8749f31cae56
 2021-12-05 13:23:05 +01:00
random
a2cbd447b9 Translated using Weblate (Italian) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2021-12-04 17:25:57 +00:00
libexus
1621c04ad8 Translated using Weblate (German) 
Currently translated at 94.8% (37 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2021-12-04 17:25:56 +00:00
random
c74633c0f8 Translated using Weblate (Italian) 
Currently translated at 99.8% (2690 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-12-04 17:25:55 +00:00
libexus
0a35604dfa Translated using Weblate (German) 
Currently translated at 98.4% (2650 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-12-04 17:25:54 +00:00
Zet
d6d1fe72a2 Translated using Weblate (Arabic) 
Currently translated at 39.5% (1065 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2021-12-04 17:25:53 +00:00
Benoit Marty
88605b65b7
Merge pull request #4628 from vector-im/feature/bma/compressVideo 
Add script to compress video and convert to gif file
 2021-12-03 18:13:20 +01:00
Benoit Marty
1f58913b53
Merge pull request #4626 from vector-im/feature/adm/feature-flags 
Feature flags base
 2021-12-03 17:38:25 +01:00
Benoit Marty
b2dce51fc2 Add script to compress video and convert to gif file 2021-12-03 17:30:30 +01:00
Benoit Marty
e60d053f84
Merge pull request #4568 from vector-im/feature/fga/fix_sdk_integration_tests 
Feature/fga/fix sdk integration tests
 2021-12-03 17:11:33 +01:00
Adam Brown
e3155b6c98 removing notifications v1, v2 is live 2021-12-03 16:08:44 +00:00
Adam Brown
db406704c9 removing boolean notification version usage 2021-12-03 15:58:18 +00:00
Benoit Marty
9f4f15aa92
Merge pull request #4625 from vector-im/feature/dla/outgoing_pstn_call_fails 
select answer should be used for outgoing calls.
 2021-12-03 16:56:13 +01:00
Adam Brown
8a0fe41b80 adding changelog entry 2021-12-03 15:40:53 +00:00
Adam Brown
6a3d4044ef removing unused imports and increasing enum allowance 2021-12-03 15:30:55 +00:00
Adam Brown
11669fa2ac porting the notifications setting version to the vector features 2021-12-03 15:26:43 +00:00
David Langley
767ead019a Add warning if unexpected state. 2021-12-03 15:13:06 +00:00
Adam Brown
8007654e2a setting login version via typed build config field instead of resources 2021-12-03 15:11:31 +00:00
Adam Brown
54c45d3e71 separating the SSO redirection from the login activities 
- adds a dedicated routing activity to proxy the uri to the login selected by the feature flags
 2021-12-03 14:51:20 +00:00
Onuray Sahin
23ad4e5a27 Remove legacy implementation classes. 2021-12-03 16:19:19 +03:00
Onuray Sahin
435dc9f9d1 Fix room list preview. 2021-12-03 15:57:07 +03:00
Benoit Marty
cd7345aa6b
Removing trailing space 2021-12-03 13:54:05 +01:00
Adam Brown
9e367a8535 providing a features abstraction for the login 
- aims to have a centralised place for all feature login, overrideable by forks and debug flavours
 2021-12-03 12:16:43 +00:00
Onuray Sahin
0a7df44a12 Add confirmation dialog to end poll. 2021-12-03 15:11:23 +03:00
Adam Brown
a2a89c1ee8 moving the soft logout activity starting to the navigator 2021-12-03 11:58:13 +00:00
ganfra
667bf1a848 Tests: fix internal TestMatrix 2021-12-03 12:55:32 +01:00
David Langley
de7180ef7e And remove braces 2021-12-03 11:30:28 +00:00
David Langley
0cf50e88e9 Keep guard pattern 2021-12-03 11:28:49 +00:00
David Langley
bf8b485e2c lint 2021-12-03 11:24:40 +00:00
David Langley
90f2e2c32e Create 4621.bugfix 2021-12-03 11:17:47 +00:00
David Langley
a527e7a64a Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/outgoing_pstn_call_fails 2021-12-03 11:14:31 +00:00
Ekaterina Gerasimova
1aa532178e Issue workflow: Split out spaces jobs for new and old boards 2021-12-03 10:01:25 +00:00
Ekaterina Gerasimova
c89c0dcbd2 Issue workflow: fix filtering for Design issues 2021-12-03 10:01:25 +00:00
Ekaterina Gerasimova
3778603c4d Issue workflow: improve naming for jobs 2021-12-03 10:01:25 +00:00
Besnik Bleta
e053a81f7c Translated using Weblate (Albanian) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2021-12-03 09:26:10 +00:00
Linerly
4e7eccd07c Translated using Weblate (Indonesian) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2021-12-03 09:26:09 +00:00
waclaw66
d4aec802c4 Translated using Weblate (Czech) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-12-03 09:26:08 +00:00
Jeff Huang
d50a75e6be Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-12-03 09:26:07 +00:00
Danial Behzadi
1c675bd020 Translated using Weblate (Persian) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-12-03 09:26:05 +00:00
Priit Jõerüüt
18b2a058bd Translated using Weblate (Estonian) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2021-12-03 09:26:04 +00:00
sr093906
f5dac77856 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
 2021-12-03 09:26:03 +00:00
Ihor Hordiichuk
648cba5cd6 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-12-03 09:26:02 +00:00
lvre
0026b17b83 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2021-12-03 09:26:01 +00:00
Szimszon
c588d99bbb Translated using Weblate (Hungarian) 
Currently translated at 100.0% (39 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2021-12-03 09:26:00 +00:00
Jeff Huang
122273d22a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-12-03 09:25:59 +00:00
sr093906
bfb0846ddc Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-12-03 09:25:58 +00:00