Commit graph

5071 commits

Author SHA1 Message Date
Michael Telatynski
5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 2021-05-11 09:14:01 +01:00
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Travis Ralston
beef07bdef Merge branch 'develop' into err 2021-05-10 20:08:19 -06:00
Travis Ralston
379d19e2e0
Lint 2021-05-10 19:56:30 -06:00
Germain Souquet
17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Michael Telatynski
70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1
Switch the Home Space out for an All rooms space
2021-05-10 16:26:05 +01:00
Michael Telatynski
c96bb374ea Allow user to progress through space setup wizard using Enter/Return 2021-05-10 16:06:23 +01:00
Germain Souquet
f1a6f6fd7f make breadcrumb room events decryption more idiomatic 2021-05-10 15:48:39 +01:00
Jaiwanth
6f98aa06c4 Save edited state when switching rooms
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-09 13:42:01 +05:30
Germain Souquet
6e3f8d6a0a Decrypt last events first to avoid shifts when scrolling up 2021-05-07 15:26:16 +01:00
Germain Souquet
fa30285c6b Decrypt messages on when used on a timeline 2021-05-07 15:16:54 +01:00
Ayush PS
32edbc155f Merge remote-tracking branch 'origin/develop' into err 2021-05-07 19:16:00 +05:30
Michael Telatynski
a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +01:00
Michael Telatynski
6338ced8a3
Merge pull request #5977 from matrix-org/t3chguy/fix/17176
Iterate Spaces admin UX around room management
2021-05-07 11:47:45 +01:00
Germain Souquet
17099c656b Call renamed room::decryptAllEvents method 2021-05-07 11:25:25 +01:00
Michael Telatynski
6137162786 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1
 Conflicts:
	src/stores/room-list/RoomListStore.ts
2021-05-07 10:40:07 +01:00
Michael Telatynski
4079b03ae0 Bring back filter all spaces behaviour 2021-05-07 10:39:35 +01:00
Michael Telatynski
6f28964b49
Merge pull request #5979 from matrix-org/t3chguy/spaces-logs
Guard all isSpaceRoom calls behind the labs flag
2021-05-07 10:28:14 +01:00
Michael Telatynski
d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-05-06 13:06:50 +01:00
Michael Telatynski
d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
Germain Souquet
0c87a67caf Lazily decrypt events on room view 2021-05-06 11:46:25 +01:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski
90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Michael Telatynski
68210b1415
Merge pull request #5963 from matrix-org/t3chguy/fix/17119
Update space ordering behaviour to match updates in MSC
2021-05-05 22:26:45 +01:00
Michael Telatynski
650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
Michael Telatynski
886959f32d port rate limiting code over to space creation wizard's add existing rooms 2021-05-05 11:54:14 +01:00
Michael Telatynski
a70be45b6e Experiment switching the Home Space out for an All rooms space 2021-05-04 18:26:49 +01:00
Michael Telatynski
ac61c8eca8 Adhere to updated sort order for space children 2021-05-04 12:27:27 +01:00
Michael Telatynski
a7642b2b24 Fix space name "Empty room" during creation wizard 2021-05-04 10:48:34 +01:00
Jaiwanth
54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Michael Telatynski
8dbcc85249
Merge pull request #5944 from matrix-org/t3chguy/fix/17043
Inhibit sending RR when context switching to a room
2021-04-30 15:13:18 +01:00
Michael Telatynski
39ccecab03
Merge pull request #5950 from matrix-org/t3chguy/fix/17117
Prevent room list keyboard handling from landing focus on hidden nodes
2021-04-30 12:55:27 +01:00
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998
Make the text filter search all spaces instead of just the selected one
2021-04-30 12:53:38 +01:00
Michael Telatynski
042ca65806 fix beta dot showing up when beta is disabled 2021-04-30 12:32:42 +01:00
Michael Telatynski
43410835a3 Prevent room list keyboard handling from landing focus on hidden nodes 2021-04-30 11:53:56 +01:00
Šimon Brandner
2e62b18617
Revert some changes to avoid re-translation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-30 12:30:14 +02:00
Šimon Brandner
c6bd2c7d67
Fix some more formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:18:26 +02:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
Šimon Brandner
232b87a3b4
Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Michael Telatynski
73abe51fb9 actually use the new state 2021-04-29 16:46:21 +01:00
Michael Telatynski
62198601d2 Tweak room list filter placeholder and results copy for spaces 2021-04-29 16:40:08 +01:00
Michael Telatynski
279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski
036bc50b5d Disable groups routes when spaces is enabled to avoid confusion 2021-04-29 12:29:22 +01:00
Michael Telatynski
a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
2021-04-29 09:52:21 +01:00
Michael Telatynski
e390c3c732 Inhibit sending RR when context switching to a room 2021-04-29 09:37:21 +01:00
Michael Telatynski
9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-04-28 22:49:36 +01:00
Michael Telatynski
1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Ayush PS
81f2e67443 Fixed Linting errors 2021-04-28 23:40:23 +05:30
Ayush PS
8b644e783e Finally fixes two todays 2021-04-28 23:23:51 +05:30
Travis Ralston
b90c845fcb
Revert "Fixes the two Todays problem in Redaction" 2021-04-28 10:07:22 -06:00
Travis Ralston
e53b3b6634
Merge pull request #5917 from DantrazTrev/Redact
Fixes the two Todays problem in Redaction
2021-04-28 09:51:43 -06:00
Travis Ralston
baef98253e
Merge pull request #5920 from aaronraimist/page-up-down
Fix page up/down scrolling only half a page
2021-04-28 09:51:36 -06:00
Michael Telatynski
5a921bf38a Add beta pill to space create menu 2021-04-28 12:10:03 +01:00
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:52:23 +02:00
Michael Telatynski
9dff5cd596 tweak leave space on preview 2021-04-28 08:59:02 +01:00
Michael Telatynski
18a01d9271 Show spaces beta prompt when viewing a space without the beta 2021-04-28 08:41:31 +01:00
Ayush PS
e2ce699130 Fixed linting warnings in MessagePanel.js 2021-04-28 10:02:20 +05:30
Michael Telatynski
46d35411b4 Add animated mx_BetaDot atop the legacy Communities button 2021-04-27 17:01:22 +01:00
Michael Telatynski
c5f653245a Show Spaces beta card in Labs & My Communities view
the image is temporary
2021-04-27 16:29:42 +01:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
Travis Ralston
b9bd83ad41 Handle possible edge case with getting stuck in "unsent messages" bar
Just in case we're not cleaning up the isResending state properly, here's a catch all.

Unrelated to https://github.com/vector-im/element-web/issues/17078 (this code doesn't affect the js-sdk error the author is seeing)
2021-04-27 08:58:18 -06:00
J. Ryan Stinnett
dd8abb0206
Merge pull request #5912 from matrix-org/jryans/convert-flow-to-ts
Convert some Flow-typed files to TypeScript
2021-04-27 13:44:47 +01:00
Michael Telatynski
13a5d06e29
Merge pull request #5926 from matrix-org/t3chguy/fix/17067
Fix issues with space hierarchy in layout and with incompatible servers
2021-04-27 11:21:15 +01:00
Šimon Brandner
a220b8b572
Wire up AudioFeedArrayForCall
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 11:59:08 +02:00
Michael Telatynski
915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Michael Telatynski
43b43dc685 tidy up code 2021-04-26 16:11:07 +01:00
Michael Telatynski
a8711dcce9 useSpaceSummary return error for incompatible server notice 2021-04-26 16:06:42 +01:00
J. Ryan Stinnett
cddcedcce2 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-26 15:57:28 +01:00
J. Ryan Stinnett
b8a915bb76 Tweak private / underscores for fields and methods 2021-04-26 14:02:53 +01:00
Michael Telatynski
8656212eb9 Space creation prompt user to add existing rooms instead of creating new ones 2021-04-26 12:41:04 +01:00
Ayush PS
123482952a Fixed linting errors 2021-04-26 15:01:39 +05:30
Aaron Raimist
ac486c847e
Try 0.9
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-26 01:10:04 -05:00
Aaron Raimist
e5f0119f66
Fix page up/page down scrolling only half a page
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-25 23:18:12 -05:00
Ayush PS
9a11b346c9 To fix the Redaction error and a few improvements 2021-04-24 18:09:34 +05:30
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
31a28b1a9e Update extensions for some files with types
This migrates one bucket of files using some amount of Flow typing to mark them
as TypeScript instead. The remaining type errors are fixed in subsequent
commits.
2021-04-23 16:05:30 +01:00
Travis Ralston
4be9c51dad Move all the RED_EXCLAMATION badges to a single definition 2021-04-21 16:43:25 -06:00
Travis Ralston
9227618b42 Show indicator in Room List for unsent events 2021-04-21 16:36:06 -06:00
Travis Ralston
91b3688feb Redesign "failed to send messages" status bar 2021-04-21 16:24:17 -06:00
Germain Souquet
c5a1bb2d2c fix sticky tags header in room list 2021-04-21 10:44:20 +01:00
Michael Telatynski
c953b1b6bb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pr/only-member-warning 2021-04-19 12:01:32 +01:00
Michael Telatynski
71d5f03a25 delint 2021-04-19 11:36:40 +01:00
J. Ryan Stinnett
495aff898f
Merge pull request #5864 from SimonBrandner/dont-render-msg-option
Render msgOption only if showReadReceipts is enabled
2021-04-15 17:24:13 +01:00
Travis Ralston
eed5efdbe1 Labs: Add quick/cheap "do not disturb" flag
This just disables audio notifications and the popup, which is the easiest way to do "do not disturb" for a device. This needs spec changes to be done properly, as it's a shame that mobile devices for the user will still go off.

Disabling all of push doesn't sound ideal as it would potentially mean missing highlights for when leaving DND mode.
2021-04-15 00:47:09 -06:00
Aaron Raimist
9c250171b4
Use new copy
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-14 18:27:41 -05:00
Šimon Brandner
43c236e8a5
Pass showReadReceipts from MessagePanel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-14 12:24:33 +02:00
Germain Souquet
9081f80008 Move user to welcome_page if continuing with previous session 2021-04-12 17:01:27 +01:00
Travis Ralston
8aa4b1a760
Merge pull request #5834 from matrix-org/travis/sponsored/security-disable-ui
Add ability to hide post-login encryption setup with customisation point
2021-04-09 08:04:06 -06:00
Travis Ralston
cc7982cfca
Merge pull request #5827 from SimonBrandner/show-drop-only-file
Show drop file UI only if dragging a file
2021-04-09 00:05:44 -06:00
Šimon Brandner
dacffdd62e
Add some comments
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 07:57:25 +02:00
Travis Ralston
1e551585c0 Fix copy/paste fail 2021-04-08 09:33:39 -06:00
Travis Ralston
d89bbe2167 Move check to MatrixChat 2021-04-08 09:20:14 -06:00
Travis Ralston
4ef3d176d9 Add ability to hide post-login encryption setup with customisation point
This is primarily intended for alternative setup UI or where the customisations end up configuring encryption some other way. If used without respecting the warnings in the docs, the user could end up at a blank page - use with caution, and only as directed.
2021-04-07 19:16:29 -06:00
Felix Krull
10cf362da5 Fix viewing invitations when the inviter has no avatar set
Signed-off-by: Felix Krull <f_krull@gmx.de>
2021-04-06 13:55:22 +02:00
Šimon Brandner
d547cd5db8
Show drop file UI only if dragging a file
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-06 07:52:02 +02:00
Travis Ralston
4d72af7916
Merge pull request #5744 from panoschal/forgot-password-validation
Require strong password in forgot password form
2021-04-05 00:46:47 -06:00
Panagiotis
901d5a86d0 Merge branch 'develop' into forgot-password-validation 2021-04-01 12:39:25 +03:00
Panagiotis
d2f40a859b define PASSWORD_MIN_SCORE in one place and import from there 2021-04-01 12:30:49 +03:00
Aaron Raimist
0af52c931e
Merge branch 'develop' into only-member-warning
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-03-31 23:15:09 -05:00