Commit graph

32301 commits

Author SHA1 Message Date
Germain Souquet
8d95c012ef refactor _startDm invite flow to use async/await 2021-04-14 08:44:33 +01:00
Germain
d0dfc5df2b
Merge pull request #5849 from matrix-org/gsouquet-continue-previous-session
Move user to welcome_page if continuing with previous session
2021-04-14 08:05:34 +01:00
Travis Ralston
ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view
Improve image view
2021-04-13 19:01:27 -06:00
Travis Ralston
7bd5c19bd9
Merge pull request #5819 from matrix-org/travis/reset-passphrase
Add a button to reset personal encryption state during login
2021-04-13 12:20:37 -06:00
Travis Ralston
2ca79c8d31
Merge pull request #5850 from matrix-org/travis/fix-import
Fix js-sdk import in SlashCommands
2021-04-13 12:20:17 -06:00
Michael Telatynski
ae5b6ef831
Merge pull request #5854 from matrix-org/t3chguy/toml/hooks1
Fix useRoomPowerLevels hook
2021-04-13 11:29:02 +01:00
Michael Telatynski
1572a53af9 Fix useRoomPowerLevels hook 2021-04-13 10:39:09 +01:00
Michael Telatynski
db69166378
Merge pull request #5851 from matrix-org/t3chguy/fix/8665
Prevent state events being rendered with invalid state keys
2021-04-13 10:17:57 +01:00
Michael Telatynski
c25df51534 Prevent state events being rendered with invalid state keys 2021-04-13 09:40:44 +01:00
Michael Telatynski
e79ad34fbd EventTile make use of EventType enum
Removes m.room.encryption from non-state list as it makes no sense
2021-04-13 09:34:37 +01:00
Šimon Brandner
f9fde3670d
Set target to _blank
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:15:42 +02:00
Šimon Brandner
b1091a22a3
Don't render context menu button if mxEvent is missing
The button is useless and doesn't work if we're viewing an avatar

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:11:09 +02:00
Šimon Brandner
e1446f01e4
Make ImageView static
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:07:17 +02:00
Šimon Brandner
f1c80fcede
Call onCloseDialog straigh away
This avoids some delay in the dialog disappearing

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:04:50 +02:00
Travis Ralston
72a9bda3b7 One less try/catch 2021-04-12 14:57:21 -06:00
Travis Ralston
106de5f7ba Merge branch 'develop' into travis/reset-passphrase 2021-04-12 14:55:31 -06:00
Travis Ralston
9805170a6f
Update SlashCommands.tsx 2021-04-12 14:34:24 -06:00
Travis Ralston
ee9e1a72cb
Merge pull request #5838 from matrix-org/travis/add-acl-pl
Give server ACLs a name in 'roles & permissions' tab
2021-04-12 14:13:30 -06:00
Travis Ralston
cc4d145f14 Fix js-sdk import in SlashCommands
This is important because the `matrix-js-sdk` types are mismatched in some builds of Element
2021-04-12 14:07:17 -06:00
Germain Souquet
9081f80008 Move user to welcome_page if continuing with previous session 2021-04-12 17:01:27 +01:00
RiotRobot
f743007334 Reset matrix-js-sdk back to develop branch 2021-04-12 14:57:30 +01:00
RiotRobot
219de0e554 Resetting package fields for development 2021-04-12 14:56:58 +01:00
RiotRobot
a008c3d4e6 Merge branch 'master' into develop 2021-04-12 14:56:05 +01:00
RiotRobot
736507b812 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2021-04-12 14:51:22 +01:00
RiotRobot
51ea02cbab v3.18.0 2021-04-12 14:50:05 +01:00
RiotRobot
a3db08ccc0 Prepare changelog for v3.18.0 2021-04-12 14:50:04 +01:00
Michael Telatynski
3faf7280fe
Merge pull request #5845 from matrix-org/t3chguy/fix/16844
Don't hide notification badge on the home space button as it has no menu
2021-04-12 14:49:35 +01:00
Michael Telatynski
187eef4f2d
Merge pull request #5843 from matrix-org/t3chguy/fix/16896
User Info hide disambiguation as we always show MXID anyway
2021-04-12 14:49:19 +01:00
RiotRobot
f844961dc4 Upgrade matrix-js-sdk to 9.11.0 2021-04-12 14:45:16 +01:00
Michael Telatynski
4aef7a879a
Merge pull request #5846 from matrix-org/t3chguy/fix/16822
Improve kick state to not show if the target was not joined to begin with
2021-04-12 14:45:13 +01:00
Michael Telatynski
d9adf0ddd8
Merge pull request #5844 from matrix-org/t3chguy/fix/16877
Fix space store wrongly switching to a non-space filter
2021-04-12 14:44:46 +01:00
RiotRobot
8af81ea90f Revert "Change to inset"
Safari doesn't support `inset`.

This reverts commit b3706b682e.
2021-04-12 14:37:11 +01:00
J. Ryan Stinnett
0db9d71071
Merge pull request #5848 from matrix-org/jryans/reason-message-tweaks-release
[Release] Tweak appearance of invite reason
2021-04-12 14:23:01 +01:00
J. Ryan Stinnett
19d7ccac07 Rename toggle to view 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
b3706b682e Change to inset 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
32049f849c Remove blur effect 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
650421eefb Tweak appearance of invite reason
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
2021-04-12 13:56:09 +01:00
J. Ryan Stinnett
098a8711a7
Merge pull request #5847 from matrix-org/jryans/reason-message-tweaks
Tweak appearance of invite reason
2021-04-12 13:36:20 +01:00
J. Ryan Stinnett
8a1180bd50 Rename toggle to view 2021-04-12 13:19:13 +01:00
J. Ryan Stinnett
0e5e48584f Change to inset 2021-04-12 13:18:03 +01:00
J. Ryan Stinnett
7f796640f6 Remove blur effect 2021-04-12 13:11:27 +01:00
J. Ryan Stinnett
798a891d83 Tweak appearance of invite reason
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
2021-04-12 12:28:42 +01:00
Michael Telatynski
c1d88be260 Improve kick state to not show if the target was not joined to begin with 2021-04-12 12:13:28 +01:00
Michael Telatynski
a00af446b3 Don't hide notification badge on the home space button as it has no context menu 2021-04-12 11:55:47 +01:00
Michael Telatynski
bf33775a14 Fix space store wrongly switching to a non-space filter 2021-04-12 11:45:22 +01:00
Michael Telatynski
591c8ffd83 User Info hide disambiguation as we always show MXID anyway 2021-04-12 11:10:51 +01:00
Germain
853b218d8a
Merge pull request #5840 from matrix-org/gsouquet-update-inter-font
Update Inter font to v3.18
2021-04-12 09:58:22 +01:00
Germain Souquet
020cdc99a2 Update Inter font to v3.18 2021-04-09 17:41:54 +01:00
J. Ryan Stinnett
14f1e9f9a1
Merge pull request #5839 from matrix-org/jryans/enable-history-sharing
Enable sharing historical keys on invite
2021-04-09 17:28:57 +01:00
J. Ryan Stinnett
fc0ee15924 Update strings 2021-04-09 17:14:35 +01:00