Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
8241 commits 46 branches 261 tags 144 MiB
Commit graph

3722 commits

Author SHA1 Message Date
Ismail Gulek
c1d88113bc Remove urls only from English 2020-07-03 17:00:50 +03:00
Ismail Gulek
0b566b725c Revert "Remove url strings" 
This reverts commit e475db360a.
 2020-07-03 16:59:26 +03:00
Ismail Gulek
603c259db5 Merge branch 'rebranding' into 14-update-legal-pages-urls-copyright-tac-t-c 2020-07-03 16:41:23 +03:00
Ismail Gulek
34cc43edbb Read urls from defaults 2020-07-03 16:38:14 +03:00
Ismail Gulek
e475db360a Remove url strings 2020-07-03 16:38:01 +03:00
Ismail Gulek
74b8740189 Include copyright, privacy, termsConditions urls to plist 2020-07-03 16:36:12 +03:00
SBiOSoftWhare
5170286b54 Rebranding: Update tab bar and nav bar icons. 2020-07-02 15:08:16 +02:00
ismailgulek
387cfb7787
Merge branch 'develop' into xcode11 
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
 2020-07-01 09:59:29 +03:00
SBiOSoftWhare
b32eb962aa version++ 2020-06-30 22:25:39 +02:00
SBiOSoftWhare
9692354fdb
Merge pull request #3375 from vector-im/copy_update 
SecurityVC: Update MY SESSIONS copy
 2020-06-30 21:50:52 +02:00
SBiOSoftWhare
e5a36a76a3
Merge pull request #3377 from vector-im/riot_3299 
Setup cross-signing for existing users
 2020-06-30 21:47:36 +02:00
SBiOSoftWhare
4bac9f1e9c Refactor cross signing banner. 2020-06-30 21:46:10 +02:00
SBiOSoftWhare
90e78e262b KeyVerificationService: Fix canSetupKeyVerification. 2020-06-30 19:37:13 +02:00
SBiOSoftWhare
d27f4a6df5 AuthenticatedSessionViewControllerFactory: Add a discardableResult on viewController(forPath method. 2020-06-30 18:44:55 +02:00
SBiOSoftWhare
7f5a229b9d HomeVC: Handle key verification setup banner. 2020-06-30 18:44:14 +02:00
Riot Translate Bot
1df96cbd88
Update from Weblate (#3376) 
* Translated using Weblate (Albanian)

Currently translated at 99.2% (1020 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/

* Translated using Weblate (French)

Currently translated at 100.0% (1028 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1028 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/

Co-authored-by: Besnik Bleta <besnik@programeshqip.org>
Co-authored-by: Kévin C <zecakeh@pm.me>
Co-authored-by: kernitus <zirconic@protonmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
 2020-06-30 18:25:16 +02:00
manuroe
a9e677e538 SecurityVC: Update MY SESSIONS copy 2020-06-30 18:12:50 +02:00
manuroe
19db088bc2 Sign out: Make sure there is a secure backup 2020-06-30 18:00:56 +02:00
SBiOSoftWhare
85fbeffb1f KeyVerificationService: Add canSetupKeyVerification method. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare
8d5e809633 RecentsDataSource: Handle key verification setup banner. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare
9f925ca5c9 AppDelegate: Handle KeyVerificationBannerPreferences. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare
0f04837ce4 Cross-signing: Create key verification setup banner. 2020-06-30 17:33:42 +02:00
manuroe
16a292fd6e SecurityVC: Setup cross-signing on secure backup setup 2020-06-30 17:03:33 +02:00
manuroe
ec82325360 SecurityVC: 3 actions for secure backup: setup, synchronise, delete 2020-06-30 16:23:29 +02:00
manuroe
8f60ddc952 SecurityVC: Hide the cross-signing section 2020-06-30 15:56:05 +02:00
manuroe
72d3d944e5 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00
manuroe
712cd6a385 Merge remote-tracking branch 'origin/riot_3361' into riot_3361 2020-06-30 14:32:16 +02:00
manuroe
400420d328 Secure backup: Fixed Stève's remarks 2020-06-30 14:32:12 +02:00
manuroe
2065b56e7a
Update Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-30 14:31:22 +02:00
manuroe
1dde6cc383 Secure backup setup: Manage the case when the user has already a key backup 
but we do not have the private key
 2020-06-30 14:15:18 +02:00
manuroe
9e295ae6e6 Secure backup: Create and delete key backup with 4S 2020-06-30 14:02:47 +02:00
ismailgulek
5356ceb701
Disable voip background mode to avoid VoIP pushes 2020-06-29 16:10:57 +03:00
manuroe
347faa5208
Merge pull request #3364 from vector-im/riot_3292_2 
AuthVC: Remove NEW_CROSS_SIGNING_FLOW
 2020-06-26 18:44:10 +02:00
manuroe
7e91ecf6b3 AuthVC: Remove NEW_CROSS_SIGNING_FLOW 
because we consider riot-web ready
 2020-06-26 18:37:15 +02:00
ismailgulek
ed9750e53f
Merge branch 'develop' into xcode11 
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
 2020-06-26 17:33:09 +03:00
Weblate
3ecaae04bc Merge branch 'origin/develop' into Weblate. 2020-06-26 12:37:09 +00:00
SBiOSoftWhare
48d2cae892 Fix merge issue with secure backup refactoring. 2020-06-26 14:36:27 +02:00
SBiOSoftWhare
6858bd85a5 Merge branch 'develop' into riot_3293 
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
 2020-06-26 14:30:21 +02:00
SBiOSoftWhare
77b726189b Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare
e5bdd8cdef Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare
123faa56ac Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
Weblate
27525ecd90 Merge branch 'origin/develop' into Weblate. 2020-06-26 10:45:05 +00:00
manuroe
b17add8130
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:43:26 +02:00
manuroe
b5a0b7cca3
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:38:58 +02:00
manuroe
e64cd272d8
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:36:57 +02:00
manuroe
2b7e71fda8 AuthenticatedSessionViewControllerFactory: Update with Steve's remarks 2020-06-26 12:29:30 +02:00
manuroe
7de6dcf2fd
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:22:43 +02:00
manuroe
b35c372339
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:41 +02:00
manuroe
e979a9c003
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:34 +02:00
manuroe
f0d91282d5
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:24 +02:00