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

7709 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan
89ea2ddf68 Translated using Weblate (German) 
Currently translated at 98.3% (915 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
 2020-04-03 15:42:28 +00:00
Weblate
bc68fff51d Merge branch 'origin/develop' into Weblate. 2020-04-03 15:42:27 +00:00
Weblate
655fee1b69 Merge branch 'origin/develop' into Weblate. 2020-04-03 15:42:27 +00:00
SBiOSoftWhare
b76e3baef3
Merge pull request #3061 from vector-im/riot_3003 
Cross-signing: Complete security at the end of sign in process
 2020-04-03 17:42:22 +02:00
SBiOSoftWhare
ad8fe271e2 Update changes 2020-04-03 17:08:10 +02:00
SBiOSoftWhare
690ae8f07f AppDelegate: Centralize modal presentation code. Listen to new key verification request only for current session. Prevent new key verification request alert to be presented twice. 2020-04-03 16:33:56 +02:00
SBiOSoftWhare
71e9188b60 AuthenticationViewController: Handle complete security screen presentation. 2020-04-03 16:30:06 +02:00
SBiOSoftWhare
0db745e29d UserVerificationCoordinator: Update with new KeyVerificationCoordinator init. 2020-04-03 16:28:35 +02:00
SBiOSoftWhare
0af87f7f1b KeyVerificationCoordinatorBridgePresenter: Handle complete security screen. 2020-04-03 16:27:10 +02:00
SBiOSoftWhare
80603cc752 KeyVerificationCoordinator: Refactor and add a single init with a KeyVerificationFlow enum parameter. 2020-04-03 16:23:32 +02:00
SBiOSoftWhare
1e14a06466 Implement complete security screen. 2020-04-03 15:55:53 +02:00
Weblate
1d89547784 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:03:44 +00:00
Weblate
96c5edc368 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:03:44 +00:00
Weblate
11bdda01d8 Merge branch 'origin/develop' into Weblate. 2020-04-01 16:03:44 +00:00
manuroe
9bd5136892 Fix CHANGES 2020-04-01 18:03:36 +02:00
Weblate
0df239b7cb Merge branch 'origin/develop' into Weblate. 2020-04-01 15:58:04 +00:00
Weblate
939e516c34 Merge branch 'origin/develop' into Weblate. 2020-04-01 15:58:04 +00:00
Weblate
01bc5c9d71 Merge branch 'origin/develop' into Weblate. 2020-04-01 15:58:04 +00:00
manuroe
12d8019bc0 Merge branch 'hotfix/v0.10.5' into develop 2020-04-01 17:56:25 +02:00
manuroe
7be5f838ff Fix merge conflict 2020-04-01 17:56:12 +02:00
manuroe
13a295e091 version++ 2020-04-01 17:51:38 +02:00
Mark Schulte
3cc5c594df Update CHANGES.rst 
Signed-off-by: Mark Schulte <schultetwin@gmail.com>
 2020-04-01 17:49:26 +02:00
Mark Schulte
4bae1551e1 AuthFallback: Stay in Riot App 
When doing a SAML based SSO via Gsuite, I must click a link
specifying that I trust this app. That link will break me
out of the SSO sign-in process, and open up safari.

To fix address this, I've removed the feature that opens links in
safari.

Signed-off-by: Mark Schulte <schultetwin@gmail.com>
 2020-04-01 17:49:17 +02:00
manuroe
4cc5a443a2 Push notifications: Avoid any automatic deactivation 
vector-im/riot-ios#3017
 2020-04-01 17:35:28 +02:00
manuroe
7bae95abd9 Fix crash due to malformed widget 2020-04-01 17:34:35 +02:00
Chris Moos
5e298de8b5 Fix issue with joining public rooms with no guest access. 
This fixes #2888.

Signed-off-by: Chris Moos <chris@chrismoos.com>
 2020-04-01 17:31:31 +02:00
Weblate
8b62a0faf5 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:57:51 +00:00
Imre Kristoffer Eilertsen
5482673246 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 40.3% (375 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/nb_NO/
 2020-04-01 13:57:51 +00:00
Weblate
5025b775c6 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:57:36 +00:00
Osoitz
d75f347e1f Translated using Weblate (Basque) 
Currently translated at 100.0% (931 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
 2020-04-01 13:57:36 +00:00
Weblate
415a8c7fee Merge branch 'origin/develop' into Weblate. 2020-04-01 13:57:35 +00:00
manuroe
bbecff21b9
Merge pull request #3039 from schultetwin/dont_exit_app_for_sso 
AuthFallback: Stay in Riot App
 2020-04-01 15:57:31 +02:00
Imre Kristoffer Eilertsen
d8e5333766 Added translation using Weblate (Norwegian Bokmål) 2020-04-01 01:42:33 +00:00
random
3dbd98d787 Translated using Weblate (Italian) 
Currently translated at 100.0% (931 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-03-31 10:27:25 +00:00
Kévin C
f97e4aaf09 Translated using Weblate (French) 
Currently translated at 100.0% (931 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-03-31 10:27:24 +00:00
Weblate
1b511b4232 Merge branch 'origin/develop' into Weblate. 2020-03-30 08:04:48 +00:00
Weblate
b692eb92a5 Merge branch 'origin/develop' into Weblate. 2020-03-30 08:04:48 +00:00
Weblate
19a70a90e1 Merge branch 'origin/develop' into Weblate. 2020-03-30 08:04:48 +00:00
SBiOSoftWhare
280c2335d3
Merge pull request #3052 from vector-im/riot_2918 
Cross-Signing: Detect and expose new sign-ins
 2020-03-30 10:04:43 +02:00
SBiOSoftWhare
95e617a99c Merge branch 'develop' into riot_2918 
# Conflicts:
#	Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
 2020-03-30 09:55:40 +02:00
Weblate
3a2766b516 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:55 +00:00
Weblate
7eae6a3965 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:55 +00:00
Weblate
4ce49ab8bf Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:55 +00:00
manuroe
263b5183ac
Merge pull request #3048 from vector-im/riot_3046 
RoomMember scree: Display the verify button even in non e2e rooms
 2020-03-30 08:58:50 +02:00
Weblate
dfa453247b Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:04 +00:00
Weblate
6d4ae73c23 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:04 +00:00
Weblate
2b4ac714c5 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:04 +00:00
manuroe
67edd9ba24
Merge pull request #3045 from vector-im/riot_3024_2 
Security settings: Implement "Request (cross-signing private) keys"
 2020-03-30 08:57:59 +02:00
manuroe
f947138148 Fix unexpected cast 2020-03-27 17:39:11 +01:00
SBiOSoftWhare
adbf12a746 Update changes 2020-03-27 15:41:27 +01:00