mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
Weblate
commit
af7afe8a40
13 changed files with 125 additions and 58 deletions
|
|
@ -29,4 +29,10 @@ Aram Sargsyan <aram.sargsyan.1997 at gmail.com>
|
|||
|
||||
Vivian Lim <vivvnlim at gmail.com>
|
||||
* PR #1513 Return key on hardware keyboards now sends messages
|
||||
|
||||
Dawid Rączka <dawidraczka at gmail.com>
|
||||
* PR #1729 Fixed keyboard color when entering bug report
|
||||
|
||||
Evan Tang <etang110 at gmail.com>
|
||||
* PR #1737 Cancel Buttons use style Cancel
|
||||
|
||||
37
CHANGES.rst
37
CHANGES.rst
|
|
@ -1,3 +1,40 @@
|
|||
Changes in 0.6.10 (2018-02-14)
|
||||
===============================================
|
||||
|
||||
Improvements:
|
||||
* Upgrade MatrixKit version (v0.7.6).
|
||||
* Group Details: Put the name of the community in the title.
|
||||
|
||||
Bug Fix:
|
||||
* App crashes on cold start if no account is defined.
|
||||
* flair labels are a bit confusing (#1772).
|
||||
|
||||
Changes in 0.6.9 (2018-02-10)
|
||||
===============================================
|
||||
|
||||
Improvements:
|
||||
* Upgrade MatrixKit version (v0.7.5).
|
||||
* Add a new tab to list the user's communities (vector-im/riot-meta#114).
|
||||
* Add new screens to display the community details, edition is not supported yet (vector-im/riot-meta#115, vector-im/riot-meta#116, vector-im/riot-meta#117).
|
||||
* Room Settings: handle the related communities in order to show flair for them.
|
||||
* User Settings: Let the user enable his community flair in rooms configured to show it.
|
||||
* Replace Google Analytic by Matomo(Piwik) (PR #1753).
|
||||
* Spontaneous logout: Try to detect it in AuthenticationViewController and crash the app if it happens (PR #1761).
|
||||
* Share: Make sure the progress bar is always displayed.
|
||||
* Jitsi: update lib to jitsi-meet_2794 tag.
|
||||
|
||||
Bug Fix:
|
||||
* iPad: export e2e keys failed, there pops no window up where to save the keys (#1733).
|
||||
* Widget can display "Forbidden" (#1723).
|
||||
* keyboard is not dark when entering bug report in dark theme (#1720), thanks to @daverPL (PR #1729).
|
||||
* Contact Details: The contact avatar quality is very low when the contact details screen is opened from a link.
|
||||
* Cancel Buttons use style Cancel (PR #1737), thanks to @tellowkrinkle.
|
||||
* Share Extension: Fix crash on a weak self (PR #1744).
|
||||
* Share: The extension crashes if you try to share a GIF image (#1759)
|
||||
|
||||
Translations:
|
||||
* Catalan, added thanks to @sim6 and @salvadorpla (PR #1767).
|
||||
|
||||
Changes in 0.6.8 (2018-01-03)
|
||||
===============================================
|
||||
|
||||
|
|
|
|||
2
Podfile
2
Podfile
|
|
@ -9,7 +9,7 @@ source 'https://github.com/CocoaPods/Specs.git'
|
|||
|
||||
# Different flavours of pods to MatrixKit
|
||||
# The current MatrixKit pod version
|
||||
$matrixKitVersion = '0.7.4'
|
||||
$matrixKitVersion = '0.7.6'
|
||||
|
||||
# The develop branch version
|
||||
#$matrixKitVersion = 'develop'
|
||||
|
|
|
|||
104
Podfile.lock
104
Podfile.lock
|
|
@ -1,18 +1,18 @@
|
|||
PODS:
|
||||
- AFNetworking (3.1.0):
|
||||
- AFNetworking/NSURLSession (= 3.1.0)
|
||||
- AFNetworking/Reachability (= 3.1.0)
|
||||
- AFNetworking/Security (= 3.1.0)
|
||||
- AFNetworking/Serialization (= 3.1.0)
|
||||
- AFNetworking/UIKit (= 3.1.0)
|
||||
- AFNetworking/NSURLSession (3.1.0):
|
||||
- AFNetworking (3.2.0):
|
||||
- AFNetworking/NSURLSession (= 3.2.0)
|
||||
- AFNetworking/Reachability (= 3.2.0)
|
||||
- AFNetworking/Security (= 3.2.0)
|
||||
- AFNetworking/Serialization (= 3.2.0)
|
||||
- AFNetworking/UIKit (= 3.2.0)
|
||||
- AFNetworking/NSURLSession (3.2.0):
|
||||
- AFNetworking/Reachability
|
||||
- AFNetworking/Security
|
||||
- AFNetworking/Serialization
|
||||
- AFNetworking/Reachability (3.1.0)
|
||||
- AFNetworking/Security (3.1.0)
|
||||
- AFNetworking/Serialization (3.1.0)
|
||||
- AFNetworking/UIKit (3.1.0):
|
||||
- AFNetworking/Reachability (3.2.0)
|
||||
- AFNetworking/Security (3.2.0)
|
||||
- AFNetworking/Serialization (3.2.0)
|
||||
- AFNetworking/UIKit (3.2.0):
|
||||
- AFNetworking/NSURLSession
|
||||
- cmark (0.24.1)
|
||||
- DTCoreText (1.6.21):
|
||||
|
|
@ -37,73 +37,91 @@ PODS:
|
|||
- DTFoundation/Core
|
||||
- DTFoundation/UIKit (1.7.13):
|
||||
- DTFoundation/Core
|
||||
- GBDeviceInfo (4.4.0):
|
||||
- GBDeviceInfo/Core (= 4.4.0)
|
||||
- GBDeviceInfo/Core (4.4.0)
|
||||
- GoogleAnalytics (3.17.0)
|
||||
- GBDeviceInfo (5.1.0):
|
||||
- GBDeviceInfo/Core (= 5.1.0)
|
||||
- GBDeviceInfo/Core (5.1.0)
|
||||
- GZIP (1.2.1)
|
||||
- HPGrowingTextView (1.1)
|
||||
- libPhoneNumber-iOS (0.9.13)
|
||||
- MatrixKit (0.7.4):
|
||||
- MatrixKit (0.7.6):
|
||||
- cmark (~> 0.24.1)
|
||||
- DTCoreText (~> 1.6.17)
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.10)
|
||||
- MatrixKit/Core (= 0.7.4)
|
||||
- MatrixSDK (= 0.10.4)
|
||||
- MatrixKit/AppExtension (0.7.4):
|
||||
- MatrixKit/Core (= 0.7.6)
|
||||
- MatrixSDK (= 0.10.5)
|
||||
- MatrixKit/AppExtension (0.7.6):
|
||||
- cmark (~> 0.24.1)
|
||||
- DTCoreText (~> 1.6.17)
|
||||
- DTCoreText/Extension
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.10)
|
||||
- MatrixSDK (= 0.10.4)
|
||||
- MatrixKit/Core (0.7.4):
|
||||
- MatrixSDK (= 0.10.5)
|
||||
- MatrixKit/Core (0.7.6):
|
||||
- cmark (~> 0.24.1)
|
||||
- DTCoreText (~> 1.6.17)
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.10)
|
||||
- MatrixSDK (= 0.10.4)
|
||||
- MatrixSDK (0.10.4):
|
||||
- AFNetworking (~> 3.1.0)
|
||||
- MatrixSDK (= 0.10.5)
|
||||
- MatrixSDK (0.10.5):
|
||||
- MatrixSDK/Core (= 0.10.5)
|
||||
- MatrixSDK/Core (0.10.5):
|
||||
- AFNetworking (~> 3.2.0)
|
||||
- GZIP (~> 1.2.1)
|
||||
- OLMKit (~> 2.2.2)
|
||||
- Realm (~> 3.1.0)
|
||||
- MatrixSDK/JingleCallStack (0.10.5):
|
||||
- MatrixSDK/Core
|
||||
- WebRTC (= 63.11.20455)
|
||||
- OLMKit (2.2.2):
|
||||
- OLMKit/olmc (= 2.2.2)
|
||||
- OLMKit/olmcpp (= 2.2.2)
|
||||
- OLMKit/olmc (2.2.2)
|
||||
- OLMKit/olmcpp (2.2.2)
|
||||
- Realm (3.0.2):
|
||||
- Realm/Headers (= 3.0.2)
|
||||
- Realm/Headers (3.0.2)
|
||||
- WebRTC (61.5.19063)
|
||||
- PiwikTracker (4.4.2):
|
||||
- PiwikTracker/Core (= 4.4.2)
|
||||
- PiwikTracker/Core (4.4.2)
|
||||
- Realm (3.1.1):
|
||||
- Realm/Headers (= 3.1.1)
|
||||
- Realm/Headers (3.1.1)
|
||||
- WebRTC (63.11.20455)
|
||||
|
||||
DEPENDENCIES:
|
||||
- cmark
|
||||
- DTCoreText
|
||||
- GBDeviceInfo (~> 4.4.0)
|
||||
- GoogleAnalytics
|
||||
- MatrixKit (= 0.7.4)
|
||||
- MatrixKit/AppExtension (= 0.7.4)
|
||||
- GBDeviceInfo (~> 5.1.0)
|
||||
- MatrixKit (= 0.7.6)
|
||||
- MatrixKit/AppExtension (= 0.7.6)
|
||||
- MatrixSDK/JingleCallStack
|
||||
- OLMKit
|
||||
- Realm (~> 3.0.1)
|
||||
- WebRTC (= 61.5.19063)
|
||||
- PiwikTracker (from `https://github.com/manuroe/matomo-sdk-ios.git`, branch `feature/CustomVariables`)
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
PiwikTracker:
|
||||
:branch: feature/CustomVariables
|
||||
:git: https://github.com/manuroe/matomo-sdk-ios.git
|
||||
|
||||
CHECKOUT OPTIONS:
|
||||
PiwikTracker:
|
||||
:commit: dfb048f25f4eefbe13ff7515c3c1c2cad5d94491
|
||||
:git: https://github.com/manuroe/matomo-sdk-ios.git
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
|
||||
AFNetworking: 8ac6017b94ea105479f7776e5288e48ae9c59bb4
|
||||
cmark: ec0275215b504780287b6fca360224e384368af8
|
||||
DTCoreText: e5d688cffc9f6a61eddd1a4f94e2046851230de3
|
||||
DTFoundation: f03be9fd786f11e505bb8fc44e2a3732bf0917df
|
||||
GBDeviceInfo: 2ec90c6808d063061b16773ec8e857257058dc5d
|
||||
GoogleAnalytics: f42cc53a87a51fe94334821868d9c8481ff47a7b
|
||||
GBDeviceInfo: 8e43440ae1264d9a79beea81800363cf192ce322
|
||||
GZIP: 7ee835f989fb3c6ea79005fc90b8fa6af710a70d
|
||||
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
|
||||
libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
|
||||
MatrixKit: 9bc9da0fe38044efe091cda90150297004ede2a9
|
||||
MatrixSDK: 66bca5fec7ce03bd9872a42a7877473fcbf822e3
|
||||
MatrixKit: c0f004d72b589fe259a38163181a02e036dc929a
|
||||
MatrixSDK: ad1f2b3f183ad328a8a0ab7b3f8aa13bc145d141
|
||||
OLMKit: b9d8c0ffee9ea8c45bc0aaa9afb47f93fba7efbd
|
||||
Realm: 6f23fd1f178a09342eac21bfa7c2bf4312a7a180
|
||||
WebRTC: 141474ba648e0b940a70696c183451b4a3b2b10f
|
||||
PiwikTracker: 42862c7b13028065c3dfd36b4dc38db8a5765acf
|
||||
Realm: 42d1c38a5b1bbcc828b48a7ce702cb86fc68adf4
|
||||
WebRTC: f2a6203584745fe53532633397557876b5d71640
|
||||
|
||||
PODFILE CHECKSUM: 696d4bf991b3e4e4bc898955d56aa02367abc642
|
||||
PODFILE CHECKSUM: fde34ec5f4ebb6e811888a13cae5fdbc944d73a8
|
||||
|
||||
COCOAPODS: 1.3.1
|
||||
COCOAPODS: 1.4.0
|
||||
|
|
|
|||
|
|
@ -482,8 +482,8 @@
|
|||
// Groups tab
|
||||
"group_invite_section" = "EINLADUNGEN";
|
||||
"group_section" = "COMMUNITIES";
|
||||
"settings_flair" = "FLAIR";
|
||||
"room_details_flair_section" = "Flair";
|
||||
"settings_flair" = "Zeigen Sie Flair, wo erlaubt";
|
||||
"room_details_flair_section" = "Zeige Flair für Communities";
|
||||
"room_details_new_flair_placeholder" = "Füge neue Community-ID hinzu (z.B. +foo%@)";
|
||||
"room_details_flair_invalid_id_prompt_title" = "Ungültiges Format";
|
||||
"room_details_flair_invalid_id_prompt_msg" = "%@ ist kein valider Bezeichner für eine Community";
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@
|
|||
"settings_advanced" = "ADVANCED";
|
||||
"settings_other" = "OTHER";
|
||||
"settings_labs" = "LABS";
|
||||
"settings_flair" = "FLAIR";
|
||||
"settings_flair" = "Show flair where allowed";
|
||||
"settings_devices" = "DEVICES";
|
||||
"settings_cryptography" = "CRYPTOGRAPHY";
|
||||
|
||||
|
|
@ -427,7 +427,7 @@
|
|||
"room_details_addresses_invalid_address_prompt_msg" = "%@ is not a valid format for an alias";
|
||||
"room_details_addresses_disable_main_address_prompt_title" = "Main address warning";
|
||||
"room_details_addresses_disable_main_address_prompt_msg"="You will have no main address specified. The default main address for this room will be picked randomly";
|
||||
"room_details_flair_section"="Flair";
|
||||
"room_details_flair_section"="Show flair for communities";
|
||||
"room_details_new_flair_placeholder" = "Add new community ID (e.g. +foo%@)";
|
||||
"room_details_flair_invalid_id_prompt_title" = "Invalid format";
|
||||
"room_details_flair_invalid_id_prompt_msg" = "%@ is not a valid identifier for a community";
|
||||
|
|
|
|||
|
|
@ -484,8 +484,8 @@
|
|||
// Groups tab
|
||||
"group_invite_section" = "GONBIDAPENAK";
|
||||
"group_section" = "KOMUNITATEAK";
|
||||
"settings_flair" = "IKURRA";
|
||||
"room_details_flair_section" = "Ikurra";
|
||||
"settings_flair" = "Erakutsi ikurra non baimenduta";
|
||||
"room_details_flair_section" = "Erakutsi ikurra komunitateentzat";
|
||||
"room_details_new_flair_placeholder" = "Gehitu komunitate ID berria (adib. +foo%@)";
|
||||
"room_details_flair_invalid_id_prompt_title" = "Baliogabeko formatua";
|
||||
"room_details_flair_invalid_id_prompt_msg" = "%@ ez da komunitate batentzako baliozko identifikatzailea";
|
||||
|
|
|
|||
|
|
@ -509,8 +509,8 @@
|
|||
"e2e_room_key_request_start_verification" = "Commencer la vérification...";
|
||||
"e2e_room_key_request_share_without_verifying" = "Partager sans vérifier";
|
||||
"e2e_room_key_request_ignore_request" = "Ignorer la demande";
|
||||
"settings_flair" = "TALENTS";
|
||||
"room_details_flair_section" = "Talent";
|
||||
"settings_flair" = "Afficher le badge aux endroits autorisés";
|
||||
"room_details_flair_section" = "Afficher le badge pour des communautés";
|
||||
"room_details_new_flair_placeholder" = "Ajouter un nouvel identifiant de communauté (par ex. +foo%@)";
|
||||
"room_details_flair_invalid_id_prompt_title" = "Format invalide";
|
||||
"room_details_flair_invalid_id_prompt_msg" = "%@ n'est pas un identifiant valide pour une communauté";
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.6.8</string>
|
||||
<string>0.6.10</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>0.6.8</string>
|
||||
<string>0.6.10</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<true/>
|
||||
<key>ITSEncryptionExportComplianceCode</key>
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@
|
|||
// e2e messages.
|
||||
NSLog(@"[AuthenticationVC] viewDidAppear: Checking false logout");
|
||||
[[MXKAccountManager sharedManager] forceReloadAccounts];
|
||||
if ([MXKAccountManager sharedManager].activeAccounts)
|
||||
if ([MXKAccountManager sharedManager].activeAccounts.count)
|
||||
{
|
||||
// For now, we do not have better solution than forcing the user to restart the app
|
||||
[NSException raise:@"False " format:@"AuthenticationViewController has been displayed whereas there is an existing account"];
|
||||
|
|
|
|||
|
|
@ -109,7 +109,11 @@
|
|||
}
|
||||
[viewControllers addObject:groupRoomsViewController];
|
||||
|
||||
self.title = NSLocalizedStringFromTable(@"group_details_title", @"Vector", nil);
|
||||
if (!self.title.length)
|
||||
{
|
||||
self.title = NSLocalizedStringFromTable(@"group_details_title", @"Vector", nil);
|
||||
}
|
||||
|
||||
[self initWithTitles:titles viewControllers:viewControllers defaultSelected:0];
|
||||
|
||||
[super viewDidLoad];
|
||||
|
|
@ -180,6 +184,8 @@
|
|||
_group = group;
|
||||
_mxSession = mxSession;
|
||||
|
||||
self.title = group.summary.profile.name.length ? group.summary.profile.name : group.groupId;
|
||||
|
||||
[self addMatrixSession:mxSession];
|
||||
|
||||
if (groupHomeViewController)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.6.8</string>
|
||||
<string>0.6.10</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>NSExtension</key>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.6.8</string>
|
||||
<string>0.6.10</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>NSExtension</key>
|
||||
|
|
|
|||
Loading…
Reference in a new issue