Merge branch 'release/1.11.7/master'

.github/workflows/triage-move-labelled.yml

@@ -30,17 +30,6 @@ jobs:
               labels: ['Z-Labs']
             })
 
-  move_needs_info_issues:
-    name: X-Needs-Info issues to Need info column on triage board
-    runs-on: ubuntu-latest
-    steps:
-      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
-        with:
-          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-          project-url: "https://github.com/element-hq/element-ios/projects/12"
-          column-name: "Need info"
-          label-name: "X-Needs-Info"
-
   add_priority_design_issues_to_project:
     name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
@@ -68,64 +57,3 @@ jobs:
         with:
           project-url: https://github.com/orgs/element-hq/projects/28
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ex_plorers:
-    name: Add labelled issues to X-Plorer project
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: Element X Feature')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/73
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features1:
-    name: Add labelled issues to PS features team 1
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
-      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
-        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
-      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
-        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/56
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features2:
-    name: Add labelled issues to PS features team 2
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-      contains(github.event.issue.labels.*.name, 'A-Broadcast')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/58
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features3:
-    name: Add labelled issues to PS features team 3
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/57
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  voip:
-    name: Add labelled issues to VoIP project board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: VoIP')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/41
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

CHANGES.md

@@ -1,3 +1,14 @@
+## Changes in 1.11.7 (2024-02-07)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.27.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.6)).
+
+🐛 Bugfixes
+
+- Fix swapped accessibility label between strikethrough and underline format buttons in RTE. ([#7743](https://github.com/element-hq/element-ios/pull/7743))
+
+
 ## Changes in 1.11.6 (2024-01-09)
 
 🙌 Improvements

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.11.6
-CURRENT_PROJECT_VERSION = 1.11.6
+MARKETING_VERSION = 1.11.7
+CURRENT_PROJECT_VERSION = 1.11.7

Podfile

@@ -16,7 +16,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.27.5'
+$matrixSDKVersion = '= 0.27.6'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }

Podfile.lock

@@ -39,17 +39,17 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.27.5):
-    - MatrixSDK/Core (= 0.27.5)
-  - MatrixSDK/Core (0.27.5):
+  - MatrixSDK (0.27.6):
+    - MatrixSDK/Core (= 0.27.6)
+  - MatrixSDK/Core (0.27.6):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDKCrypto (= 0.3.13)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.27.5):
+  - MatrixSDK/JingleCallStack (0.27.6):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.3.13)
@@ -102,8 +102,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.27.5)
-  - MatrixSDK/JingleCallStack (= 0.27.5)
+  - MatrixSDK (= 0.27.6)
+  - MatrixSDK/JingleCallStack (= 0.27.6)
   - OLMKit
   - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
@@ -187,7 +187,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: f92ffead50eda83c99786afefed9be739987f338
+  MatrixSDK: 4129ab9c0acda1d0aad50b1c9765bd795b8d70b9
   MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
@@ -208,6 +208,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: dd877be9e7d8dbc03dfcb3372d76e2eb0bdfbc34
+PODFILE CHECKSUM: 9245f34ec35d24a0993d1a16faa145cf3094a1b2
 
 COCOAPODS: 1.14.3

Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -84,7 +84,7 @@
     {
       "identity" : "swift-ogg",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/swift-ogg",
+      "location" : "https://github.com/element-hq/swift-ogg",
       "state" : {
         "branch" : "0.0.1",
         "revision" : "e9a9e7601da662fd8b97d93781ff5c60b4becf88"

Riot/Assets/de.lproj/Vector.strings

@@ -2616,8 +2616,8 @@
 "manage_session_name_info" = "Sei dir bitte bewusst, dass Sitzungsnamen auch für Personen, mit denen du kommunizierst, sichtbar sind. %@";
 "manage_session_name_hint" = "Individuelle Sitzungsnamen können dir helfen, deine Geräte einfacher zu erkennen.";
 "user_other_session_filter" = "Filtern";
-"wysiwyg_composer_format_action_strikethrough" = "Unterstrichen formatieren";
-"wysiwyg_composer_format_action_underline" = "Durchgestrichen formatieren";
+"wysiwyg_composer_format_action_strikethrough" = "Durchgestrichen formatieren";
+"wysiwyg_composer_format_action_underline" = "Unterstrichen formatieren";
 "wysiwyg_composer_format_action_italic" = "Kursiv formatieren";
 
 // Formatting Actions

Riot/Assets/en.lproj/Vector.strings

@@ -2617,8 +2617,8 @@ To enable access, tap Settings> Location and select Always";
 // Formatting Actions
 "wysiwyg_composer_format_action_bold" = "Apply bold format";
 "wysiwyg_composer_format_action_italic" = "Apply italic format";
-"wysiwyg_composer_format_action_underline" = "Apply strikethrough format";
-"wysiwyg_composer_format_action_strikethrough" = "Apply underline format";
+"wysiwyg_composer_format_action_underline" = "Apply underline format";
+"wysiwyg_composer_format_action_strikethrough" = "Apply strikethrough format";
 "wysiwyg_composer_format_action_link" = "Apply link format";
 "wysiwyg_composer_format_action_inline_code" = "Apply inline code format";
 "wysiwyg_composer_format_action_unordered_list" = "Toggle bulleted list";

Riot/Assets/et.lproj/Vector.strings

@@ -2499,8 +2499,8 @@
 "authentication_qr_login_start_title" = "Loe QR-koodi";
 "authentication_login_with_qr" = "Logi sisse QR-koodi abil";
 "wysiwyg_composer_format_action_strikethrough" = "Kasuta allajoonitud kirja";
-"wysiwyg_composer_format_action_underline" = "Kasuta läbijoonitud kirja";
-"wysiwyg_composer_format_action_italic" = "Kasuta kaldkirja";
+"wysiwyg_composer_format_action_italic" = "Kasuta läbijoonitud kirja";
+"wysiwyg_composer_format_action_underline" = "Kasuta kaldkirja";
 
 // Formatting Actions
 "wysiwyg_composer_format_action_bold" = "Kasuta paksu kirja";

Riot/Assets/fr.lproj/Vector.strings

@@ -2631,8 +2631,8 @@
 "wysiwyg_composer_format_action_unordered_list" = "Liste à puces";
 "wysiwyg_composer_format_action_inline_code" = "Formater comme code informatique";
 "wysiwyg_composer_format_action_link" = "Formater comme lien";
-"wysiwyg_composer_format_action_strikethrough" = "Souligner";
-"wysiwyg_composer_format_action_underline" = "Barrer";
+"wysiwyg_composer_format_action_strikethrough" = "Barrer";
+"wysiwyg_composer_format_action_underline" = "Souligner";
 "wysiwyg_composer_format_action_italic" = "Mettre en italique";
 
 // Formatting Actions

Riot/Assets/hu.lproj/Vector.strings

@@ -2501,8 +2501,8 @@
 "room_first_message_placeholder" = "Küld el az első üzenetedet…";
 "authentication_qr_login_confirm_title" = "Biztonságos kapcsolat beállítva";
 "room_event_encryption_info_key_authenticity_not_guaranteed" = "A titkosított üzenetek valódiságát ezen az eszközön nem lehet garantálni.";
-"wysiwyg_composer_format_action_strikethrough" = "Aláhúzott";
-"wysiwyg_composer_format_action_underline" = "Áthúzott";
+"wysiwyg_composer_format_action_underline" = "Aláhúzott";
+"wysiwyg_composer_format_action_strikethrough" = "Áthúzott";
 "wysiwyg_composer_format_action_italic" = "Dőlt";
 
 // Formatting Actions

Riot/Assets/id.lproj/Vector.strings

@@ -2782,8 +2782,8 @@
 "authentication_qr_login_start_subtitle" = "Gunakan kamera pada perangkat ini untuk memindai kode QR yang ditampilkan di perangkat Anda yang lain:";
 "authentication_qr_login_start_title" = "Pindai kode QR";
 "authentication_login_with_qr" = "Masuk dengan kode QR";
-"wysiwyg_composer_format_action_strikethrough" = "Terapkan format garis bawah";
-"wysiwyg_composer_format_action_underline" = "Terapkan format coret";
+"wysiwyg_composer_format_action_underline" = "Terapkan format garis bawah";
+"wysiwyg_composer_format_action_strikethrough" = "Terapkan format coret";
 "wysiwyg_composer_format_action_italic" = "Terapkan format miring";
 
 // Formatting Actions

Riot/Assets/it.lproj/Vector.strings

@@ -2555,8 +2555,8 @@
 "authentication_qr_login_start_subtitle" = "Usa la fotocamera di questo dispositivo per scansionare il codice QR mostrato nell'altro dispositivo:";
 "authentication_qr_login_start_title" = "Scansiona codice QR";
 "authentication_login_with_qr" = "Accedi con codice QR";
-"wysiwyg_composer_format_action_strikethrough" = "Applica formato sottolineato";
-"wysiwyg_composer_format_action_underline" = "Applica formato sbarrato";
+"wysiwyg_composer_format_action_underline" = "Applica formato sottolineato";
+"wysiwyg_composer_format_action_strikethrough" = "Applica formato sbarrato";
 "wysiwyg_composer_format_action_italic" = "Applica formato corsivo";
 
 // Formatting Actions

Riot/Assets/ja.lproj/Vector.strings

@@ -2752,8 +2752,8 @@
 "notice_error_unformattable_event" = "** メッセージを描画できません。不具合を報告してください";
 "wysiwyg_composer_format_action_un_indent" = "インデントを減らす";
 "wysiwyg_composer_format_action_indent" = "インデントを増やす";
-"wysiwyg_composer_format_action_strikethrough" = "下線で装飾";
-"wysiwyg_composer_format_action_underline" = "打ち消し線で装飾";
+"wysiwyg_composer_format_action_underline" = "下線で装飾";
+"wysiwyg_composer_format_action_strikethrough" = "打ち消し線で装飾";
 
 
 // MARK: - WYSIWYG Composer

Riot/Assets/nl.lproj/Vector.strings

@@ -2646,8 +2646,8 @@
 "invite_to" = "Uitnodigen %@";
 "room_event_encryption_info_key_authenticity_not_guaranteed" = "De authenticiteit van dit versleutelde bericht kan niet worden gegarandeerd op dit apparaat.";
 "deselect_all" = "Deselecteer alles";
-"wysiwyg_composer_format_action_strikethrough" = "Onderstrepen formaat toepassen";
-"wysiwyg_composer_format_action_underline" = "Doorstrepen formaat toepassen";
+"wysiwyg_composer_format_action_underline" = "Onderstrepen formaat toepassen";
+"wysiwyg_composer_format_action_strikethrough" = "Doorstrepen formaat toepassen";
 "wysiwyg_composer_format_action_italic" = "Cursief formaat toepassen";
 
 // Formatting Actions

Riot/Assets/peo.lproj/InfoPlist.strings

@@ -0,0 +1 @@
+

Riot/Assets/pl.lproj/Vector.strings

@@ -2694,8 +2694,8 @@
 "wysiwyg_composer_format_action_unordered_list" = "Przełącz listę punktorów";
 "wysiwyg_composer_format_action_inline_code" = "Zastosuj kod w tekście";
 "wysiwyg_composer_format_action_link" = "Zastosuj link";
-"wysiwyg_composer_format_action_strikethrough" = "Zastosuj podkreślenie";
-"wysiwyg_composer_format_action_underline" = "Zastosuj przekreślenie";
+"wysiwyg_composer_format_action_underline" = "Zastosuj podkreślenie";
+"wysiwyg_composer_format_action_strikethrough" = "Zastosuj przekreślenie";
 "wysiwyg_composer_format_action_italic" = "Zastosuj kursywę";
 
 // Formatting Actions

Riot/Assets/pt_BR.lproj/Vector.strings

@@ -2556,8 +2556,8 @@
 "authentication_qr_login_start_subtitle" = "Use a câmera neste dispositivo para scannar o QR code mostrado em seu outro dispositivo:";
 "authentication_qr_login_start_title" = "Scannar QR code";
 "authentication_login_with_qr" = "Fazer signin com QR code";
-"wysiwyg_composer_format_action_strikethrough" = "Aplicar formato sublinhar";
-"wysiwyg_composer_format_action_underline" = "Aplicar formato tachar";
+"wysiwyg_composer_format_action_underline" = "Aplicar formato sublinhar";
+"wysiwyg_composer_format_action_strikethrough" = "Aplicar formato tachar";
 "wysiwyg_composer_format_action_italic" = "Aplicar formato itálico";
 
 // Formatting Actions