Commit Graph

7517 Commits

Author SHA1 Message Date
Weblate de8d3e998c Merge branch 'origin/develop' into Weblate. 2020-04-17 17:05:06 +00:00
manuroe faaae8bf18 Merge branch 'release/v0.11.0' into develop 2020-04-17 19:04:38 +02:00
manuroe 4e2953be7f version++ 2020-04-17 19:04:21 +02:00
Weblate 4687d6bd0c Merge branch 'origin/develop' into Weblate. 2020-04-17 14:05:51 +00:00
ismailgulek d4a6d81ab3 Merge pull request #3119 from vector-im/riot_3088
Center Emojis Horizontally in Verification Screen
2020-04-17 17:05:47 +03:00
ismailgulek 99826c8635 Update third_party_licences.hmtl
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-17 17:02:09 +03:00
ismailgulek 37ff450d72 Set collectionView width to constant, to show only 4 items in a row
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-17 14:39:52 +03:00
ismailgulek 5453daa67f Update CHANGES.rst
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-17 13:43:46 +03:00
ismailgulek 6d4c865f2d Use KTCenterFlowLayout for collection view layout, fixes #3088
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-17 13:41:48 +03:00
ismailgulek c788a43cd0 Import KTCenterFlowLayout pod
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-17 13:39:02 +03:00
Weblate 38a5dde517 Merge branch 'origin/develop' into Weblate. 2020-04-17 09:48:55 +00:00
Besnik Bleta 292cbcfa23 Translated using Weblate (Albanian)
Currently translated at 99.5% (936 of 941 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2020-04-17 09:48:55 +00:00
SBiOSoftWhare 94cbea3e2c Merge pull request #3116 from vector-im/riot_3047
QR code: Display scan confirmation screen
2020-04-17 11:48:47 +02:00
SBiOSoftWhare 3628e45a62 KeyVerificationCoordinator: Handle QR code confirmation screen. 2020-04-16 18:46:18 +02:00
SBiOSoftWhare 9c82869754 KeyVerification: Update scanning screen to handle new QR code confirmation state. 2020-04-16 18:45:46 +02:00
SBiOSoftWhare 921e4f9a87 KeyVerification: Add new QR code confirmation screen. 2020-04-16 18:42:14 +02:00
Weblate ed25ae7f98 Merge branch 'origin/develop' into Weblate. 2020-04-16 08:23:48 +00:00
ismailgulek cd74a8f7aa Merge pull request #3107 from vector-im/riot_2993
DeactivateAccountViewController theme, fixes #2993
2020-04-16 11:23:43 +03:00
Weblate 121e712937 Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
manuroe fd74d5ebac Merge pull request #3109 from vector-im/riot_3103
Remove LABS > Enable Cross-signing
2020-04-16 09:32:58 +02:00
manuroe 768044d42d Remove LABS > Enable Cross-signing 2020-04-15 23:17:10 +02:00
ismailgulek 671d836bff Update methods
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 20:02:13 +03:00
ismailgulek 10c48e9634 Update CHANGES.rst
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 18:48:26 +03:00
ismailgulek ddc21bf612 DeactivateAccountViewController theme, fixes #2993
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 18:45:46 +03:00
Weblate c527eab731 Merge branch 'origin/develop' into Weblate. 2020-04-15 08:41:53 +00:00
giomfo dcbec2ad6f 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 cbe874cdbf Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
manuroe 0d8273e1ba 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 0a3136d353 New Sign-in: Do not send key requests before completing the "security" 2020-04-14 12:55:25 +02:00
manuroe 00bf54502d KeyVerificationCoordinatorBridgePresenterDelegate: Add keyVerificationCoordinatorBridgePresenterDelegateDidCancel 2020-04-14 12:50:53 +02:00
random 3eba9dd5e6 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 c1f1ced5d8 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 8214dd14c0 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 df405fff83 Merge branch 'develop' into giomfo/bugfix2899 2020-04-13 14:53:31 +02:00
Szimszon 54573768bb 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 0304c0e81f 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 3e2091a4af 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 3ccd974958 Merge branch 'origin/develop' into Weblate. 2020-04-09 12:38:10 +00:00
Kévin C 7153df9850 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
manuroe 062bd85b01 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 aad459cf9e SwiftUTI: Remove the no more maintained pod. Embed code instead 2020-04-09 14:31:26 +02:00
Weblate 6802e509b8 Merge branch 'origin/develop' into Weblate. 2020-04-08 16:37:42 +00:00
manuroe 04335035b9 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 21f2237af1 Merge remote-tracking branch 'origin/rior_3053' into rior_3053 2020-04-08 18:29:56 +02:00
manuroe 38e5a1220a Fix Steve's comment 2020-04-08 18:29:37 +02:00
manuroe 7ee6dea00a 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 863ed1bf34 Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
SBiOSoftWhare 1df58eb071 Merge pull request #3078 from vector-im/riot_2972
Make decoration uniform
2020-04-08 17:59:06 +02:00
manuroe 14f707c2e5 Key Backup: Use legacy screens if the private key does not work 2020-04-08 16:48:12 +02:00
manuroe 641025fac4 Key Backup: Add a screen for recovering with the local private key 2020-04-08 15:52:04 +02:00