Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase against element android 1.6.6 #985

Merged
merged 85 commits into from
Oct 30, 2023
Merged

Rebase against element android 1.6.6 #985

merged 85 commits into from
Oct 30, 2023

Conversation

yostyle
Copy link
Contributor

@yostyle yostyle commented Oct 25, 2023

Type of change

  • Feature
  • Bugfix
  • Technical
  • Other :

Content

Rebase on element 1.6.6

Motivation and context

Screenshots / GIFs

Tests

  • Step 1
  • Step 2
  • Step ...

Tested devices

  • Physical
  • Emulator
  • OS version(s):

Checklist

tomtit and others added 30 commits April 22, 2023 19:31
@tomtit
Fixes #7758: Fixed JWT token for Jitsi openidtoken-jwt authentication
28da02c 
Signed-off-by: Alexey Nechaev <[email protected]>
@bmarty
Merge tag 'v1.6.5' into develop
313d4f8 
tag
@bmarty
version++
9aeb3b7
@weblate
Translated using Weblate (Latvian)
e567b9c 
Currently translated at 84.0% (2216 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
@weblate
Merge branch 'origin/develop' into Weblate.
975ef3c
@weblate
Translated using Weblate (Latvian)
95b63cc 
Currently translated at 88.6% (2336 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
@weblate
Translated using Weblate (Latvian)
cd7bf12 
Currently translated at 92.3% (2434 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
@rffontenelle @weblate
Translated using Weblate (Portuguese (Brazil))
fd46487 
Currently translated at 100.0% (2636 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
@rffontenelle @weblate
Translated using Weblate (Portuguese (Brazil))
10cde1f 
Currently translated at 100.0% (100 of 100 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
@weblate
Translated using Weblate (Latvian)
40fd9f2 
Currently translated at 97.0% (2558 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
@weblate
Translated using Weblate (Latvian)
27bae30 
Currently translated at 99.8% (2633 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
@weblate
Translated using Weblate (Latvian)
1bbd4b7 
Currently translated at 99.8% (2633 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
@BrkMrst @weblate
Translated using Weblate (Turkish)
380a0b8 
Currently translated at 58.6% (1546 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
@officialdakari @weblate
Translated using Weblate (Russian)
8885d14 
Currently translated at 99.9% (2634 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
@IhorHordiichuk @weblate
Translated using Weblate (Ukrainian)
5580f30 
Currently translated at 100.0% (2636 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
@Qaz-6 @weblate
Translated using Weblate (Azerbaijani)
3090688 
Currently translated at 9.0% (240 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/az/
@IhorHordiichuk @weblate
Translated using Weblate (Ukrainian)
754ea6a 
Currently translated at 100.0% (2636 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
@Qaz-6 @weblate
Translated using Weblate (Azerbaijani)
45be274 
Currently translated at 9.2% (245 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/az/
@hahahahacker2009 @weblate
Translated using Weblate (Vietnamese)
ad79348 
Currently translated at 88.2% (2326 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
@franconian @weblate
Translated using Weblate (German)
23e7bdb 
Currently translated at 100.0% (2640 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
@franconian @weblate
Translated using Weblate (German)
eeb67e1 
Currently translated at 100.0% (2640 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
@weblate
Translated using Weblate (Chinese (Simplified))
3216fa6 
Currently translated at 99.1% (2613 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
@weblate
Translated using Weblate (Chinese (Traditional))
83e2419 
Currently translated at 100.0% (2636 of 2636 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
@LinAGKar @weblate
Translated using Weblate (Swedish)
92399ab 
Currently translated at 100.0% (2640 of 2640 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
@bmarty
Hide setting entry point to manage 3Pid if homeserver capability `m.3…
39a7831 
…pid_changes` is set to `false`.
@bmarty
Fix typo
8f6edba
@bmarty
OIDC redirect to the web page to delete a session (legacy session man…
12395e9 
…ager) #8616
@bmarty
Format
4254415
@bmarty
Hide multi signout if we have an external account manager (#8616)
8941e63
@bmarty
OIDC redirect to the web page to delete a session (new session manage…
880ed69 
…r) #8616
bmarty and others added 20 commits September 12, 2023 16:28
@bmarty
Hide deactivate account section in case of account managed externally.
d31c741
@yostyle
Fix crash when max shortcuts count is exceeded (#8644)
ff548d2
@hughns
Open OIDC account management URL in chrome tab
470557c 
Not the external browser
@hughns
Changelog
3f2f386
@bmarty
Merge pull request #8627 from vector-im/feature/bma/hideAccountDeacti…
8c1cc44 
…vation

Hide deactivate account section in case of account managed externally.
@bmarty
Merge pull request #8645 from vector-im/hughns/oidc-device-logout-in-…
1b3be24 
…chrome-tab

Open OIDC account management URL in chrome tab
@BillCarsonFr
Fix QR code login support in rust
3b9daec
@BillCarsonFr
bump crypto sdk
6ee438d
@BillCarsonFr
update changelog
42eec4b
@BillCarsonFr
missing mock
0d70f6e
@BillCarsonFr
missing deprecated
2709cb2
@BillCarsonFr
disable flacky test on legacy crypto
1bd2da5
@BillCarsonFr @bmarty
Update matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sd…
87df8ab 
…k/internal/crypto/SecretShareManager.kt

Co-authored-by: Benoit Marty <[email protected]>
@BillCarsonFr
code review
a015eda
@BillCarsonFr
Merge pull request #8654 from vector-im/bca/fix_8653_qr_code
59ddf1a 
Fix QR code login support in rust
Changelog for version 1.6.6
d379cef
Adding fastlane file for version 1.6.6
7001f21
Merge branch 'release/1.6.6' into main
4fa634a
@yostyle
Merge vector-im/element-android v1.6.6 into element-rebase
d14bc0f
@yostyle
Fix conflict
253e9b6
@yostyle yostyle self-assigned this Oct 25, 2023
@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here
Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against 253e9b6

@yostyle yostyle marked this pull request as ready for review October 25, 2023 14:31
NicolasBuquet
NicolasBuquet reviewed Oct 25, 2023
View reviewed changes
Copy link
Contributor

@NicolasBuquet NicolasBuquet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Qu'est-ce qui est spécifique à Tchap dans les modifications du fichier VectorSettingsGeneralFragment.kt concernant hideFromUsersDirectoryPreference ?

@yostyle yostyle merged commit fcb63fa into develop Oct 30, 2023
15 checks passed
@yostyle yostyle deleted the rebase/element-android-1.6.6 branch October 30, 2023 08:13
@tchap-danger-bot
Copy link

Warnings
⚠️ Please add a reviewer to your PR.
Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against a2ad806

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NicolasBuquet NicolasBuquet NicolasBuquet approved these changes

Assignees

@yostyle yostyle

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.