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

8037 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manu
014553171b Merge branch 'release/v0.11.1' 2020-04-24 19:08:23 +02:00
Manu
5257cc921f Merge branch 'release/v0.11.1' into develop 2020-04-24 19:08:23 +02:00
manuroe
d951f4e4f3 version++ 2020-04-24 19:07:41 +02:00
manuroe
96960aa253
Merge pull request #3156 from vector-im/riot_3147 
Security settings: Do not ask to complete security if there is no cross-signing
 2020-04-24 18:57:16 +02:00
manuroe
fdc100c626 Cross-signing: Improve no bootstrap support copy a bit 2020-04-24 18:50:38 +02:00
manuroe
a7b61baab0 Security settings: Do not ask to complete security if there is no cross-signing 
Fix #3147
 2020-04-24 18:49:00 +02:00
manuroe
2d5197c9e7
Merge pull request #3155 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2020-04-24 17:29:59 +02:00
manuroe
2360d8780c
Merge pull request #3154 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Update from Weblate
 2020-04-24 17:29:41 +02:00
Weblate
c088639aa5 Merge branch 'origin/develop' into Weblate. 2020-04-24 14:58:29 +00:00
Weblate
33032919a0 Merge branch 'origin/develop' into Weblate. 2020-04-24 14:58:29 +00:00
SBiOSoftWhare
c19b0239df
Merge pull request #3152 from vector-im/riot_3141 
Update "Complete Security" screen
 2020-04-24 16:58:24 +02:00
SBiOSoftWhare
fa2c46b500 Complete security: Update UI. 2020-04-24 16:24:21 +02:00
SBiOSoftWhare
c88ef8f549 UILabel: Add convenient method for setting line spacing. 2020-04-24 16:23:15 +02:00
SBiOSoftWhare
469d0d9839 Complete security: Add new assets. 2020-04-24 16:22:25 +02:00
SBiOSoftWhare
a0cff1496a Complete security: Add new localizations. 2020-04-24 16:21:51 +02:00
Weblate
5c0a59e8bb Merge branch 'origin/develop' into Weblate. 2020-04-24 11:27:05 +00:00
Weblate
e18b5bd89c Merge branch 'origin/develop' into Weblate. 2020-04-24 11:27:05 +00:00
manuroe
9242c0d9d2
Merge pull request #3151 from vector-im/riot_3150 
Make Jitsi widgets compatible with Matrix Widget API v2
 2020-04-24 13:27:00 +02:00
manuroe
e2ec801c77 CHANGES 2020-04-24 12:27:26 +02:00
manuroe
aaba08e4ce Jitsi: Create jitsi widget with v2 style but stay compatible with v1 
We use `webAppUrl`and `jitsiServerURL` from the app plist for the url start (used only by web) and the default jitsi server
 2020-04-24 12:24:11 +02:00
Weblate
70c247bd55 Merge branch 'origin/develop' into Weblate. 2020-04-24 09:15:14 +00:00
random
6be22b39aa Translated using Weblate (Italian) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-04-24 09:15:14 +00:00
Kévin C
b12222a62c Translated using Weblate (French) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-04-24 09:15:11 +00:00
Weblate
ad4963e5e4 Merge branch 'origin/develop' into Weblate. 2020-04-24 09:15:09 +00:00
manuroe
c68596561a
Merge pull request #3148 from vector-im/nadonomy/icon-fixes 
Update icons
 2020-04-24 11:15:04 +02:00
manuroe
735f51d4ba Jitsi: Support v2 widget data. Open a conference on the provided domain 2020-04-24 11:09:01 +02:00
manuroe
71b3e167ef Jitsi: Support v1 and v2 widget types 2020-04-24 09:04:49 +02:00
Nad Chishtie
e8971331e0 Update selected icons to use better visually balanced weights 2020-04-23 23:53:30 +01:00
Nad Chishtie
7275ef3080 Update icons to use feather 2020-04-23 23:52:50 +01:00
Nad Chishtie
63d48db4ca Fix selected icon not being displayed in TabBar when Rooms is selected 2020-04-23 23:37:37 +01:00
Nad Chishtie
22a9418d58 Update icon assets to use feather 2020-04-23 23:37:11 +01:00
Weblate
412f671a7d Merge branch 'origin/develop' into Weblate. 2020-04-23 17:57:05 +00:00
Weblate
73c55de912 Merge branch 'origin/develop' into Weblate. 2020-04-23 17:57:05 +00:00
ismailgulek
911eb38026
Merge pull request #3084 from vector-im/riot_3067 
Consider Safe Area Insets for Some Screens
 2020-04-23 20:56:58 +03:00
Weblate
3dd4877139 Merge branch 'origin/develop' into Weblate. 2020-04-23 15:54:12 +00:00
Weblate
ada1a8b51f Merge branch 'origin/develop' into Weblate. 2020-04-23 15:54:11 +00:00
manuroe
490de559c7
Merge pull request #3146 from vector-im/riot_3049 
Security - CROSS-SIGNING: Use "Complete security" to fix cross-signing
 2020-04-23 17:54:06 +02:00
manuroe
203c4b4206 Security - CROSS-SIGNING: Use "Complete security" to fix cross-signing 
Fix #3049
 2020-04-23 17:31:49 +02:00
manuroe
bb92d57725 Settings - Security: Fix missing i18n 2020-04-23 17:29:58 +02:00
manuroe
eb0bea54c2 Settings - Security: Move down the key backup section 
With cross-signing and SSSS, this section is less important.
 2020-04-23 16:46:44 +02:00
Weblate
52eca2cbc6 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:08:38 +00:00
Weblate
de12e399f3 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:08:36 +00:00
SBiOSoftWhare
3a07010593
Merge pull request #3145 from vector-im/riot_3127 
BF: Settings - Security: My device is not trusted
 2020-04-23 16:08:31 +02:00
SBiOSoftWhare
369a42f0e9 Update wording. 2020-04-23 16:02:18 +02:00
Weblate
ca331e440e Merge branch 'origin/develop' into Weblate. 2020-04-23 13:53:55 +00:00
Szimszon
254bde6e9e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (948 of 948 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
 2020-04-23 13:53:54 +00:00
Weblate
95da4b88e0 Merge branch 'origin/develop' into Weblate. 2020-04-23 13:53:53 +00:00
manuroe
f2d02bb342
Merge pull request #3144 from vector-im/riot_3138 
Cross-signing: Allow to verify each device of users with no cross-signing
 2020-04-23 15:53:48 +02:00
manuroe
26de5a9e65
Merge branch 'develop' into riot_3138 2020-04-23 15:53:15 +02:00
SBiOSoftWhare
7e4a01e2b4 Update changes 2020-04-23 15:53:07 +02:00