Merge branch 'master' into develop

CHANGES.md

@@ -1,3 +1,28 @@
+## Changes in 1.6.11 (2021-12-14)
+
+✨ Features
+
+- Added support for creating, displaying and interacting with polls in the timeline. ([#5114](https://github.com/vector-im/element-ios/issues/5114))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.15](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.15)).
+- Room member details: Display user Matrix ID and make it copyable. ([#4568](https://github.com/vector-im/element-ios/issues/4568))
+
+🐛 Bugfixes
+
+- Fix crash when trying to scroll the people's tab to the top. ([#5190](https://github.com/vector-im/element-ios/issues/5190))
+
+🧱 Build
+
+- Fix SwiftGen only generating strings for MatrixKit. ([#5280](https://github.com/vector-im/element-ios/issues/5280))
+
+Others
+
+- Update issue workflow automation for the Delight team ([#5285](https://github.com/vector-im/element-ios/issues/5285))
+- Update workflow to add automation for the new Message Bubbles board ([#5289](https://github.com/vector-im/element-ios/issues/5289))
+
+
 ## Changes in 1.6.10 (2021-12-09)
 
 🙌 Improvements

Podfile

@@ -13,7 +13,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.20.14'
+$matrixSDKVersion = '0.20.15'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }

Podfile.lock

@@ -59,16 +59,16 @@ PODS:
   - MatomoTracker (7.4.1):
     - MatomoTracker/Core (= 7.4.1)
   - MatomoTracker/Core (7.4.1)
-  - MatrixSDK (0.20.14):
-    - MatrixSDK/Core (= 0.20.14)
-  - MatrixSDK/Core (0.20.14):
+  - MatrixSDK (0.20.15):
+    - MatrixSDK/Core (= 0.20.15)
+  - MatrixSDK/Core (0.20.15):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.16.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.20.14):
+  - MatrixSDK/JingleCallStack (0.20.15):
     - JitsiMeetSDK (= 3.10.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -117,8 +117,8 @@ DEPENDENCIES:
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
   - MatomoTracker (~> 7.4.1)
-  - MatrixSDK (= 0.20.14)
-  - MatrixSDK/JingleCallStack (= 0.20.14)
+  - MatrixSDK (= 0.20.15)
+  - MatrixSDK/JingleCallStack (= 0.20.15)
   - OLMKit
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
@@ -199,7 +199,7 @@ SPEC CHECKSUMS:
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
-  MatrixSDK: 31a0d0f01c3be32c808adb78110292ed46e1b669
+  MatrixSDK: 2f4d3aacb1c53e2785f0be71d24b8e62e5c5c056
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: b6027801398f3743fc222f096faa85281b506e6c
@@ -214,6 +214,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 12f459fece6a213a48e425c1839aad493f331c80
+PODFILE CHECKSUM: 989bcc8b1857dc64a9b810ddaf4446903adbe162
 
 COCOAPODS: 1.11.2

Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme

@@ -4,7 +4,8 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m

@@ -206,6 +206,7 @@
     
     self.memberHeaderView.backgroundColor = ThemeService.shared.theme.baseColor;
     self.roomMemberNameLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
+    self.roomMemberUserIdLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
 
     self.roomMemberStatusLabel.textColor = ThemeService.shared.theme.tintColor;
     self.roomMemberPowerLevelLabel.textColor = ThemeService.shared.theme.textPrimaryColor;

changelog.d/4568.change

@@ -1 +0,0 @@
-Room member details: Display user Matrix ID and make it copyable.

changelog.d/5114.feature

@@ -1 +0,0 @@
-Added support for creating, displaying and interacting with polls in the timeline.

changelog.d/5190.bugfix

@@ -1 +0,0 @@
-Fix crash when trying to scroll the people's tab to the top.

changelog.d/5280.build

@@ -1 +0,0 @@
-Fix SwiftGen only generating strings for MatrixKit.

changelog.d/5285.misc

@@ -1 +0,0 @@
-Update issue workflow automation for the Delight team

changelog.d/5289.misc

@@ -1 +0,0 @@
-Update workflow to add automation for the new Message Bubbles board