filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,495 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

25495 Commits

Author SHA1 Message Date
SpiritCroc e8b50941ba Automatic SchildiChat string correction 
Change-Id: I3923e7be57b7ee80c4aaa117cfd22545ec937327
 2023-05-25 12:04:03 +02:00
SpiritCroc 74f800ed23 Automatic upstream merge postprocessing 
Change-Id: I8601f26a2925acb03824224ef56a4f58a64fad9d
 2023-05-25 12:04:02 +02:00
SpiritCroc 9614f5994d Merge tag 'v1.6.1' into sc 
Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
 2023-05-25 12:03:56 +02:00
SpiritCroc 4cdc4f1341 [TMP] Automatic upstream merge preparation 
Change-Id: Id97218e185f871ca5936f8773ce5f5b34d432e50
 2023-05-25 11:51:31 +02:00
SpiritCroc 2af92abb38 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iee117c31686e6bc899ee6568e8aa3e6a5445e60d
 2023-05-25 11:51:31 +02:00
SpiritCroc 349fbe0f23 pre_merge.sh: ignore failure during git tag 
Do not fail if tag already exists

Change-Id: I8c54fe85879e8bd1866ee96951aca406a03862ed
 2023-05-25 11:50:25 +02:00
Benoit Marty 8f69e411d7 version++ 2023-05-25 11:22:07 +02:00
Benoit Marty e961a8ccb5 Merge tag 'v1.6.1' into develop 
tag
 2023-05-25 11:20:39 +02:00
Benoit Marty b9cc1b6dab Merge branch 'release/1.6.1' into main 2023-05-25 11:20:18 +02:00
Benoit Marty 93e2d7d176 Adding fastlane file for version 1.6.1 2023-05-25 11:18:34 +02:00
Benoit Marty f261a903f0 Changelog for version 1.6.1 2023-05-25 11:18:08 +02:00
Benoit Marty 82748591f9 Setting version for the release 1.6.1 2023-05-25 11:05:07 +02:00
Benoit Marty 997c9dd917 Ensure signout service is always use even if users want to ignore sigout error from the server. The SDK is doing more cleanup. 2023-05-25 10:38:08 +02:00
Benoit Marty cff9fbd008
Merge pull request #8439 from vector-im/yostyle/fix_crash_on_start_verification 
Allow stateloss on verification dialogfragment
 2023-05-25 09:36:40 +02:00
Weblate 43692c1da8 Merge branch 'origin/develop' into Weblate. 2023-05-24 20:08:03 +00:00
raspin0 287bff473d Translated using Weblate (Polish) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
 2023-05-24 20:08:01 +00:00
Besnik Bleta d26d7f124b Translated using Weblate (Albanian) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2023-05-24 20:07:59 +00:00
Linerly 390377480c Translated using Weblate (Indonesian) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2023-05-24 20:07:57 +00:00
waclaw66 7cff46d271 Translated using Weblate (Czech) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2023-05-24 20:07:55 +00:00
Peter Chen 1058f4b91d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2023-05-24 20:07:53 +00:00
Danial Behzadi 8eee238220 Translated using Weblate (Persian) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2023-05-24 20:07:51 +00:00
Priit Jõerüüt b1b784de9f Translated using Weblate (Estonian) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2023-05-24 20:07:49 +00:00
Ihor Hordiichuk 8447e06b21 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2023-05-24 20:07:47 +00:00
LinAGKar 580f979c05 Translated using Weblate (Swedish) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2023-05-24 20:07:45 +00:00
Jozef Gaal cffd6e80d0 Translated using Weblate (Slovak) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
 2023-05-24 20:07:43 +00:00
Glandos d6302d3b9b Translated using Weblate (French) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2023-05-24 20:07:41 +00:00
Vri d78d07b42a Translated using Weblate (German) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2023-05-24 20:07:39 +00:00
Jeff Huang 7e748f28e8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-05-24 20:07:37 +00:00
ang yong en 900828f57d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.8% (2574 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2023-05-24 20:07:36 +00:00
phardyle d5794441d6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.8% (2574 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2023-05-24 20:07:36 +00:00
Ihor Hordiichuk 09c70c99fa Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2023-05-24 20:07:36 +00:00
LinAGKar 0391f77623 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2023-05-24 20:07:35 +00:00
Besnik Bleta 3848982c07 Translated using Weblate (Albanian) 
Currently translated at 99.3% (2615 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2023-05-24 20:07:35 +00:00
Jozef Gaal d409a33f92 Translated using Weblate (Slovak) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2023-05-24 20:07:34 +00:00
Daimar Stein 671f846f53 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.2% (2584 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2023-05-24 20:07:34 +00:00
Bruno 17a3ea3148 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.2% (2584 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2023-05-24 20:07:34 +00:00
raspin0 baccb84efb Translated using Weblate (Polish) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2023-05-24 20:07:33 +00:00
Linerly 36db0ac8d6 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2023-05-24 20:07:33 +00:00
Glandos 1996df2f93 Translated using Weblate (French) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2023-05-24 20:07:32 +00:00
Tuomas Hietala 8fc5d73f75 Translated using Weblate (Finnish) 
Currently translated at 84.0% (2212 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2023-05-24 20:07:32 +00:00
Danial Behzadi 541690605f Translated using Weblate (Persian) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2023-05-24 20:07:28 +00:00
Priit Jõerüüt 19ba773df9 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2023-05-24 20:07:27 +00:00
Vri 72b2b591e3 Translated using Weblate (German) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2023-05-24 20:07:27 +00:00
waclaw66 0edea016b1 Translated using Weblate (Czech) 
Currently translated at 100.0% (2631 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2023-05-24 20:07:26 +00:00
Zet bf244f6805 Translated using Weblate (Arabic) 
Currently translated at 39.3% (1034 of 2631 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2023-05-24 20:07:26 +00:00
dependabot[bot] d5d5c9009b
Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 (#8464) 
* Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1

Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 1.2.2 to 2.2.1.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/1.2.2...2.2.1)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix compilation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jonnyandrew <jonnya@element.io>
 2023-05-24 10:14:22 +00:00
Valere e4e4c2940b
Merge pull request #8441 from vector-im/feature/bca/more_migration_logs 
Add more migration logs
 2023-05-24 10:11:08 +02:00
Valere 6da05a3804
Merge pull request #8462 from vector-im/feature/bca/fix_8445 
Special text for re-verification after update
 2023-05-24 10:10:52 +02:00
Valere 9f3255dd78
Merge pull request #8458 from vector-im/feature/bca/remove_legacy_per_device_verif 
Remove legacy manually verify specific other device
 2023-05-24 01:09:29 +02:00
valere bb59a758cf code review 2023-05-24 00:06:36 +02:00