Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
7817 commits 46 branches 261 tags 144 MiB
Commit graph

7817 commits

This branch
This branch
All branches
Author SHA1 Message Date
SBiOSoftWhare
7223cefd8f Remove some optional chaining. 2020-05-05 12:03:51 +02:00
SBiOSoftWhare
49a4e1fb6e KeyVerificationSelfVerifyStartViewController: Show navigation bar if needed. 2020-05-05 11:51:22 +02:00
SBiOSoftWhare
d899011360 KeyVerificationDataLoadingViewController: Show navigation bar if needed. 2020-05-05 11:50:59 +02:00
SBiOSoftWhare
5773e82498 Update changes 2020-05-05 11:46:12 +02:00
SBiOSoftWhare
083cb2a3e2
Merge pull request #3196 from vector-im/riot_3180_2 
Key verification: Update unverified sessions alert wording
 2020-05-05 09:55:32 +02:00
SBiOSoftWhare
7ad16b0a50 Key verification: Update unverified sessions alert wording. 2020-05-05 09:39:47 +02:00
SBiOSoftWhare
cbb75fbcfb
Merge pull request #3194 from vector-im/riot_3180 
Key verification: Display "Verify your other sessions" modal at every startup if needed
 2020-05-05 09:24:31 +02:00
SBiOSoftWhare
333f7a0db4 MasterTatBarVC: Fix navigation stack issue when show security screen. 2020-05-05 09:17:47 +02:00
SBiOSoftWhare
dfc81a655d Update changes 2020-05-04 20:00:35 +02:00
SBiOSoftWhare
dae859af47 Key verification: Display "Verify your other sessions" modal at every startup if needed. 2020-05-04 19:59:11 +02:00
SBiOSoftWhare
c782826fce Make SettingsViewController directly instantiable. 2020-05-04 19:58:06 +02:00
Riot Translate Bot
bb345b0164
Update from Weblate (#3193) 
Co-authored-by: Weblate <noreply@weblate.org>
 2020-05-04 10:49:10 +02:00
Riot Translate Bot
040ce2e3c0
Update from Weblate (#3192) 
* Translated using Weblate (French)

Currently translated at 100.0% (970 of 970 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 98.8% (958 of 970 strings)

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

* Translated using Weblate (French)

Currently translated at 100.0% (973 of 973 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% (973 of 973 strings)

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

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Kévin C <zecakeh@pm.me>
Co-authored-by: random <dictionary@tutamail.com>
 2020-05-04 10:48:53 +02:00
SBiOSoftWhare
8773402f23 Merge tag 'v0.11.2' into develop 
no message
 2020-05-01 03:48:04 +02:00
SBiOSoftWhare
31d04acb09 Merge branch 'release/v0.11.2' 2020-05-01 03:48:04 +02:00
SBiOSoftWhare
42f659d78c version++ 2020-05-01 03:39:23 +02:00
SBiOSoftWhare
8c52fca6a4
Merge pull request #3188 from vector-im/riot_3184 
New sign in alert: Update wording
 2020-04-30 23:52:12 +02:00
SBiOSoftWhare
fb926b4be2 New sign in alert: Update wording. 2020-04-30 23:49:56 +02:00
SBiOSoftWhare
2f9dfeaafd
Merge pull request #3187 from vector-im/riot_3183 
Complete Security screen: Support verification start
 2020-04-30 19:25:05 +02:00
SBiOSoftWhare
463bc2fdca
Merge branch 'develop' into riot_3183 2020-04-30 19:24:45 +02:00
SBiOSoftWhare
73f1137a32 Update changes. 2020-04-30 19:19:06 +02:00
SBiOSoftWhare
80948bc52d Complete security: Handle incoming SAS transaction. 2020-04-30 19:17:56 +02:00
SBiOSoftWhare
dec737c340 KeyVerificationCoordinatorBridgePresenter: Add isPresenting property. 2020-04-30 19:11:13 +02:00
SBiOSoftWhare
c8fa26f605
Merge pull request #3186 from vector-im/riot_3179 
Display the "Verify this session" modal at every startup
 2020-04-30 19:06:08 +02:00
SBiOSoftWhare
d94c0b9d90 Update changes. 2020-04-30 15:34:00 +02:00
SBiOSoftWhare
4758c676b3 Key verification: Display "Verify this session" modal at every startup if needed. 2020-04-30 15:28:43 +02:00
manuroe
08cd04e5c9 i18n: Fix typo in new strings 2020-04-29 16:41:16 +02:00
manuroe
6144160a95 version++ 2020-04-29 12:31:30 +02:00
SBiOSoftWhare
66538603d5
Merge pull request #3177 from vector-im/riot_3153 
Complete security screen: Update assets size
 2020-04-29 10:08:43 +02:00
SBiOSoftWhare
36a1e1d024 Complete security screen: Update assets size. 2020-04-29 09:55:16 +02:00
Riot Translate Bot
efaa8297d3
Update from Weblate (#3176) 
Co-authored-by: Weblate <noreply@weblate.org>
 2020-04-29 09:18:15 +02:00
manuroe
6a2db0cc5e
Merge pull request #3175 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Update from Weblate
 2020-04-29 09:17:26 +02:00
manuroe
44787e89aa Merge remote-tracking branch 'origin/develop' into develop 2020-04-29 09:16:40 +02:00
manuroe
2940a25cc4 Verification: Update copy when only SAS 
Copied from riot-web from its member panel
 2020-04-29 08:42:36 +02:00
Weblate
3b27187606 Merge branch 'origin/develop' into Weblate. 2020-04-28 19:39:47 +00:00
SBiOSoftWhare
0d86c58350
Merge pull request #3174 from vector-im/update_verified 
Key verification: Update verified screen UI
 2020-04-28 21:39:42 +02:00
SBiOSoftWhare
7dfb43ce05 Fix commented code. 2020-04-28 20:36:23 +02:00
SBiOSoftWhare
3ce542cd80 Key verification: Update verified screen UI. 2020-04-28 20:27:48 +02:00
Weblate
595c86f0df Merge branch 'origin/develop' into Weblate. 2020-04-28 17:38:49 +00:00
ismailgulek
4fd31c468e
Merge pull request #3173 from vector-im/prefill_email 
Prefill Email Field on Registrations
 2020-04-28 20:38:45 +03:00
ismailgulek
c3f8deb7ce
Fix Manu's comment 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-28 20:33:31 +03:00
ismailgulek
09c1e9cff9
Update Riot/Utils/UniversalLink.m 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2020-04-28 20:21:51 +03:00
ismailgulek
91f6d724c8
Update Riot/Utils/UniversalLink.h 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2020-04-28 20:21:40 +03:00
ismailgulek
8b2342f599
Update CHANGES.rst 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-28 19:58:50 +03:00
ismailgulek
f47e929ea7
Prefill email field on registrations 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-28 19:55:02 +03:00
Weblate
e250f16af4 Merge branch 'origin/develop' into Weblate. 2020-04-28 16:39:40 +00:00
manuroe
d20a35017f
Merge pull request #3169 from vector-im/polish_not_verified 
Some polishing when the device is not trusted yet
 2020-04-28 18:39:36 +02:00
manuroe
00f5cf11ad
Merge branch 'develop' into polish_not_verified 2020-04-28 18:39:20 +02:00
Weblate
281c531de8 Merge branch 'origin/develop' into Weblate. 2020-04-28 16:26:06 +00:00
manuroe
81003e0b49
Merge pull request #3172 from vector-im/riot_3035 
Verification: Do not talk about QR code if only emoji is possible
 2020-04-28 18:26:01 +02:00