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

8425 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
29a308b7c2 Automatic SchildiChat string correction 
Change-Id: I9e021a889a4b9a17960897773df7371d3b6a9dc4
 2021-02-04 17:10:26 +01:00
SpiritCroc
8e32c041db Automatic upstream merge postprocessing 
Change-Id: Id3446b2b984430aa7f1fd6cba36410ee80a21c4c
 2021-02-04 17:10:24 +01:00
SpiritCroc
c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
SpiritCroc
ad4ba631b9 [TMP] Automatic upstream merge preparation 
Change-Id: I2ae1f63d762d0366be303ba08778a35673f5a3d3
 2021-02-04 17:00:40 +01:00
SpiritCroc
ad36a7ca8c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I736ff2eb773f682790e80897bff5e41c84ec7559
 2021-02-04 17:00:39 +01:00
ganfra
6cd462f852 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-04 16:52:06 +01:00
ganfra
04c4485e3e VoIP: add some feedback on controls 2021-02-04 16:29:23 +01:00
Valere
64694a4eda Fix duplicate thumbs reactions 2021-02-04 16:13:57 +01:00
Benoit Marty
d11ed8c4ef Version++ 2021-02-04 15:17:46 +01:00
Benoit Marty
391ddf1925 Merge branch 'release/1.0.16' 2021-02-04 13:25:23 +01:00
Benoit Marty
205feeaf10 Merge branch 'release/1.0.16' into develop 2021-02-04 13:25:22 +01:00
Benoit Marty
e51f2b8bc1 Prepare release 1.0.16 2021-02-04 13:25:12 +01:00
Benoit Marty
2d5f57591f
Merge pull request #2775 from vector-im/feature/bma/fix_crash_1015 
Fix crash on API < 30 and light theme (#2774)
 2021-02-04 13:18:45 +01:00
Benoit Marty
3c06517d9e Fix crash on API < 30 and light theme (#2774) 2021-02-04 12:32:13 +01:00
Weblate
63fb5809bf Merge branch 'origin/develop' into Weblate. 2021-02-03 16:36:51 +00:00
Benoit Marty
a65f846929 Version++ 2021-02-03 17:09:32 +01:00
Benoit Marty
ce6d4c4a64 Merge branch 'release/1.0.15' 2021-02-03 17:08:27 +01:00
Benoit Marty
4ee6273f2e Merge branch 'release/1.0.15' into develop 2021-02-03 17:08:26 +01:00
Benoit Marty
061f3c6919 Prepare release 1.0.15 2021-02-03 17:07:49 +01:00
Benoit Marty
9b13381938
Merge pull request #2762 from vector-im/feature/bma/track 
Improvements
 2021-02-03 17:02:25 +01:00
Benoit Marty
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth 
Feature/bca/sso reauth
 2021-02-03 16:12:54 +01:00
Valere
73fccdd6de fix test compilation 2021-02-03 15:38:16 +01:00
Benoit Marty
ad9873c565 Some cleanup 2021-02-03 14:52:58 +01:00
Valere
e976100f1a Fix test compilation error 2021-02-03 14:48:43 +01:00
Valere
289a3ab21f remove dev id for now 2021-02-03 14:36:38 +01:00
Valere
286f00396d Removed unused var 2021-02-03 14:20:58 +01:00
Weblate
cbda0ad37b Merge branch 'origin/develop' into Weblate. 2021-02-03 08:53:37 +00:00
Slobodan Simić
db6fdcd098 Translated using Weblate (Serbian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-03 08:53:28 +00:00
Slobodan Simić
7e3362da61 Translated using Weblate (Serbian) 
Currently translated at 5.9% (122 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sr/
 2021-02-03 08:53:27 +00:00
waclaw66
d9720a5199 Translated using Weblate (Czech) 
Currently translated at 100.0% (2057 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-02-03 08:53:27 +00:00
Auri B. P
3a65037151 Translated using Weblate (Catalan) 
Currently translated at 90.1% (1854 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2021-02-03 08:53:26 +00:00
Benoit Marty
424035f56f Better clearing of RealmLists 2021-02-03 09:46:35 +01:00
Valere
2a12cf22f5 fix code quality, line too long 2021-02-03 09:39:26 +01:00
Valere
97daf57b0a cleaning 2021-02-03 09:32:51 +01:00
Valere
697b551b9b Cleaning / Code review 2021-02-02 23:10:14 +01:00
Valere
0211197c47 SSO UIA for add 3pid + refactoring move RegistrationFlow to api 2021-02-02 22:25:49 +01:00
Benoit Marty
3b65761110 Delete on cascade 2021-02-02 21:23:57 +01:00
Benoit Marty
cfdfd3a8af internal 2021-02-02 21:22:54 +01:00
Benoit Marty
6ac2717d8b
Merge pull request #2760 from vector-im/feature/fga/fix_multiple_task 
Fix multiple tasks
 2021-02-02 17:55:19 +01:00
ganfra
49aed39711 Fix multiple tasks 2021-02-02 17:11:45 +01:00
Benoit Marty
a820443c56 Fix copyright 2021-02-02 13:05:39 +01:00
Benoit Marty
67aa239398
Merge pull request #2755 from vector-im/feature/bma/big_e2e_rooms_2 
Data for Worker overload (#2721)
 2021-02-02 13:04:33 +01:00
Valere
2a3962265b SSO UIA for deactivate account 2021-02-02 12:30:46 +01:00
Slobodan Simić
883a22ba83 Translated using Weblate (Serbian) 
Currently translated at 89.5% (197 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-02 11:21:10 +00:00
Danial Behzadi
2e68c48752 Translated using Weblate (Persian) 
Currently translated at 71.4% (5 of 7 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-02-02 11:21:09 +00:00
sr093906
3e87534ddc Translated using Weblate (Chinese (Simplified)) 
Currently translated at 86.3% (190 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hans/
 2021-02-02 11:21:09 +00:00
Danial Behzadi
c6da7b19a7 Translated using Weblate (Persian) 
Currently translated at 100.0% (2057 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-02-02 11:21:09 +00:00
John
85293ca2ed Translated using Weblate (Greek) 
Currently translated at 24.7% (510 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/el/
 2021-02-02 11:21:06 +00:00
Auri B. P
ed264382e9 Translated using Weblate (Catalan) 
Currently translated at 89.8% (1849 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2021-02-02 11:21:05 +00:00
Benoit Marty
e6fc605b08 Data for Worker overload (#2721) 2021-02-02 11:40:52 +01:00