Commit Graph

6199 Commits

Author SHA1 Message Date
ismailgulek d6ae15f9c0 Merge branch 'develop' into hide_push_content_on_pin_protection
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-09-28 14:23:11 +03:00
Bartosz 344723ac5e Translated using Weblate (Polish)
Currently translated at 100.0% (32 of 32 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/pl/
2020-09-28 11:04:59 +00:00
ismailgulek 651af472d4 Update localization keys 2020-09-28 12:51:34 +03:00
Nikita Epifanov 7eb050a91d Translated using Weblate (Russian)
Currently translated at 100.0% (1105 of 1105 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ru/
2020-09-27 10:05:07 +00:00
Bartosz 92e6f7fd4d Translated using Weblate (Polish)
Currently translated at 62.7% (693 of 1105 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/pl/
2020-09-27 10:05:05 +00:00
random dd7066258a Translated using Weblate (Italian)
Currently translated at 99.9% (1104 of 1105 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
2020-09-27 10:05:04 +00:00
@a2sc:matrix.org 3e943dc52d Translated using Weblate (German)
Currently translated at 99.8% (1103 of 1105 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
2020-09-27 10:05:03 +00:00
Priit Jõerüüt 0e18c455ad Translated using Weblate (Estonian)
Currently translated at 100.0% (1105 of 1105 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/et/
2020-09-27 10:05:01 +00:00
Besnik Bleta f120187ba5 Translated using Weblate (Albanian)
Currently translated at 99.0% (1094 of 1105 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2020-09-27 10:05:00 +00:00
ismailgulek d6c3b6f95d Add canUseBiometrics parameter 2020-09-25 17:59:29 +03:00
ismailgulek 2451dae1d2 Merge branch 'develop' into wording_for_dm 2020-09-25 16:49:41 +03:00
ismailgulek 55ae9e2845 Hide room creation event in modal 2020-09-25 16:16:23 +03:00
manuroe d57edd7563 Complete Security: Make sure the authentication flow display it if auth is not complete yet
The complete security flow can be unfortunately triggered from 2 places: AuthVC and MasterTabBarC.

On a fresh app installation, during authentication, it was unexpectedly displayed from MasterTabBarC. This prevented authentication flow to complete. The app stayed on the launching animation.

This commit fixes this race.
2020-09-25 13:06:34 +02:00
ismailgulek a9e47668e1 Wording for room ID 2020-09-25 13:46:20 +03:00
ismailgulek f1198af772 Wording for no local addresses 2020-09-25 13:44:39 +03:00
ismailgulek ef29d69896 Wording for listing in directory 2020-09-25 13:43:02 +03:00
ismailgulek a790692c20 Wording for access string, including guests 2020-09-25 13:41:10 +03:00
ismailgulek 28399f6e32 Wording for access string, apart from guests 2020-09-25 13:39:50 +03:00
ismailgulek aae42d95e0 Wording for room access section header 2020-09-25 13:36:42 +03:00
ismailgulek 20785bc368 Wording for room name 2020-09-25 13:34:11 +03:00
ismailgulek eb59b6ab3b Wording for room photo 2020-09-25 13:32:34 +03:00
ismailgulek 2c155d53e8 Wording for search placeholder 2020-09-25 13:30:52 +03:00
ismailgulek 755b37212c Wording for room details 2020-09-25 13:30:36 +03:00
ismailgulek e85b4412da Merge branch 'develop' into wording_for_dm 2020-09-25 11:59:51 +03:00
manuroe f856b1f317 Merge remote-tracking branch 'origin/complete_security_allow_device_verification_retry' into complete_security_allow_device_verification_retry 2020-09-25 10:14:27 +02:00
manuroe 7f14187b7b Add missing comment 2020-09-25 10:14:14 +02:00
manuroe 47e77b7ff6 Update Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-09-25 10:10:06 +02:00
manuroe c033f4f235 Merge branch 'develop' into complete_security_allow_device_verification_retry 2020-09-25 09:24:25 +02:00
SBiOSoftWhare 98adb29eb5 Merge pull request #3630 from vector-im/convert_to_coordinators
Create a coordinator for some legacy screen flows (application, split view and tab bar)
2020-09-25 09:20:40 +02:00
manuroe 6bad40781a KeyVerificationSelfVerifyWait: Listen to all verification requests not only the first one 2020-09-25 09:03:43 +02:00
manuroe 8d0837ee7c Complete Security: Come back to the root screen if device verification is cancelled
So that the user can retry to verify with another device
2020-09-25 08:58:57 +02:00
SBiOSoftWhare fcd5a7ca84 Fix review remarks. 2020-09-24 16:25:10 +02:00
SBiOSoftWhare fbcdab09f9 MasterTabBarController: Update delegate method name. 2020-09-24 15:55:59 +02:00
SBiOSoftWhare 5bc8bc4aeb Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2020-09-24 15:42:40 +02:00
SBiOSoftWhare 4ee2d367c3 Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:16:51 +02:00
SBiOSoftWhare 5049d6e76e Update Riot/Modules/SplitView/SplitViewCoordinatorType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:16:06 +02:00
SBiOSoftWhare ee77304e38 Update Riot/Routers/RootRouter.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:11:23 +02:00
SBiOSoftWhare 56c2d440cd Update Riot/Routers/RootRouterType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:11:11 +02:00
SBiOSoftWhare 9de2260783 Update Riot/Routers/RootRouterType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:10:59 +02:00
SBiOSoftWhare aa22c7c006 Update Riot/Modules/SplitView/SplitViewCoordinatorType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:10:48 +02:00
Weblate 8677f722ea Merge branch 'origin/develop' into Weblate. 2020-09-24 12:17:18 +00:00
ismailgulek 14a492843d Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
2020-09-24 14:13:53 +03:00
ismailgulek 10db9638f1 Update encryption strings 2020-09-24 13:27:53 +03:00
ismailgulek d69b2184cb Update leave strings 2020-09-24 13:00:50 +03:00
SBiOSoftWhare 67032a9d2e Add additional comments on SplitView and TabBar coordinators. 2020-09-24 12:00:21 +02:00
ismailgulek 2feba65be4 Remove redundant string 2020-09-24 12:41:25 +03:00
SBiOSoftWhare 65f4237ae0 Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
2020-09-24 11:37:24 +02:00
Marcelo Filho 361b007fa0 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (1075 of 1075 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/pt_BR/
2020-09-23 17:04:54 +00:00
Priit Jõerüüt 981b857a0f Translated using Weblate (Estonian)
Currently translated at 100.0% (1076 of 1076 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/et/
2020-09-23 17:04:54 +00:00
ismailgulek 53bedc9c63 Update Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-09-23 18:24:25 +03:00