9c8e89ff79
Fix importing
2021-05-10 16:55:27 +01:00
f41fc7e46c
Upgrade `cheerio` and resolve type errors
...
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
2021-05-10 16:10:39 +01:00
1b372b17e0
Reset matrix-js-sdk back to develop branch
2021-05-10 15:23:03 +01:00
82642f17fd
Resetting package fields for development
2021-05-10 15:22:30 +01:00
3e534b5d30
Merge branch 'master' into develop
2021-05-10 15:22:12 +01:00
03b3456c89
Merge pull request #6005 from matrix-org/jryans/sanitize-upgrade
...
Switch back to release version of `sanitize-html`
2021-05-10 15:15:47 +01:00
f68013524c
v3.20.0
2021-05-10 15:02:08 +01:00
a1572e9ea3
Prepare changelog for v3.20.0
2021-05-10 15:02:07 +01:00
7f4c525d62
Switch back to release version of `sanitize-html`
...
The limit depth option has been available in a released version for a while now.
2021-05-10 14:57:35 +01:00
a11c3a22c9
Upgrade matrix-js-sdk to 10.1.0
2021-05-10 14:55:31 +01:00
01a3c42d16
Merge pull request #5998 from matrix-org/dependabot/npm_and_yarn/hosted-git-info-2.8.9
...
Bump hosted-git-info from 2.8.8 to 2.8.9
2021-05-10 14:50:50 +01:00
15035bd670
Merge pull request #6004 from matrix-org/jryans/image-metadata-release
...
[Release] Don't use the event's metadata to calc the scale of an image
2021-05-10 13:12:04 +01:00
3b97e52246
Simplifie code a bit
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:08:32 +01:00
9a5a3b30ca
Don't try to use the event's metadata to calc the scale
...
That has lead to https://github.com/vector-im/element-web/issues/17184
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:08:32 +01:00
4311d91372
Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta
...
Don't use the event's metadata to calc the scale of an image
2021-05-10 13:06:08 +01:00
45acf70b00
Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype
...
Adjust MIME type of upload confirmation if needed
2021-05-10 10:21:35 +01:00
70b2f841d9
Bump hosted-git-info from 2.8.8 to 2.8.9
...
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info ) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases )
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md )
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-09 00:09:15 +00:00
c2ae6c279b
Merge pull request #5991 from robintown/forbid-encryption-redaction
...
Forbid redaction of encryption events
2021-05-07 19:19:55 -06:00
119c14c3f9
Forbid redaction of encryption events
...
Redacting m.room.encryption events will leave the room in a broken
state, and so we shouldn't allow the user to do this.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-07 12:49:37 -04:00
04d566e247
Merge pull request #5988 from matrix-org/travis/voicemessages/glitch-1
...
Fix voice message playback being squished up against send button
2021-05-07 08:00:45 -06:00
1e6c6e9d80
Merge pull request #5983 from matrix-org/t3chguy/fix/16994
...
Improve style of notification badges on the space panel
2021-05-07 13:49:41 +01:00
74bcb921ff
Merge pull request #5990 from matrix-org/t3chguy/ts/parse5
...
Add dev dependency for parse5 typings
2021-05-07 13:49:13 +01:00
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
237399f13e
fix button height inconsistency between Chrome & FF
2021-05-07 11:40:39 +01:00
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
9205b74641
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
2021-05-07 10:25:06 +01:00
03ca7e0107
move notification dot on the space panel up by 1px
2021-05-07 10:22:56 +01:00
db5c0012c2
Add dev dependency for parse5 typings
2021-05-07 10:11:56 +01:00
d270e232fd
Fix voice message playback being squished up against send button
...
In the style shuffle of https://github.com/matrix-org/matrix-react-sdk/pull/5970 the playback bar got squished up against the send button. This just fixes the selector to actually hit the composer-based recorder all the time, not just when recording.
2021-05-06 21:41:04 -06:00
b5c25498c8
Merge pull request #5986 from matrix-org/dependabot/npm_and_yarn/lodash-4.17.21
...
Bump lodash from 4.17.20 to 4.17.21
2021-05-06 19:14:50 -06:00
340b6bb224
Merge pull request #5987 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/lodash-4.17.21
...
Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests
2021-05-06 19:14:41 -06:00
137189932e
Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 01:13:47 +00:00
b37985a5d2
Bump lodash from 4.17.20 to 4.17.21
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 01:13:44 +00:00
03ad901453
Merge pull request #5984 from matrix-org/dependabot/npm_and_yarn/ua-parser-js-0.7.28
...
Bump ua-parser-js from 0.7.23 to 0.7.28
2021-05-06 19:13:01 -06:00
d924c7a186
Bump ua-parser-js from 0.7.23 to 0.7.28
...
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js ) from 0.7.23 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases )
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.23...0.7.28 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 22:22:53 +00:00
d531e3d59f
Merge pull request #5971 from matrix-org/travis/files/visual
...
Update visual style of plain files in the timeline
2021-05-06 10:57:22 -06:00
d2fc1c42b0
Improve style of notification badges on the space panel
2021-05-06 15:58:22 +01:00
7ad270928a
Simplifie code a bit
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-06 16:41:09 +02:00
bb9803a94e
Don't try to use the event's metadata to calc the scale
...
That has lead to https://github.com/vector-im/element-web/issues/17184
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-06 16:40:33 +02:00
06a9577858
Merge remote-tracking branch 'origin/develop' into jryans/upload-preview-mimetype
2021-05-06 14:45:48 +01:00
dc50d27985
Adjust MIME type of upload confirmation if needed
...
This filters the MIME type of uploaded files to ensure we display safely.
2021-05-06 14:39:44 +01:00
437f13cf76
Convert UploadConfirmDialog to TSX
2021-05-06 14:11:34 +01:00
6e0c7611c3
Extract blob-safe MIME types
2021-05-06 13:53:27 +01:00
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
d47eecbd24
Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent
2021-05-06 13:05:58 +01:00
683aec1066
Merge pull request #5833 from SimonBrandner/feed
...
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
9518e4d415
Guard all isSpaceRoom calls behind the labs flag
2021-05-05 23:59:07 +01:00
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
202dfd4521
Merge pull request #5976 from matrix-org/t3chguy/fix/17153
...
Improve performance of search all spaces and space switching
2021-05-05 22:13:05 +01:00
2236ec3eff
Move and update variable usage
2021-05-05 14:00:56 -06:00
J. Ryan Stinnett