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

7455 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
manuroe
c70452661a Room decoration: Use shields instead of padlocks 
#2906
 2020-01-31 14:59:54 +01:00
SBiOSoftWhare
93c7f8e155 Merge branch 'riot_2924' of github.com:vector-im/riot-ios into riot_2924 2020-01-30 21:37:39 +01:00
SBiOSoftWhare
81466c5417 Update MXUsersTrustLevelSummary fetch. 2020-01-30 21:37:25 +01:00
Weblate
19c4ea830f Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
Weblate
58c621e6fe Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
Weblate
a4e70a2cbe Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
manuroe
5c50bcaabf
Merge pull request #2958 from vector-im/membersTrustLevelSummary_sync 
Fix shields
 2020-01-30 21:10:07 +01:00
SBiOSoftWhare
d37e23edfc
Update Riot/Modules/UserVerification/Start/UserVerificationStartViewModelType.swift 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2020-01-30 20:58:12 +01:00
SBiOSoftWhare
01612d735a
Update Riot/AppDelegate.m 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2020-01-30 20:57:51 +01:00
manuroe
178d6e5b97 E2E: Do not warn anymore for unknown devices 
# 2959
 2020-01-30 18:13:49 +01:00
SBiOSoftWhare
76bcb0256e Update pbxproj 2020-01-30 18:05:55 +01:00
SBiOSoftWhare
0d23b2d461 User verification: Update room member details screen with security section and shields. 2020-01-30 18:05:41 +01:00
SBiOSoftWhare
86036867d6 User verification: Handle start user verification flow through AppDelegate. 2020-01-30 17:59:42 +01:00
SBiOSoftWhare
6e25793c0a User verification: Add start user verification flow to DeviceVerificationCoordinator. 2020-01-30 17:57:09 +01:00
SBiOSoftWhare
4e6f5a0800 User verification: Implement user session status flow coordinator. 2020-01-30 17:55:36 +01:00
SBiOSoftWhare
ad5889bf2f User verification: Implement session list status screen. 2020-01-30 17:54:03 +01:00
manuroe
23a23445fa Shields: Shields in one self room should be green if I have no other device 2020-01-30 17:48:22 +01:00
SBiOSoftWhare
3b005d282d User verification: Create UserEncryptionTrustLevel enum. 2020-01-30 17:42:54 +01:00
SBiOSoftWhare
46efdd164a User verification: Implement single session status screen. 2020-01-30 17:41:51 +01:00