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

7676 commits

This branch
This branch
All branches
Author SHA1 Message Date
ismailgulek
7852e5b34d
Merge pull request #3107 from vector-im/riot_2993 
DeactivateAccountViewController theme, fixes #2993
 2020-04-16 11:23:43 +03:00
Weblate
26b7f34be6 Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
Weblate
ddc16a192a Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
Weblate
1abf19c20a Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
manuroe
40caeb54ee
Merge pull request #3109 from vector-im/riot_3103 
Remove LABS > Enable Cross-signing
 2020-04-16 09:32:58 +02:00
manuroe
35bc453ef0 Remove LABS > Enable Cross-signing 2020-04-15 23:17:10 +02:00
ismailgulek
41625e2d0d
Update methods 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-15 20:02:13 +03:00
ismailgulek
5bafa99ded
Update CHANGES.rst 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-15 18:48:26 +03:00
ismailgulek
737c5cff63
DeactivateAccountViewController theme, fixes #2993 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-15 18:45:46 +03:00
Weblate
ae5920d357 Merge branch 'origin/develop' into Weblate. 2020-04-15 08:41:54 +00:00
Weblate
0941896297 Merge branch 'origin/develop' into Weblate. 2020-04-15 08:41:54 +00:00
Weblate
8891d58a64 Merge branch 'origin/develop' into Weblate. 2020-04-15 08:41:53 +00:00
giomfo
263f3dbc93
Merge pull request #2900 from vector-im/giomfo/bugfix2899 
Bug Fix Key backup banner is not hidden correctly
 2020-04-15 10:41:48 +02:00
Weblate
d00d554191 Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
Weblate
4ccedeba73 Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
Weblate
cafe3b071d Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
manuroe
5f818b353c
Merge pull request #3099 from vector-im/riot_3089 
New Sign-in: Do not send key requests before completing the "security"
 2020-04-14 15:55:17 +02:00
manuroe
de13946fcd New Sign-in: Do not send key requests before completing the "security" 2020-04-14 12:55:25 +02:00
manuroe
ee62f3b6f2 KeyVerificationCoordinatorBridgePresenterDelegate: Add keyVerificationCoordinatorBridgePresenterDelegateDidCancel 2020-04-14 12:50:53 +02:00
random
ed4c991fe3 Translated using Weblate (Italian) 
Currently translated at 100.0% (942 of 942 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-04-13 22:27:52 +00:00
@a2sc:matrix.org
02940a91ab Translated using Weblate (German) 
Currently translated at 98.3% (926 of 942 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
 2020-04-13 22:27:51 +00:00
Osoitz
a795a5f418 Translated using Weblate (Basque) 
Currently translated at 100.0% (942 of 942 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
 2020-04-13 22:27:50 +00:00
giomfo
5cd59cb430
Merge branch 'develop' into giomfo/bugfix2899 2020-04-13 14:53:31 +02:00
Szimszon
69b2902b99 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (942 of 942 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
 2020-04-11 20:27:46 +00:00
alexsal86
0209aa53d1 Translated using Weblate (German) 
Currently translated at 98.2% (925 of 942 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
 2020-04-11 20:27:44 +00:00
Osoitz
68d76786af Translated using Weblate (Basque) 
Currently translated at 100.0% (942 of 942 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
 2020-04-11 20:27:44 +00:00
Weblate
ee645fcedf Merge branch 'origin/develop' into Weblate. 2020-04-09 12:38:10 +00:00
Kévin C
cb57715e29 Translated using Weblate (French) 
Currently translated at 100.0% (942 of 942 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-04-09 12:38:09 +00:00
Weblate
7c3846aa27 Merge branch 'origin/develop' into Weblate. 2020-04-09 12:38:08 +00:00
Weblate
59025c0318 Merge branch 'origin/develop' into Weblate. 2020-04-09 12:38:08 +00:00
manuroe
da432c60d5
Merge pull request #3083 from vector-im/remove_swiftUTI_pod 
SwiftUTI: Remove the no more maintained pod. Embed code instead
 2020-04-09 14:38:03 +02:00
manuroe
5724124d29 SwiftUTI: Remove the no more maintained pod. Embed code instead 2020-04-09 14:31:26 +02:00
Weblate
d50841206b Merge branch 'origin/develop' into Weblate. 2020-04-08 16:37:42 +00:00
Weblate
e746e68426 Merge branch 'origin/develop' into Weblate. 2020-04-08 16:37:41 +00:00
Weblate
efe8d613c4 Merge branch 'origin/develop' into Weblate. 2020-04-08 16:37:41 +00:00
manuroe
f30fed6a15
Merge pull request #3079 from vector-im/rior_3053 
Key Backup: Use private key if we have it
 2020-04-08 18:37:37 +02:00
manuroe
373dc0191e Merge remote-tracking branch 'origin/rior_3053' into rior_3053 2020-04-08 18:29:56 +02:00
manuroe
021a154c3b Fix Steve's comment 2020-04-08 18:29:37 +02:00
manuroe
40b69f2d3a
Update Riot/Modules/KeyBackup/Recover/PrivateKey/KeyBackupRecoverFromPrivateKeyViewState.swift 
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-04-08 18:25:42 +02:00
Weblate
e911e81a24 Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
Weblate
d7f1ab9da5 Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
Weblate
5365df98ee Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
SBiOSoftWhare
617420df35
Merge pull request #3078 from vector-im/riot_2972 
Make decoration uniform
 2020-04-08 17:59:06 +02:00
manuroe
d0f90558b2 Key Backup: Use legacy screens if the private key does not work 2020-04-08 16:48:12 +02:00
manuroe
5da191c4e7 Key Backup: Add a screen for recovering with the local private key 2020-04-08 15:52:04 +02:00
SBiOSoftWhare
c72478c0a8 Update changes 2020-04-08 15:10:36 +02:00
SBiOSoftWhare
ba7ad7b9c7 RoomVC: Handle title view encryption trust level badge image 2020-04-08 15:07:24 +02:00
SBiOSoftWhare
ffa560dc81 RoomTitleView: Add badge image view. 2020-04-08 15:06:59 +02:00
SBiOSoftWhare
26ac56d908 Use EncryptionTrustLevelBadgeImageHelper where needed. 2020-04-08 15:06:27 +02:00
SBiOSoftWhare
106f5fdb9c Add an helper class for encryption trust level badge generation. 2020-04-08 15:05:11 +02:00