Commit Graph

9041 Commits

Author SHA1 Message Date
Travis Ralston dd88809622 Fix imports for help & support tab
This was missed, somehow, in the sourcemaps stuff. The tab currently breaks the dialog on load.
2020-01-15 12:02:34 -07:00
Travis Ralston d763d7e633 Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n 2020-01-15 10:49:38 -07:00
Travis Ralston 0529efc5cd Merge pull request #3840 from matrix-org/travis/ftue/user-lists/5.1-suggestions
Improve the quality of invite suggestions by filtering out DMs
2020-01-15 10:49:00 -07:00
Travis Ralston 7bfb3686cd Merge pull request #3839 from matrix-org/travis/sourcemaps
Fix sourcemaps by refactoring the build system
2020-01-15 10:11:33 -07:00
David Baker fa174512cc Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices
Don't error on unverified/unknown devices.
2020-01-14 17:12:14 +00:00
Zoe 1fd1e4b953 Merge pull request #3835 from matrix-org/zip/11832-more-padlock-icons
Padlock icons in room header (behind feature_cross_signing)
2020-01-14 14:15:46 +00:00
Zoe f617fb7bbe Place RoomHeader privacy padlocks behind the crosssigning feature flag 2020-01-14 10:31:01 +00:00
Travis Ralston 76183fc8fd Appease the linter 2020-01-13 21:21:18 -07:00
Travis Ralston b69b284efa Humanize the recent DM rooms ourselves for translations 2020-01-13 21:20:01 -07:00
Travis Ralston 9188183c9b Improve the quality of invite suggestions by filtering out DMs
This helps the small rooms from being scored highly, bringing out users you've not seen in a long while.
2020-01-13 21:04:13 -07:00
Travis Ralston 90c7535a69 Export VIEWS from MatrixChat for riot-web tests 2020-01-13 20:15:58 -07:00
David Baker 14501b748b lint again 2020-01-13 21:58:26 +00:00
David Baker 9a1be1a24d Don't try to set crypto options without crypto enabled 2020-01-13 21:54:14 +00:00
J. Ryan Stinnett 9cedfeb007 Merge pull request #3825 from aaronraimist/lock
Emoji verification: Change name of 🔒 to lock
2020-01-13 21:32:58 +00:00
Travis Ralston bf6798e109 Appease the linter 2020-01-13 13:28:33 -07:00
Travis Ralston 5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
David Baker e47240d838 Lint Eastwood 2020-01-13 17:56:40 +00:00
David Baker d53016e8fc Room padlock decorations only if cross-signing is enabled
Put the padlock decorations behind the labs flag as without the
context of the shields on the room icons they can be a bit misleading
and make people think it means 'encrypted'.
2020-01-13 17:53:49 +00:00
David Baker 76fe87c941 Don't error on unverifie/unknownd devices.
When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).

Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
2020-01-13 17:41:58 +00:00
Zoe 397637d59d used classnames module 2020-01-13 15:08:07 +00:00
Zoe 0bd2ecd798 lint 2020-01-13 14:51:10 +00:00
Zoe e43174c636 Show padlock in room headers for invite-only rooms
Fixes #11832
2020-01-13 14:49:23 +00:00
Michael Telatynski 66b55495bb Fix right panel buttons highlighting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-13 12:40:45 +00:00
J. Ryan Stinnett 8fc85797a7 Guard against missing members in avatars
Part of https://github.com/vector-im/riot-web/issues/11744
2020-01-13 12:40:40 +00:00
J. Ryan Stinnett dd652f6af3 Merge pull request #3832 from matrix-org/jryans/community-user-list-fire
Repair community member info panel
2020-01-13 12:38:24 +00:00
J. Ryan Stinnett 77b479d50c Guard against missing members in avatars
Part of https://github.com/vector-im/riot-web/issues/11744
2020-01-13 12:29:10 +00:00
J. Ryan Stinnett 56a7b6c33e Merge pull request #3831 from matrix-org/jryans/feature-presence-indicator
Add feature flag around the presence indicator in room list
2020-01-13 12:25:00 +00:00
Zoe edd08c279c Merge pull request #3821 from matrix-org/zip/11226-padlock-icons
Display a padlock icon beside invite-only rooms (excluding DMs) in the room list
2020-01-13 12:20:32 +00:00
Michael Telatynski 9c686bf501 Fix right panel buttons highlighting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-13 12:15:54 +00:00
Zoe 878c5b5b52 removed unnecessary lint rule 2020-01-13 12:11:19 +00:00
J. Ryan Stinnett 2168e7ec0c Add feature flag around the presence indicator in room list
This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.

Part of https://github.com/vector-im/riot-web/issues/11799
2020-01-13 11:48:55 +00:00
Zoe 422d4cd73a small simplification in code as .getContent() will always return an object 2020-01-13 11:18:24 +00:00
Zoe 54c69b4630 this is what we call fast iteration 2020-01-10 17:47:39 +00:00
Z. E. Cat 1b75909cad Update src/components/views/rooms/RoomTile.js
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
2020-01-10 17:36:33 +00:00
Zoe fbabe79647 use getContent() instead 2020-01-10 17:35:57 +00:00
Z. E. Cat fb587cc62c Update src/components/views/rooms/RoomTile.js
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
2020-01-10 17:33:37 +00:00
Zoe bebfd60daf Very fastidiously check for null/undefined 2020-01-10 17:22:09 +00:00
Zoe df1fd4db72 suppress private icon if the room is a DM 2020-01-10 16:49:07 +00:00
Zoe 808785c2f8 lint 2020-01-10 16:43:36 +00:00
Zoe 5551b207c1 Actually, this task was about join rules, not encryption ones. Oops. 2020-01-10 16:33:08 +00:00
Zoe cb250c9b10 Use existing available props data to determine whether a room is encrypted, thereby allowing a state update to properly rerender the tile 2020-01-10 13:09:16 +00:00
David Baker 4a78faae4c Merge pull request #3826 from matrix-org/dbkr/roomview_listener_leak
Fix listener leak on RoomView
2020-01-10 11:25:36 +00:00
David Baker 63942d5200 Fix listener leak on RoomView
It looks like this was causing entire detached DOM trees to leak
in memory by react's internal fibers holding onto them from the
component.
2020-01-10 11:12:52 +00:00
Aaron Raimist 6cf5b3f1a2 Emoji verification: Change name of 🔒 to lock
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-01-09 21:56:28 -06:00
Travis Ralston 135c84251c Fix more imports post-merge 2020-01-09 14:19:19 -07:00
Travis Ralston dc914774fb Delete files that were conflicting in the merge and deleted on develop 2020-01-09 14:19:19 -07:00
Travis Ralston 19f78d4d97 Fix class construction in MemberList 2020-01-09 14:17:33 -07:00
Travis Ralston 727ce892de Fix remaining RoomView conflict
RoomContext was pulled out to its own file.
2020-01-09 14:17:33 -07:00
Travis Ralston 3e5cc9550b Fix import merge conflicts, removing any that aren't needed anymore
Many imports were removed as part of refactoring work, so here we are.
2020-01-09 14:17:33 -07:00
Travis Ralston fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00