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
7323 commits 46 branches 261 tags 144 MiB
Commit graph

7323 commits

This branch
This branch
All branches
Author SHA1 Message Date
SBiOSoftWhare
260d05ab81
Merge pull request #2967 from vector-im/riot_2960_2 
User verification: Use localization strings
 2020-02-04 10:27:37 +01:00
SBiOSoftWhare
48125b6147 RoomMemberDetailsViewController: Use NSArray instead of NSMutableArray for security section. 2020-02-04 10:23:19 +01:00
Weblate
a267ad2e32 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:10:39 +00:00
random
ff5e42cc1e Translated using Weblate (Italian) 
Currently translated at 100.0% (877 of 877 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-02-04 09:10:38 +00:00
Weblate
802afde7d4 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:10:35 +00:00
Weblate
9ea0967550 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:10:35 +00:00
SBiOSoftWhare
d73e8d8eb6
Merge pull request #2968 from vector-im/riot_2966 
Decoration: Display shields in room members list
 2020-02-04 10:10:29 +01:00
SBiOSoftWhare
ebf089115f ContactTableViewCell: Handle trust level shields decoration. 2020-02-03 19:01:47 +01:00
SBiOSoftWhare
e05f3ae6af RoomMemberDetailsViewController: Get user encryption trust level with MXRoom. 2020-02-03 19:00:33 +01:00
SBiOSoftWhare
22b9b6df21 MXRoom: Add a method to get user encryption trust level. 2020-02-03 18:59:25 +01:00
SBiOSoftWhare
bd131f12a9 UserVerificationSessionStatusViewController: Fix wording issue. 2020-02-03 18:07:53 +01:00
SBiOSoftWhare
ddfe4554f9 User verification: Use localization strings. 2020-02-03 17:52:39 +01:00
SBiOSoftWhare
72da7b1f2e RoomMemberDetailsViewController: Update security section and use localization strings. 2020-02-03 17:50:52 +01:00
SBiOSoftWhare
34a3de9f0b Add user verification strings. 2020-02-03 17:48:45 +01:00
Szimszon
af6ba287ce Translated using Weblate (Hungarian) 
Currently translated at 100.0% (877 of 877 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
 2020-02-02 20:23:43 +00:00
Weblate
eec05b701b Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:49 +00:00
Osoitz
4b04918546 Translated using Weblate (Basque) 
Currently translated at 99.0% (868 of 877 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
 2020-02-01 16:26:49 +00:00
Weblate
7e1bd2ca9e Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
Weblate
c5dfa19af8 Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
manuroe
2587386189
Merge pull request #2965 from vector-im/fosdem_fixes 
Room e2e decoration: Change the algo a bit
 2020-02-01 17:26:43 +01:00
manuroe
09c77e6142 Room e2e decoration: Change the algo a bit 2020-02-01 17:25:23 +01:00
Weblate
cdfc298db7 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
Weblate
0b47fdde27 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
Weblate
c5f5cd834a Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
manuroe
02cd98d3fc
Merge pull request #2961 from vector-im/riot_2959 
E2E: Do not warn anymore for unknown devices
 2020-01-31 18:01:02 +01:00
Weblate
5101d59152 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
Weblate
a66f552473 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
Weblate
f9567c5893 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
SBiOSoftWhare
ae1b32a28f
Merge pull request #2964 from vector-im/riot_2922_2 
Settings: Add session verification screens
 2020-01-31 17:54:02 +01:00
SBiOSoftWhare
3ff40c59a2 Settings: Add session verification screens. 2020-01-31 17:46:16 +01:00
SBiOSoftWhare
beb185dc02 User verification: Add possibility to present on session detail from UserVerificationCoordinator. 2020-01-31 17:46:03 +01:00
Weblate
e9066890db Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:15 +00:00
Weblate
005dfa005c Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:15 +00:00
Weblate
a3e96aae66 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:14 +00:00
SBiOSoftWhare
c2d1442f94
Merge pull request #2960 from vector-im/riot_2924 
Cross-signing: New room member screen design (WIP)
 2020-01-31 16:54:09 +01:00
SBiOSoftWhare
17fb117329 Merge branch 'develop' into riot_2924 
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
 2020-01-31 16:45:35 +01:00
Weblate
01dc3621ff Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
Weblate
f9f3d51077 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
Weblate
14efd33854 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
manuroe
db4f537a75
Merge pull request #2963 from vector-im/riot_2906 
Room decoration: Make shields bigger
 2020-01-31 16:22:12 +01:00
manuroe
fb97b498c6 Room decoration: Make shields bigger 2020-01-31 16:20:28 +01:00
Weblate
1cdfc9f6ed Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:14 +00:00
Kévin C
8995c6dd6b Translated using Weblate (French) 
Currently translated at 100.0% (877 of 877 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-01-31 14:59:14 +00:00
Weblate
0ba602b7b9 Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
Weblate
d6d1c19f5f Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
manuroe
115c7ed571
Merge pull request #2962 from vector-im/riot_2906 
Room decoration: Use shields instead of padlocks
 2020-01-31 15:59:07 +01:00
SBiOSoftWhare
0695ed215b User verification: User device verification flow when verify a session. 2020-01-31 15:09:19 +01:00
SBiOSoftWhare
f008ae40f1 User verification: Update device verification flow to support device or user verification. 2020-01-31 15:07:30 +01:00
SBiOSoftWhare
5ad1596b8f User verification: Add table view title for session list screen. 2020-01-31 15:03:44 +01:00
SBiOSoftWhare
b5e20087cb Add modules property on NavigationRouterType. 2020-01-31 15:02:02 +01:00