Commit Graph

7018 Commits

Author SHA1 Message Date
Weblate 08e330cf9b Merge branch 'origin/develop' into Weblate. 2020-01-31 14:59:12 +00:00
manuroe d6036ed51c Merge pull request #2962 from vector-im/riot_2906
Room decoration: Use shields instead of padlocks
2020-01-31 15:59:07 +01:00
manuroe 3442a69924 Room decoration: Use shields instead of padlocks
#2906
2020-01-31 14:59:54 +01:00
Weblate 3b3b4ba7db Merge branch 'origin/develop' into Weblate. 2020-01-30 20:10:12 +00:00
manuroe 3fd073efbb Merge pull request #2958 from vector-im/membersTrustLevelSummary_sync
Fix shields
2020-01-30 21:10:07 +01:00
manuroe 26813e0379 Shields: Shields in one self room should be green if I have no other device 2020-01-30 17:48:22 +01:00
manuroe cb2398da48 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 67544997ab Merge branch 'origin/develop' into Weblate. 2020-01-30 15:13:19 +00:00
manuroe 5593598d3f Merge pull request #2955 from vector-im/riot_2957
E2E by default: canEnableE2EByDefaultInNewRoomWithUsers is now define…
2020-01-30 16:13:13 +01:00
manuroe 59fd9e12b5 E2E by default: canEnableE2EByDefaultInNewRoomWithUsers is now defined in the SDK 2020-01-30 16:08:58 +01:00
Weblate 59b48ac264 Merge branch 'origin/develop' into Weblate. 2020-01-30 13:17:20 +00:00
manuroe 242164b1e5 Merge pull request #2952 from vector-im/riot_2922
Settings: Add a dedicated screen for Security
2020-01-30 14:17:15 +01:00
manuroe 620952ecab Settings > Security: Fix file name 2020-01-30 13:24:13 +01:00
manuroe dc0fb2024f Settings > Security: Fix Giom's remarks 2020-01-30 13:19:09 +01:00
manuroe 46a6979ee3 Settings: More cleaning 2020-01-30 07:14:35 +01:00
manuroe 8dbb4c229c Settings: Remove code for things that have their own screen now 2020-01-30 07:12:05 +01:00
manuroe 60748eaf0a Settings: Remove code for things that have their own screen now 2020-01-30 07:01:10 +01:00
manuroe d485ed6ad6 Settings > Security > Manage Session: Import delete device code block from the kit 2020-01-29 23:17:57 +01:00
manuroe ce21a4b6d7 Settings > Security > Manage Session: Import rename code block from the kit 2020-01-29 22:00:05 +01:00
manuroe 2e20508ce4 Settings > Security: Add Manage Session screen 2020-01-29 21:09:15 +01:00
manuroe 045ea992f1 Settings > Security: Debug: Add cross-signing information 2020-01-29 15:56:06 +01:00
manuroe 0a7bd8fb61 Settings > Security: Display shields for devices 2020-01-29 10:58:37 +01:00
manuroe 087e6173b2 Settings > Security: Sort out things to match the design 2020-01-29 09:10:22 +01:00
manuroe 3cfdbf0e0e Settings > Security: More cleaning 2020-01-28 23:27:45 +01:00
manuroe 119acdfeca Settings > Security: More cleaning 2020-01-28 23:15:23 +01:00
manuroe 7dd764031e Settings > Security: Remove useless imported code 2020-01-28 22:05:11 +01:00
manuroe 63c876b6f6 Settings: Add a dedicated screen for Security 2020-01-28 21:09:51 +01:00
Weblate 4266928aac Merge branch 'origin/develop' into Weblate. 2020-01-28 17:18:27 +00:00
manuroe 7500ccd6a1 version++ 2020-01-28 18:18:19 +01:00
Weblate bcfc87a32c Merge branch 'origin/develop' into Weblate. 2020-01-28 15:57:05 +00:00
manuroe 4b90ced593 Merge pull request #2950 from vector-im/labs_crosssigning
Settings: LABS: Keep only one flag for cross-signing
2020-01-28 16:57:00 +01:00
manuroe 08b1659ff0 Settings: LABS: Keep only one flag for cross-signing 2020-01-28 16:51:03 +01:00
Weblate 445a28089d Merge branch 'origin/develop' into Weblate. 2020-01-28 15:25:42 +00:00
manuroe ade2aa4af9 Merge pull request #2948 from vector-im/riot_2947
Message decoration: Do not decorate state events
2020-01-28 16:25:37 +01:00
manuroe 266d5840e9 Message decoration: Do not decorate state events
#2947
2020-01-28 15:53:09 +01:00
Weblate 98b654b67a Merge branch 'origin/develop' into Weblate. 2020-01-28 14:39:34 +00:00
manuroe 5dfa2ecd92 Merge pull request #2946 from vector-im/riot_2943_2
Negotiate E2E by default for DMs
2020-01-28 15:39:29 +01:00
manuroe 1d845e23c0 Negotiate E2E by default for DMs
#2943
2020-01-28 15:16:53 +01:00
Weblate 56819d6cda Merge branch 'origin/develop' into Weblate. 2020-01-28 13:34:01 +00:00
manuroe aab92e77fd Room creation: Follow SDK changes (#2945)
Room creation: Follow SDK changes
2020-01-28 14:33:56 +01:00
Weblate b6ab10137e Merge branch 'origin/develop' into Weblate. 2020-01-27 16:45:39 +00:00
manuroe 65d48f870d Merge pull request #2942 from vector-im/riot_2941
Settings: Remove "End-to-End Encryption" from the LABS section
2020-01-27 17:45:34 +01:00
manuroe 989427bf20 Settings: Remove "End-to-End Encryption" from the LABS section
#2941
2020-01-27 17:30:09 +01:00
Weblate e8e215b58f Merge branch 'origin/develop' into Weblate. 2020-01-24 16:18:17 +00:00
SBiOSoftWhare 40e4099856 Merge pull request #2937 from vector-im/riot_2906
RoomVC: Update encryption decoration with shields
2020-01-24 17:18:11 +01:00
SBiOSoftWhare 1fe53c2b99 RoomVC: Use encryption normal shield when retrieving room encryption trust level. 2020-01-24 17:13:08 +01:00
SBiOSoftWhare 124cdb2691 RoomDataSource: Fix refactoring. 2020-01-23 16:39:33 +01:00
SBiOSoftWhare 2b6ae69a4c RoomDataSource: Now compute encryption trust level from trusted devices percentage in room. 2020-01-23 16:37:23 +01:00
SBiOSoftWhare bd79182c91 Update changes. 2020-01-22 16:45:33 +01:00
SBiOSoftWhare d96f8ab3e8 RoomVC: Handle encryption shields decoration for composer and expanded header. 2020-01-22 16:27:04 +01:00