Commit graph

32177 commits

Author SHA1 Message Date
Germain Souquet
e520f7462c Fix emotes left spacing in replies for the IRC layout 2021-04-13 11:21:47 +01:00
Germain Souquet
2aebf103ed always display message timestamp in IRC layout replies 2021-04-13 11:20:53 +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
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
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
J. Ryan Stinnett
bef5c6593e Remove key sharing feature flag 2021-04-09 17:05:55 +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
J. Ryan Stinnett
7b0ab4a059 Enable sharing historical keys on invite
After discussion with Product, we're ready to enable this key sharing work from
https://github.com/matrix-org/matrix-react-sdk/pull/5763 (based on
https://github.com/matrix-org/matrix-doc/pull/3061).
2021-04-09 12:51:23 +01:00
J. Ryan Stinnett
ae2082b97b
Merge pull request #5515 from rda0/maths-parsing-latex
Use LaTeX and TeX delimiters by default
2021-04-09 11:07:19 +01:00
J. Ryan Stinnett
cf06948da8
Merge pull request #5837 from SimonBrandner/clone-correct-fork-netlify
Clone author's deps fork for Netlify previews
2021-04-09 10:31:27 +01: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
3c25979520
Merge pull request #5824 from robintown/ignore-punctuation
Ignore punctuation when filtering rooms
2021-04-08 20:10:08 -06:00
Travis Ralston
073c05543c Give server ACLs a name in 'roles & permissions' tab
The default power levels event includes them, so this helps avoid them showing up as "Send m.room.server_acl events".
2021-04-08 19:20:08 -06:00
Travis Ralston
28d12016b7 Convert to using EventType enum 2021-04-08 19:18:30 -06:00
Šimon Brandner
a9853c4f8f
Clone author's deps fork for Netlify previews
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-08 19:09:00 +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
Sven Mäder
31e85ec580 Use cheerio api for code replacements 2021-04-08 11:38:05 +02:00