felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-29 12:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,267 Commits 1 Branch 67 Tags
c128a8179295fa4fe58f9a76df8759a68bcba860
Commit Graph

5042 Commits

Author SHA1 Message Date
Weblate 500d4f3840 Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
manuroe 91ab8421b5 Room e2e decoration: Change the algo a bit 2020-02-01 17:25:23 +01:00
Weblate 1f61530110 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
Weblate 7d2788b1a3 Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
Weblate 67c72f1e5b Merge branch 'origin/develop' into Weblate. 2020-01-31 17:01:07 +00:00
manuroe 535e1d61fa 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 b103b04d60 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
Weblate f28c5f9e52 Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
Weblate 637aee66db Merge branch 'origin/develop' into Weblate. 2020-01-31 16:54:07 +00:00
SBiOSoftWhare 68065e20e4 Settings: Add session verification screens. 2020-01-31 17:46:16 +01:00
SBiOSoftWhare 45779b0d7c User verification: Add possibility to present on session detail from UserVerificationCoordinator. 2020-01-31 17:46:03 +01:00
Weblate 38ccf52d72 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:15 +00:00
Weblate 403ceb37ca Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:15 +00:00
Weblate d655ee4ed9 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:54:14 +00:00
SBiOSoftWhare c5dd06605c Merge branch 'develop' into riot_2924 
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
 2020-01-31 16:45:35 +01:00
Weblate b7e7ea62e2 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
Weblate 00c8564432 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
Weblate 66338b8c88 Merge branch 'origin/develop' into Weblate. 2020-01-31 15:22:16 +00:00
manuroe 3cbe9ae0d4 Room decoration: Make shields bigger 2020-01-31 16:20:28 +01:00
Weblate 1da5570d43 Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:14 +00:00
Kévin C 0d875f098a 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 1ac9ee5ae3 Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
Weblate d48a8057aa Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
SBiOSoftWhare a72219f749 User verification: User device verification flow when verify a session. 2020-01-31 15:09:19 +01:00
SBiOSoftWhare 40843ec0c1 User verification: Update device verification flow to support device or user verification. 2020-01-31 15:07:30 +01:00
SBiOSoftWhare 7ccb4272cb User verification: Add table view title for session list screen. 2020-01-31 15:03:44 +01:00
SBiOSoftWhare ed832f1770 Add modules property on NavigationRouterType. 2020-01-31 15:02:02 +01:00
manuroe fc9c278d99 Room decoration: Use shields instead of padlocks 
#2906
 2020-01-31 14:59:54 +01:00
SBiOSoftWhare 158c4c0894 Merge branch 'riot_2924' of github.com:vector-im/riot-ios into riot_2924 2020-01-30 21:37:39 +01:00
SBiOSoftWhare be42ed6cc8 Update MXUsersTrustLevelSummary fetch. 2020-01-30 21:37:25 +01:00
Weblate b70429c813 Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
Weblate 7ef30b378a Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
Weblate e9dd5d85a7 Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
SBiOSoftWhare ba7e657dbf 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 e4be21921c Update Riot/AppDelegate.m 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2020-01-30 20:57:51 +01:00
manuroe 33fb24ceb2 E2E: Do not warn anymore for unknown devices 
# 2959
 2020-01-30 18:13:49 +01:00
SBiOSoftWhare f01f5c38de Update pbxproj 2020-01-30 18:05:55 +01:00
SBiOSoftWhare bf0651dfcd User verification: Update room member details screen with security section and shields. 2020-01-30 18:05:41 +01:00
SBiOSoftWhare 1bd721fd46 User verification: Handle start user verification flow through AppDelegate. 2020-01-30 17:59:42 +01:00
SBiOSoftWhare 2ad56b6be4 User verification: Add start user verification flow to DeviceVerificationCoordinator. 2020-01-30 17:57:09 +01:00
SBiOSoftWhare f094a2cca3 User verification: Implement user session status flow coordinator. 2020-01-30 17:55:36 +01:00
SBiOSoftWhare c076b8c260 User verification: Implement session list status screen. 2020-01-30 17:54:03 +01:00
manuroe bd5088385e Shields: Shields in one self room should be green if I have no other device 2020-01-30 17:48:22 +01:00
SBiOSoftWhare f81f11d8b2 User verification: Create UserEncryptionTrustLevel enum. 2020-01-30 17:42:54 +01:00
SBiOSoftWhare e1ab7e738a User verification: Implement single session status screen. 2020-01-30 17:41:51 +01:00
SBiOSoftWhare 1f492b30cf User verification: Implement start user verification screen. 2020-01-30 17:38:33 +01:00
manuroe a9207f5f53 Room Shield: Use sync version of [MXRoom membersTrustLevelSummary:] 
https://github.com/vector-im/riot-ios/issues/2956
to break keys downloads in loop
 2020-01-30 17:16:53 +01:00
Weblate c89fcf3749 Merge branch 'origin/develop' into Weblate. 2020-01-30 15:13:19 +00:00
Weblate 45ecb7bda6 Merge branch 'origin/develop' into Weblate. 2020-01-30 15:13:19 +00:00
Weblate acbd919e5f Merge branch 'origin/develop' into Weblate. 2020-01-30 15:13:19 +00:00