Commit Graph

5042 Commits

Author SHA1 Message Date
Weblate ff48399be5 Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
Weblate 25055a4e94 Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
Weblate edb7b70783 Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
manuroe 2a6457683e Merge pull request #3109 from vector-im/riot_3103
Remove LABS > Enable Cross-signing
2020-04-16 09:32:58 +02:00
manuroe e40cb0cdd3 Remove LABS > Enable Cross-signing 2020-04-15 23:17:10 +02:00
ismailgulek f46590d0cf Update methods
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 20:02:13 +03:00
ismailgulek dc2384f49e DeactivateAccountViewController theme, fixes #2993
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 18:45:46 +03:00
Weblate 180ed6f248 Merge branch 'origin/develop' into Weblate. 2020-04-15 08:41:54 +00:00
Weblate 29efd028b7 Merge branch 'origin/develop' into Weblate. 2020-04-15 08:41:54 +00:00
Weblate c3e88a5d4f Merge branch 'origin/develop' into Weblate. 2020-04-15 08:41:53 +00:00
giomfo 57e17815be 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 6259a946a6 Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
Weblate a07896838e Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
Weblate 89d5ab86c3 Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
manuroe 375aebcffa New Sign-in: Do not send key requests before completing the "security" 2020-04-14 12:55:25 +02:00
manuroe 540ff0b736 KeyVerificationCoordinatorBridgePresenterDelegate: Add keyVerificationCoordinatorBridgePresenterDelegateDidCancel 2020-04-14 12:50:53 +02:00
random a5f614c789 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 3e67ab3844 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 c9c5cc9878 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 38415bc1eb Merge branch 'develop' into giomfo/bugfix2899 2020-04-13 14:53:31 +02:00
Szimszon 155fcd441c 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 f6fa7b56de 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 fcb0b0ef82 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
Kévin C dbfbf3b75b 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 520ece84ba Merge branch 'origin/develop' into Weblate. 2020-04-08 16:37:42 +00:00
Weblate 1ee5f02570 Merge branch 'origin/develop' into Weblate. 2020-04-08 16:37:41 +00:00
Weblate 1d16396067 Merge branch 'origin/develop' into Weblate. 2020-04-08 16:37:41 +00:00
manuroe 5fc697c791 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 8572f2d44d Merge remote-tracking branch 'origin/rior_3053' into rior_3053 2020-04-08 18:29:56 +02:00
manuroe ae72e85abf Fix Steve's comment 2020-04-08 18:29:37 +02:00
manuroe ac3bead5a8 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 6c344a3907 Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
Weblate 0e105ec94f Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
Weblate 7c2781a9f1 Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
manuroe 5c2f2ec42d Key Backup: Use legacy screens if the private key does not work 2020-04-08 16:48:12 +02:00
manuroe e44e91b60a Key Backup: Add a screen for recovering with the local private key 2020-04-08 15:52:04 +02:00
SBiOSoftWhare 533756d7c1 RoomVC: Handle title view encryption trust level badge image 2020-04-08 15:07:24 +02:00
SBiOSoftWhare d112395819 RoomTitleView: Add badge image view. 2020-04-08 15:06:59 +02:00
SBiOSoftWhare df745c0ea9 Use EncryptionTrustLevelBadgeImageHelper where needed. 2020-04-08 15:06:27 +02:00
SBiOSoftWhare 2895966098 Add an helper class for encryption trust level badge generation. 2020-04-08 15:05:11 +02:00
SBiOSoftWhare 1399a7fa10 RoomCollectionViewCell: Reduce trust level badge size. 2020-04-08 12:51:40 +02:00
SBiOSoftWhare c10e557690 ExpandedRoomTitleView: Reduce trust level badge size. 2020-04-08 12:42:12 +02:00
SBiOSoftWhare 0dd2cad15b RoomMemberTitleView: Remove power level badge. 2020-04-08 12:38:55 +02:00
SBiOSoftWhare 69d7cc1211 RoomMemberDetailsViewController: Add power level label instead of badge. 2020-04-08 12:37:52 +02:00
SBiOSoftWhare 2a97dc05e2 GroupParticipantsViewController: Handle power level label instead of badge. 2020-04-08 12:36:48 +02:00
SBiOSoftWhare dcebb7caa8 RoomParticipantsViewController: Handle power level label instead of badge. 2020-04-08 12:36:34 +02:00
SBiOSoftWhare 7f47fc5e4f ContactTableViewCell: Display power label instead of badge. 2020-04-08 12:35:18 +02:00
SBiOSoftWhare 50b9b4d246 Add power level localizable strings. 2020-04-08 12:33:28 +02:00
SBiOSoftWhare 7ba8fd2195 RoomPowerLevel: Add dedicated file and convenient init. 2020-04-08 12:32:36 +02:00
Marco Festini bb43518ac2 Declined calls now properly reset call view controller
Signed-off-by: Marco Festini <marco.festini@awesome-technologies.de>
2020-04-08 04:05:57 +02:00