Commit a9dcfce6 authored by manuroe's avatar manuroe
Browse files

Merge branch 'develop' into gh-actions

parents 890aaf7b db92fb4f
Changes to be released in next version
=================================================
✨ Features
*
🙌 Improvements
* Add `gitter.im` to list of default room directories
* MasterTabBarController: Show/Hide Home Screen tabs (#4234).
* RoomVC: Enable / Disable VoIP feature in Rooms (#4236).
* UnifiedSearchRecentsDataSource: Show/Hide public directory (#4242).
* DirectoryRecentTableViewCell: Do not use "directory_search_results_more_than" string when there is no rooms and the search is on.
🐛 Bugfix
* PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off.
⚠️ API Changes
*
🗣 Translations
*
🧱 Build
*
Others
*
Changes in 1.3.4 (2021-04-19)
=================================================
✨ Features
*
🙌 Improvements
*
🐛 Bugfix
* RoomVC: Crash in refreshTypingNotification (#4230).
⚠️ API Changes
*
🗣 Translations
*
🧱 Build
*
Others
*
Improvements:
Changes in 1.3.3 (2021-04-16)
=================================================
✨ Features
*
🙌 Improvements
*
🐛 Bugfix
*
⚠️ API Changes
*
🗣 Translations
*
🧱 Build
*
Others
*
Improvements:
* Upgrade MatrixKit version ([v0.14.9](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.9)).
Changes in 1.3.2 (2021-04-16)
=================================================
✨ Features
*
🙌 Improvements
*
🐛 Bugfix
* Self-verification: Fix compatibility with Element-Web (#4217).
* Notifications: Fix sender display name that can miss (#4222).
⚠️ API Changes
*
🗣 Translations
*
🧱 Build
*
Others
*
Improvements:
* Upgrade MatrixKit version ([v0.14.9](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.9)).
Changes in 1.3.1 (2021-04-14)
=================================================
✨ Features
*
🙌 Improvements
*
🐛 Bugfix
*
⚠️ API Changes
*
🗣 Translations
*
🧱 Build
*
Others
*
Improvements:
* Upgrade MatrixKit version ([v0.14.8](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.8)).
Changes in 1.3.0 (2021-04-09)
=================================================
✨ Features
* Composer Update - Typing and sending a message (#4085)
* Switching composer between text mode & action mode (#4087)
* Explore typing notifications inspired by web (#4134)
🙌 Improvements
* Make the application settings more configurable (#4171)
* Possibility to lock some room creation parameters from settings (#4181)
* Enable / disable external friends invite (#4173)
* Composer update - UI enhancements (#4133)
* Increase grow/shrink animation speed in new composer (#4187)
* Limit typing notifications timeline jumps (#4176)
* Consider displaying names in typing notifications (#4175)
🐛 Bugfix
* If you start typing while the new attachment sending mode is on, the send button appears (#4155)
* The final frames of the appearance animation of the new composer buttons are missing (#4160)
* Crash in [RoomViewController setupActions] (#4162)
* Too much vertical whitespace when replying (#4164)
* Black theme uses dark background for composer (#4192)
* Vertical layout of typing notifs can go wonky (#4159)
* Crash in [RoomViewController refreshTypingNotification] (#4161)
⚠️ API Changes
*
🗣 Translations
*
🧱 Build
*
Others
*
Improvements:
* Upgrade MatrixKit version ([v0.14.7](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.7)).
Changes in 1.2.8 (2021-03-26)
=================================================
✨ Features
*
🙌 Improvements
*
🐛 Bugfix
* Xcodegen: Unit tests are broken (#4152).
⚠️ API Changes
*
🗣 Translations
*
🧱 Build
*
Others
*
Improvements:
Changes in 1.2.7 (2021-03-24)
=================================================
✨ Features
*
......@@ -11,6 +216,7 @@ Changes to be released in next version
🐛 Bugfix
* RoomVC: Fix timeline blink on sending.
* RoomVC: Fix not visible last bubble issue.
* Room directory: Fix crash (#4137).
⚠️ API Changes
*
......@@ -24,12 +230,16 @@ Changes to be released in next version
Others
*
Improvements:
* Upgrade MatrixKit version ([v0.14.6](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.6)).
Changes in 1.2.6 (2021-03-11)
=================================================
✨ Features
* Improve the status of send messages (sending, sent, received, failed) (#4014)
* Retrying & deleting failed messages (#4013)
* Composer Update - Typing and sending a message (#4085)
🙌 Improvements
*
......@@ -62,7 +272,7 @@ Changes in 1.2.5 (2021-03-03)
* Settings: Add option to show NSFW public rooms (off by default).
🐛 Bugfix
*
* Emoji store: Include short name when searching emojis (#4063).
⚠️ API Changes
*
......
......@@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
APPLICATION_SCHEME = element
// Version
MARKETING_VERSION = 1.2.7
CURRENT_PROJECT_VERSION = 1.2.7
MARKETING_VERSION = 1.3.5
CURRENT_PROJECT_VERSION = 1.3.5
// Team
......
......@@ -109,6 +109,8 @@ final class BuildSettings: NSObject {
// MARK: - Legal URLs
// Note: Set empty strings to hide the related entry in application settings
static let applicationCopyrightUrlString = "https://element.io/copyright"
static let applicationPrivacyPolicyUrlString = "https://element.io/privacy"
static let applicationTermsConditionsUrlString = "https://element.io/terms-of-service"
......@@ -148,7 +150,8 @@ final class BuildSettings: NSObject {
static let publicRoomsAllowServerChange: Bool = true
// List of homeservers for the public rooms directory
static let publicRoomsDirectoryServers = [
"matrix.org"
"matrix.org",
"gitter.im"
]
......@@ -193,6 +196,8 @@ final class BuildSettings: NSObject {
static let allowLocalContactsAccess: Bool = true
static let allowInviteExernalUsers: Bool = true
// MARK: - Feature Specifics
/// Not allowed pin codes. User won't be able to select one of the pin in the list.
......@@ -210,6 +215,13 @@ final class BuildSettings: NSObject {
/// Indicates should the app log out the user when number of biometrics failures reaches `maxAllowedNumberOfBiometricsFailures`. Defaults to `false`
static let logOutUserWhenBiometricsFailuresExceeded: Bool = false
// MARK: - Main Tabs
static let homeScreenShowFavouritesTab: Bool = true
static let homeScreenShowPeopleTab: Bool = true
static let homeScreenShowRoomsTab: Bool = true
static let homeScreenShowCommunitiesTab: Bool = true
// MARK: - General Settings Screen
static let settingsScreenShowUserFirstName: Bool = false
......@@ -225,10 +237,32 @@ final class BuildSettings: NSObject {
static let settingsScreenAllowChangingCrashUsageDataSettings: Bool = true
static let settingsScreenAllowBugReportingManually: Bool = true
static let settingsScreenAllowDeactivatingAccount: Bool = true
static let settingsScreenShowChangePassword:Bool = true
static let settingsScreenShowInviteFriends:Bool = true
static let settingsScreenShowEnableStunServerFallback: Bool = true
static let settingsSecurityScreenShowSessions:Bool = true
static let settingsSecurityScreenShowSetupBackup:Bool = true
static let settingsSecurityScreenShowRestoreBackup:Bool = true
static let settingsSecurityScreenShowDeleteBackup:Bool = true
static let settingsSecurityScreenShowCryptographyInfo:Bool = true
static let settingsSecurityScreenShowCryptographyExport:Bool = true
static let settingsSecurityScreenShowAdvancedUnverifiedDevices:Bool = true
// MARK: - Timeline settings
static let roomInputToolbarCompressionMode = MXKRoomInputToolbarCompressionModePrompt
// MARK: - Room Creation Screen
static let roomCreationScreenAllowEncryptionConfiguration: Bool = true
static let roomCreationScreenRoomIsEncrypted: Bool = true
static let roomCreationScreenAllowRoomTypeConfiguration: Bool = true
static let roomCreationScreenRoomIsPublic: Bool = false
// MARK: - Room Screen
static let roomScreenAllowVoIPForDirectRoom: Bool = true
static let roomScreenAllowVoIPForNonDirectRoom: Bool = true
// MARK: - Room Settings Screen
static let roomSettingsScreenShowLowPriorityOption: Bool = true
......@@ -258,4 +292,7 @@ final class BuildSettings: NSObject {
static let authScreenShowPhoneNumber = true
static let authScreenShowForgotPassword = true
static let authScreenShowCustomServerOptions = true
// Mark: - Unified Search
static let unifiedSearchScreenShowPublicDirectory = true
}
......@@ -2,7 +2,7 @@ source "https://rubygems.org"
gem "xcode-install"
gem "fastlane"
gem "cocoapods", '~>1.10.0'
gem "cocoapods", '~>1.10.1'
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
......@@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (5.2.4.4)
activesupport (5.2.4.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
......@@ -31,10 +31,10 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.0.3)
cocoapods (1.10.0)
cocoapods (1.10.1)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.0)
cocoapods-core (= 1.10.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
......@@ -49,7 +49,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.0)
cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
......@@ -72,7 +72,7 @@ GEM
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
declarative (0.0.20)
declarative-option (0.1.0)
digest-crc (0.6.1)
......@@ -170,7 +170,7 @@ GEM
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.8.5)
i18n (1.8.9)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
json (2.3.1)
......@@ -178,7 +178,7 @@ GEM
memoist (0.16.2)
mini_magick (4.11.0)
mini_mime (1.0.2)
minitest (5.14.2)
minitest (5.14.4)
molinillo (0.6.6)
multi_json (1.15.0)
multipart-post (2.0.0)
......@@ -219,7 +219,7 @@ GEM
tty-cursor (~> 0.7)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.8)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uber (0.1.0)
unf (0.1.4)
......@@ -245,11 +245,11 @@ PLATFORMS
ruby
DEPENDENCIES
cocoapods (~> 1.10.0)
cocoapods (~> 1.10.1)
fastlane
fastlane-plugin-versioning
fastlane-plugin-xcodegen
xcode-install
BUNDLED WITH
2.1.4
2.2.14
......@@ -11,7 +11,7 @@ use_frameworks!
# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each 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
$matrixKitVersion = '= 0.14.5'
$matrixKitVersion = '= 0.14.9'
# $matrixKitVersion = :local
# $matrixKitVersion = {'develop' => 'develop'}
......
......@@ -55,28 +55,28 @@ PODS:
- MatomoTracker (7.4.1):
- MatomoTracker/Core (= 7.4.1)
- MatomoTracker/Core (7.4.1)
- MatrixKit (0.14.5):
- MatrixKit (0.14.9):
- Down (~> 0.10.0)
- DTCoreText (~> 1.6.25)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.14.5)
- MatrixSDK (= 0.18.5)
- MatrixKit/Core (0.14.5):
- MatrixKit/Core (= 0.14.9)
- MatrixSDK (= 0.18.9)
- MatrixKit/Core (0.14.9):
- Down (~> 0.10.0)
- DTCoreText (~> 1.6.25)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.18.5)
- MatrixSDK (0.18.5):
- MatrixSDK/Core (= 0.18.5)
- MatrixSDK/Core (0.18.5):
- MatrixSDK (= 0.18.9)
- MatrixSDK (0.18.9):
- MatrixSDK/Core (= 0.18.9)
- MatrixSDK/Core (0.18.9):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- OLMKit (~> 3.2.2)
- Realm (= 10.7.2)
- MatrixSDK/JingleCallStack (0.18.5):
- MatrixSDK/JingleCallStack (0.18.9):
- JitsiMeetSDK (= 3.2.0)
- MatrixSDK/Core
- OLMKit (3.2.2):
......@@ -115,7 +115,7 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.2)
- KTCenterFlowLayout (~> 1.3.1)
- MatomoTracker (~> 7.4.1)
- MatrixKit (= 0.14.5)
- MatrixKit (= 0.14.9)
- MatrixSDK
- MatrixSDK/JingleCallStack
- OLMKit
......@@ -186,8 +186,8 @@ SPEC CHECKSUMS:
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
MatrixKit: f77c5aa1a236331665d3b1f25ed37ed8758eb23f
MatrixSDK: 013859281629b8cccd3a8af1dec48f36335c058c
MatrixKit: ee8e8d82c2d5fe24ec205d53b15dcaa87e9a913d
MatrixSDK: 74ea0905116cba4cf5709410894a95bbc007307e
OLMKit: 20d1c564033a1ae7148f8f599378d4c798363905
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
Realm: e523da9ade306c5ae87e85dc09fdef148d3e1cc1
......@@ -199,6 +199,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
PODFILE CHECKSUM: 442355a7d44d6f0b26a287702404a221cffb03f5
PODFILE CHECKSUM: 761363c2101ec4039b1b7bcc34f084465ac7f11e
COCOAPODS: 1.10.1
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
......@@ -34,14 +34,6 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<rightBarButtonItems>
<barButtonItem image="search_icon" id="wyR-qv-IxC" userLabel="Menu Bar Button Item">
<inset key="imageInsets" minX="-5" minY="0.0" maxX="5" maxY="0.0"/>
</barButtonItem>
<barButtonItem image="integrations_icon" id="cal-D0-6Fw">
<inset key="imageInsets" minX="10" minY="0.0" maxX="-10" maxY="0.0"/>
</barButtonItem>
</rightBarButtonItems>
</navigationItem>
<connections>
<outlet property="roomTitleViewContainer" destination="aas-th-FW1" id="SFz-1s-ywg"/>
......@@ -96,7 +88,7 @@
<!--Room Search View Controller-->
<scene sceneID="rUg-1s-vHX">
<objects>
<viewController id="KDg-aD-xlK" customClass="RoomSearchViewController" sceneMemberID="viewController">
<viewController storyboardIdentifier="RoomSearch" id="KDg-aD-xlK" customClass="RoomSearchViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="F5n-wr-hGG"/>
<viewControllerLayoutGuide type="bottom" id="BxE-Q4-YjP"/>
......@@ -320,7 +312,7 @@
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="egL-pK-Xhr">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="taU-5Q-sdv" id="Ipf-IM-E39"/>
<outlet property="delegate" destination="taU-5Q-sdv" id="kIU-uT-h9Y"/>
......@@ -589,11 +581,10 @@
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="mhb-l9-pM3"/>
<segue reference="ziz-Xl-QVg"/>
<segue reference="Tfl-tq-LQp"/>
<segue reference="f5u-Y1-7nt"/>
</inferredMetricsTieBreakers>
<resources>
<image name="integrations_icon" width="24" height="24"/>
<image name="launch_screen_logo" width="240" height="240"/>
<image name="search_icon" width="24" height="24"/>
<image name="settings_icon" width="24" height="24"/>
......@@ -602,5 +593,8 @@
<image name="tab_home" width="20" height="23.5"/>
<image name="tab_people" width="24" height="24"/>
<image name="tab_rooms" width="24" height="24"/>
<systemColor name="groupTableViewBackgroundColor">
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>
{
"images" : [
{
"idiom" : "universal",
"filename" : "encryption_normal.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "encryption_normal@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "encryption_normal@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
{
"images" : [
{
"idiom" : "universal",
"filename" : "encryption_trusted.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "encryption_trusted@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "encryption_trusted@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}