Skip to content

Commit

Permalink
Merge branch 'release/1.9.3/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gulekismail committed Sep 7, 2022
2 parents e1a2814 + 27ea2ec commit 6c9ff1b
Show file tree
Hide file tree
Showing 99 changed files with 3,292 additions and 696 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci-ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,7 @@ jobs:
# Main step
- name: UI tests
run: bundle exec fastlane uitest

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3

24 changes: 0 additions & 24 deletions .github/workflows/triage-move-labelled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,30 +134,6 @@ jobs:
env:
PROJECT_ID: "PN_kwDOAM0swc2KCw"
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

move_threads_issues:
name: A-Threads to Thread board
runs-on: ubuntu-latest
if: >
contains(github.event.issue.labels.*.name, 'A-Threads')
steps:
- uses: octokit/graphql-action@v2.x
with:
headers: '{"GraphQL-Features": "projects_next_graphql"}'
query: |
mutation add_to_project($projectid:ID!,$contentid:ID!) {
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
projectNextItem {
id
}
}
}
projectid: ${{ env.PROJECT_ID }}
contentid: ${{ github.event.issue.node_id }}
env:
PROJECT_ID: "PN_kwDOAM0swc0rRA"
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

move_message_bubble_issues:
name: A-Message-Bubbles to Message bubble board
runs-on: ubuntu-latest
Expand Down
27 changes: 27 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
## Changes in 1.9.3 (2022-09-07)

✨ Features

- CryptoV2: Self-verification flow ([#6589](https://github.com/vector-im/element-ios/issues/6589))

🙌 Improvements

- Analytics: Measure performance in Sentry ([#6647](https://github.com/vector-im/element-ios/pull/6647))
- Crypto: Slash command to discard outbound session ([#6668](https://github.com/vector-im/element-ios/pull/6668))
- Upgrade MatrixSDK version ([v0.23.18](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.18)).
- Removed labs flag and enabled New App Layout ([#6673](https://github.com/vector-im/element-ios/issues/6673))
- Update empty states as per latest design update ([#6674](https://github.com/vector-im/element-ios/issues/6674))
- Reset allChatsOnboardingHasBeenDisplayed on logout ([#6676](https://github.com/vector-im/element-ios/issues/6676))

🐛 Bugfixes

- Fixed incorrect iOS 16 timeline item text height calculations leading to empty gaps. ([#6441](https://github.com/vector-im/element-ios/issues/6441))
- Fix mention pills display on iOS 16 ([#6442](https://github.com/vector-im/element-ios/issues/6442))
- Fixed last message time ellipsis ([#6512](https://github.com/vector-im/element-ios/issues/6512))
- Glitchy room list header when scrolling ([#6513](https://github.com/vector-im/element-ios/issues/6513))
- Performance issues with new App Layout ([#6537](https://github.com/vector-im/element-ios/issues/6537))
- Fixed UI glitches in dark mode ([#6645](https://github.com/vector-im/element-ios/issues/6645))
- Fix mention pills display when coming back to a room with an unsent message ([#6670](https://github.com/vector-im/element-ios/issues/6670))
- Fixed last scrolling glitches in All Chats screen ([#6680](https://github.com/vector-im/element-ios/issues/6680))


## Changes in 1.9.2 (2022-08-31)

🙌 Improvements
Expand Down
4 changes: 2 additions & 2 deletions Config/AppVersion.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
//

// Version
MARKETING_VERSION = 1.9.2
CURRENT_PROJECT_VERSION = 1.9.2
MARKETING_VERSION = 1.9.3
CURRENT_PROJECT_VERSION = 1.9.3
5 changes: 1 addition & 4 deletions Config/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,8 @@ final class BuildSettings: NSObject {
static let syncLocalContacts: Bool = false

// MARK: - New App Layout
static let newAppLayoutEnabled = false
static let newAppLayoutEnabled = true

static var isSideMenuActivated: Bool = enableSideMenu
static var isNewAppLayoutActivated: Bool = newAppLayoutEnabled

// MARK: - Device manager

static let deviceManagerEnabled = false
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.23.17'
$matrixSDKVersion = '= 0.23.18'
# $matrixSDKVersion = :local
# $matrixSDKVersion = { :branch => 'develop'}
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
Expand Down
18 changes: 9 additions & 9 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ PODS:
- LoggerAPI (1.9.200):
- Logging (~> 1.1)
- Logging (1.4.0)
- MatrixSDK (0.23.17):
- MatrixSDK/Core (= 0.23.17)
- MatrixSDK/Core (0.23.17):
- MatrixSDK (0.23.18):
- MatrixSDK/Core (= 0.23.18)
- MatrixSDK/Core (0.23.18):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- MatrixSDK/CryptoSDK
- OLMKit (~> 3.2.5)
- Realm (= 10.27.0)
- SwiftyBeaver (= 1.9.5)
- MatrixSDK/CryptoSDK (0.23.17):
- MatrixSDK/CryptoSDK (0.23.18):
- MatrixSDKCrypto (= 0.1.0)
- MatrixSDK/JingleCallStack (0.23.17):
- MatrixSDK/JingleCallStack (0.23.18):
- JitsiMeetSDK (= 5.0.2)
- MatrixSDK/Core
- MatrixSDKCrypto (0.1.0)
Expand Down Expand Up @@ -123,8 +123,8 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.2)
- KTCenterFlowLayout (~> 1.3.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.23.17)
- MatrixSDK/JingleCallStack (= 0.23.17)
- MatrixSDK (= 0.23.18)
- MatrixSDK/JingleCallStack (= 0.23.18)
- OLMKit
- PostHog (~> 1.4.4)
- ReadMoreTextView (~> 3.0.1)
Expand Down Expand Up @@ -221,7 +221,7 @@ SPEC CHECKSUMS:
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatrixSDK: 82cc75542d5df1da80f68fad1541df7bfb67efb6
MatrixSDK: 26da2e3a9f3b02fc6ea67f5bc311d30f06f9ffba
MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
OLMKit: da115f16582e47626616874e20f7bb92222c7a51
PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
Expand All @@ -241,6 +241,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 5c7121d9069b1034690a3c16f6af791167172e53
PODFILE CHECKSUM: 45176df406c18b0c23321a308f58535fbe425a93

COCOAPODS: 1.11.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "all_chats_empty_screen_artwork.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "all_chats_empty_screen_artwork@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "all_chats_empty_screen_artwork@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "all_chats_empty_screen_artwork_dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "all_chats_empty_screen_artwork_dark@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "all_chats_empty_screen_artwork_dark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "all_chats_empty_space_artwork.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "all_chats_empty_space_artwork@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "all_chats_empty_space_artwork@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "all_chats_empty_space_artwork_dark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "all_chats_empty_space_artwork_dark@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "all_chats_empty_space_artwork_dark@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions Riot/Assets/ar.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -1028,3 +1028,53 @@
"new_word" = "جديد";
"stop" = "إيقاف";
"joining" = "الانْضِمام إلى";
"room_participants_invite_prompt_to_msg" = "هَل أنتَ مُتَأكِّدٌ أنَّكَ تريد دعوة %@ إلى %@؟";
"room_participants_leave_success" = "غادَر الغُرفَة";
"room_participants_leave_processing" = "مغادرة";
"password_validation_error_contain_symbol" = "تحتوي على رمز.";
"password_validation_error_contain_number" = "تحتوي على رقم.";
"password_validation_error_contain_uppercase_letter" = "تحتوي على حرف كبير.";
"password_validation_error_contain_lowercase_letter" = "تحتوي على حرف صغير.";
/* The placeholder will show a number */
"password_validation_error_max_length" = "لا تتعدى %d أحرف.";
/* The placeholder will show a number */
"password_validation_error_min_length" = "%d أحرف على الأقل.";
"password_validation_error_header" = "كلمة المرور المقدمة لا تسْتَوفي المعايير أدناه:";

// MARK: Password Validation
"password_validation_info_header" = "يجب أن تسْتَوفي كَلِمَةُ المُرُور الخاصة بك المعايير أدناه:";
"authentication_recaptcha_title" = "هل أنت إنسان؟";
"authentication_terms_policy_url_error" = "تعذر العثور على السياسة المحددة. الرجاء معاودة المحاولة في وقت لاحق.";
/* The placeholder will show the homeserver's domain */
"authentication_terms_message" = "يرجى قراءة شروط وسياسات %@";
"authentication_terms_title" = "سياسات الخُصُوصِيَّة";
"authentication_verify_msisdn_invalid_phone_number" = "رَقم الهَاتِف غَير صَالِح";
"authentication_verify_msisdn_waiting_button" = "إعادَة إرسَال الرمز";
/* The placeholder will show the phone number that was entered. */
"authentication_verify_msisdn_waiting_message" = "تم إرسال رمز إلى %@";
"authentication_verify_msisdn_waiting_title" = "تحقق من رقم هاتفك";
"authentication_verify_msisdn_otp_text_field_placeholder" = "رمز التَأكيد";
"authentication_verify_msisdn_text_field_placeholder" = "رَقم الهَاتِف";
/* The placeholder will show the homeserver's domain */
"authentication_verify_msisdn_input_message" = "%@ يحتاج إلى التحقق من حسابك";
"authentication_verify_msisdn_input_title" = "أدخل رقم هَاتِفك";
"authentication_choose_password_not_verified_message" = "تحقق من بريدك الوارد";
"authentication_choose_password_not_verified_title" = "لم يتم التحقق من البَريد الإلِكتُرونيّ";
"authentication_choose_password_submit_button" = "إعادة ضَبط كَلِمَةُ المُرُور";
"authentication_choose_password_signout_all_devices" = "تَسجِيلُ الخُرُوج من جميع الأجهزة";
"authentication_choose_password_text_field_placeholder" = "كَلِمَةُ المُرُور الجديدة";
"authentication_choose_password_input_title" = "اختر كَلِمَةُ مُرُور جديدة";
"authentication_choose_password_input_message" = "تأكد من أنها 8 أحرف أو أكثر";
"authentication_forgot_password_waiting_button" = "إعادَة إرسَال البَريد الإلِكتُرونيّ";
/* The placeholder will show the email address that was entered. */
"authentication_forgot_password_waiting_message" = "اتبع التعليمات المرسلة إلى %@";
"authentication_forgot_password_waiting_title" = "تحقق من بَريدك الإلِكتُرونيّ.";
"authentication_forgot_password_text_field_placeholder" = "البَريد الإلِكتُرونيّ";
/* The placeholder will show the homeserver's domain */
"authentication_forgot_password_input_message" = "%@ سيقوم بإرسَال رابط التَّحَقُّق إليك";
"authentication_forgot_password_input_title" = "أدخل بَريدك الإلِكتُرونيّ";
"authentication_verify_email_waiting_button" = "إعادَة إرسال البَريد الإلِكتُرونيّ";
"authentication_verify_email_waiting_hint" = "ألم تَتَلق رِسالة بَريد إلِكتُرونيّ؟";
/* The placeholder will show the email address that was entered. */
"authentication_verify_email_waiting_message" = "اتبع التعليمات المرسلة إلى %@";
"invite_to" = "الدعوة إلى %@";
Loading

0 comments on commit 6c9ff1b

Please sign in to comment.