Commit Graph

13178 Commits

Author SHA1 Message Date
Steve Barré daa97bb3fd Merge branch 'images_update' into 'rebranding'
Rebranding: Update tab bar and nav bar icons.

See merge request new-vector/element/element-ios!7
2020-07-02 13:39:48 +00:00
Weblate 38dc5ba5a7 Merge branch 'origin/develop' into Weblate. 2020-07-02 13:37:08 +00:00
ismailgulek dff4bb72be Merge pull request #3382 from vector-im/riot_3226
Fix Ban Reason Truncation
2020-07-02 16:37:02 +03:00
ismailgulek 057f007e8a Update CHANGES.rst 2020-07-02 16:14:03 +03:00
ismailgulek 7881b246bd Fix leading constraint, fixes #3226 2020-07-02 16:12:44 +03:00
SBiOSoftWhare 22833e07d4 Rebranding: Update tab bar and nav bar icons. 2020-07-02 15:08:16 +02:00
Ismail Gulek 465935096f Merge branch '6-update-app-version-to-1-0-0' into 'rebranding'
Update app version to 1.0.0

See merge request new-vector/element/element-ios!6
2020-07-02 11:07:10 +00:00
Kévin C 56fb79ba67 Translated using Weblate (French)
Currently translated at 100.0% (1040 of 1040 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2020-07-02 08:26:46 +00:00
Ismail Gulek e7b35fb264 Merge branch 'revert-395040f4' into 'develop'
Revert "Merge branch '6-update-app-version-to-1-0-0' into 'develop'"

See merge request new-vector/element/element-ios!5
2020-07-01 14:01:54 +00:00
Ismail Gulek bc13422ec3 Revert "Merge branch '6-update-app-version-to-1-0-0' into 'develop'"
This reverts merge request !4
2020-07-01 14:00:57 +00:00
Ismail Gulek 3380796b24 Merge branch '6-update-app-version-to-1-0-0' into 'develop'
Update app version to 1.0.0

Closes #6

See merge request new-vector/element/element-ios!4
2020-07-01 13:57:29 +00:00
Ismail Gulek c71f28da8f Update app version to 1.0.0 2020-07-01 16:26:34 +03:00
Ismail Gulek 80ceef8c85 Update placeholders in KeyVerificationManuallyVerifyViewController 2020-07-01 16:20:32 +03:00
Ismail Gulek 0c6f71857f Update urls in Vector.strings 2020-07-01 15:49:58 +03:00
Ismail Gulek fbfbc838d7 Update InfoPlist.strings 2020-07-01 15:45:09 +03:00
Ismail Gulek 050aee2da6 Update app urls 2020-07-01 14:17:42 +03:00
Ismail Gulek d88cf1a39f Add associated domains 2020-07-01 13:57:15 +03:00
Weblate a0caf0420d Merge branch 'origin/develop' into Weblate. 2020-07-01 07:03:11 +00:00
ismailgulek 9813c366c8 Remove xcode11 from Podfile 2020-07-01 10:02:59 +03:00
ismailgulek 31c89bf4f8 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
2020-07-01 09:59:29 +03:00
Weblate 24e7562754 Merge branch 'origin/develop' into Weblate. 2020-06-30 22:47:10 +00:00
SBiOSoftWhare 43237901b1 Merge tag 'v0.11.6' into develop
no message
2020-07-01 00:47:02 +02:00
SBiOSoftWhare 58a4c3da8c Merge branch 'release/v0.11.6' 2020-07-01 00:47:02 +02:00
Weblate a2a3ae21aa Merge branch 'origin/develop' into Weblate. 2020-06-30 22:45:28 +00:00
SBiOSoftWhare 0b9d4c29d9 Merge pull request #3379 from vector-im/fastfile_update
Fastfile: Enforce provisioning files selection when downloading them from portal
2020-07-01 00:45:23 +02:00
SBiOSoftWhare f3f1d8285d Fastfile: Enforce provisioning files selection when downloading them. 2020-07-01 00:09:10 +02:00
Weblate b335b1160d Merge branch 'origin/develop' into Weblate. 2020-06-30 20:56:18 +00:00
SBiOSoftWhare 87004ef8a8 Gemfile: Update dependencies. 2020-06-30 22:56:07 +02:00
Weblate 106bb96ed5 Merge branch 'origin/develop' into Weblate. 2020-06-30 20:38:02 +00:00
Besnik Bleta c9cbe206b9 Translated using Weblate (Albanian)
Currently translated at 99.2% (1032 of 1040 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2020-06-30 20:38:02 +00:00
SBiOSoftWhare ce9bc264d9 Merge branch 'release/v0.11.6' 2020-06-30 22:37:52 +02:00
SBiOSoftWhare 5385ff7c5f Merge tag 'v0.11.6' into develop
no message
2020-06-30 22:37:52 +02:00
SBiOSoftWhare 6014aeed14 version++ 2020-06-30 22:37:13 +02:00
SBiOSoftWhare 16d6ddd458 version++ 2020-06-30 22:25:39 +02:00
Weblate d6e6bf385f Merge branch 'origin/develop' into Weblate. 2020-06-30 19:50:57 +00:00
SBiOSoftWhare 365b68a505 Merge pull request #3375 from vector-im/copy_update
SecurityVC: Update MY SESSIONS copy
2020-06-30 21:50:52 +02:00
Weblate 5a4a1eb6ed Merge branch 'origin/develop' into Weblate. 2020-06-30 19:47:43 +00:00
Besnik Bleta 38de5faf3c Translated using Weblate (Albanian)
Currently translated at 99.2% (1030 of 1038 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2020-06-30 19:47:43 +00:00
SBiOSoftWhare 5f192cda7a Merge pull request #3377 from vector-im/riot_3299
Setup cross-signing for existing users
2020-06-30 21:47:36 +02:00
SBiOSoftWhare ece9e77cd8 Refactor cross signing banner. 2020-06-30 21:46:10 +02:00
SBiOSoftWhare aaca353748 KeyVerificationService: Fix canSetupKeyVerification. 2020-06-30 19:37:13 +02:00
SBiOSoftWhare 1ae3175326 AuthenticatedSessionViewControllerFactory: Add a discardableResult on viewController(forPath method. 2020-06-30 18:44:55 +02:00
SBiOSoftWhare 6c3be01a6e HomeVC: Handle key verification setup banner. 2020-06-30 18:44:14 +02:00
Weblate 875279b3db Merge branch 'origin/develop' into Weblate. 2020-06-30 16:25:20 +00:00
Riot Translate Bot 02b923de59 Update from Weblate (#3376)
* Translated using Weblate (Albanian)

Currently translated at 99.2% (1020 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/

* Translated using Weblate (French)

Currently translated at 100.0% (1028 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1028 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/

Co-authored-by: Besnik Bleta <besnik@programeshqip.org>
Co-authored-by: Kévin C <zecakeh@pm.me>
Co-authored-by: kernitus <zirconic@protonmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
2020-06-30 18:25:16 +02:00
manuroe c05eb10491 SecurityVC: Update MY SESSIONS copy 2020-06-30 18:12:50 +02:00
Weblate a3aecfcc34 Merge branch 'origin/develop' into Weblate. 2020-06-30 16:01:10 +00:00
manuroe 082d03be2e Sign out: Make sure there is a secure backup 2020-06-30 18:00:56 +02:00
SBiOSoftWhare 044853ad06 KeyVerificationService: Add canSetupKeyVerification method. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare 9c66b5428b RecentsDataSource: Handle key verification setup banner. 2020-06-30 17:33:42 +02:00