Commit Graph

10267 Commits

Author SHA1 Message Date
SBiOSoftWhare 1dc7f8e093 Merge pull request #2977 from vector-im/riot_2974
Message decoration: No shield by default
2020-02-06 11:21:15 +01:00
SBiOSoftWhare 02f2c76ae3 Message decoration: Fix shield appearance behavior. 2020-02-06 11:14:13 +01:00
Weblate 8881e7e623 Merge branch 'origin/develop' into Weblate. 2020-02-04 16:08:47 +00:00
random 5390515adc Translated using Weblate (Italian)
Currently translated at 96.8% (883 of 912 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
2020-02-04 16:08:47 +00:00
Weblate ddc9e48877 Merge branch 'origin/develop' into Weblate. 2020-02-04 16:08:45 +00:00
Weblate 4e70d10485 Merge branch 'origin/develop' into Weblate. 2020-02-04 16:08:45 +00:00
SBiOSoftWhare e4bf3c6da2 Merge pull request #2970 from vector-im/fix_room_participants_shields
Room participants: Fix user trust level shields always black
2020-02-04 17:08:40 +01:00
SBiOSoftWhare 6c287027ed Room participants: Fix user trust level shields always black. 2020-02-04 17:04:54 +01:00
Weblate 31dce34592 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:27:42 +00:00
Weblate 1ce9e7e120 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:27:42 +00:00
Weblate 0088163a10 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:27:42 +00:00
SBiOSoftWhare de74c83117 Merge pull request #2967 from vector-im/riot_2960_2
User verification: Use localization strings
2020-02-04 10:27:37 +01:00
SBiOSoftWhare fbf1d54a4c RoomMemberDetailsViewController: Use NSArray instead of NSMutableArray for security section. 2020-02-04 10:23:19 +01:00
Weblate f33f17cca5 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:10:39 +00:00
random 51b2723ae2 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 4253230ba7 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:10:35 +00:00
Weblate 57df27dab4 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:10:35 +00:00
SBiOSoftWhare 63e56fca4d 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 4ec67480be ContactTableViewCell: Handle trust level shields decoration. 2020-02-03 19:01:47 +01:00
SBiOSoftWhare bd8d7c0659 RoomMemberDetailsViewController: Get user encryption trust level with MXRoom. 2020-02-03 19:00:33 +01:00
SBiOSoftWhare a806ddb315 MXRoom: Add a method to get user encryption trust level. 2020-02-03 18:59:25 +01:00
SBiOSoftWhare 5cd411c1c9 UserVerificationSessionStatusViewController: Fix wording issue. 2020-02-03 18:07:53 +01:00
SBiOSoftWhare 0552952cae User verification: Use localization strings. 2020-02-03 17:52:39 +01:00
SBiOSoftWhare e5565e5d09 RoomMemberDetailsViewController: Update security section and use localization strings. 2020-02-03 17:50:52 +01:00
SBiOSoftWhare 47edeca792 Add user verification strings. 2020-02-03 17:48:45 +01:00
Szimszon 99b9b132a3 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 a6d5115a66 Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:49 +00:00
Osoitz 3de88243ba 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 1d2d8e7b3f Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
Weblate 500d4f3840 Merge branch 'origin/develop' into Weblate. 2020-02-01 16:26:48 +00:00
manuroe edaca31bd0 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 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 fe6a7b89e1 Merge pull request #2964 from vector-im/riot_2922_2
Settings: Add session verification screens
2020-01-31 17:54:02 +01: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 14c2549481 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 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