RiotRobot
657481156f
Prepare changelog for v3.21.0-rc.1
2021-05-11 16:36:52 +01:00
RiotRobot
965b0ab58d
Upgrade matrix-js-sdk to 11.0.0-rc.1
2021-05-11 16:28:00 +01:00
Michael Telatynski
6efc162ce9
Merge pull request #5978 from matrix-org/t3chguy/fix/17179
...
Add disclaimer about subspaces being experimental in add existing dialog
2021-05-11 14:36:12 +01:00
Michael Telatynski
6ece4ef2ab
i18n
2021-05-11 14:08:09 +01:00
Michael Telatynski
df72fbb22a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179
...
Conflicts:
src/i18n/strings/en_EN.json
2021-05-11 14:07:47 +01:00
Michael Telatynski
c4118f1059
Merge pull request #5933 from matrix-org/t3chguy/fix/17021
...
Spaces Beta release
2021-05-11 13:58:50 +01:00
Michael Telatynski
2e19c7fd24
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
2021-05-11 13:40:28 +01:00
Michael Telatynski
f0342b0ea7
Merge pull request #6009 from matrix-org/t3chguy/fix/15359
...
Improve permissions error when adding new server to room directory
2021-05-11 12:36:40 +01:00
Michael Telatynski
b0f23aa65b
Improve permissions error when adding new server to room directory
2021-05-11 12:20:18 +01:00
Michael Telatynski
2b2e74b65e
Merge pull request #6006 from matrix-org/t3chguy/fix/17227
...
Allow user to progress through space creation & setup using Enter
2021-05-11 12:02:14 +01:00
Michael Telatynski
23001cb10d
remove unused import
2021-05-11 10:11:51 +01:00
Michael Telatynski
de04d82395
Switch to using forms for implicit submission
2021-05-11 10:01:40 +01:00
J. Ryan Stinnett
f74d4769ca
Merge pull request #6008 from matrix-org/jryans/upgrade-sanitize-types
...
Upgrade sanitize types
2021-05-11 09:49:22 +01:00
J. Ryan Stinnett
49f1dd37f2
Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types
2021-05-11 09:42:58 +01:00
J. Ryan Stinnett
f3f6bf7c8f
Merge pull request #6007 from matrix-org/jryans/cheerio-upgrade
...
Upgrade `cheerio` and resolve type errors
2021-05-11 09:35:48 +01:00
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
Travis Ralston
7ac12d14af
Merge pull request #5865 from jaiwanth-v/edit-slashcommands
...
Add slash commands support to edit message composer
2021-05-10 20:16:44 -06:00
Travis Ralston
392cde719c
Merge pull request #5940 from DantrazTrev/err
...
Fix the two todays problem
2021-05-10 20:15:06 -06:00
Travis Ralston
12657f0fbc
Merge branch 'develop' into edit-slashcommands
2021-05-10 20:09:33 -06:00
Travis Ralston
beef07bdef
Merge branch 'develop' into err
2021-05-10 20:08:19 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js
2021-05-10 20:03:20 -06:00
Travis Ralston
379d19e2e0
Lint
2021-05-10 19:56:30 -06:00
J. Ryan Stinnett
3e68d73597
Upgrade sanitize types
2021-05-10 17:43:10 +01:00
J. Ryan Stinnett
7821e00bc6
Revert to internal option
2021-05-10 17:36:33 +01:00
J. Ryan Stinnett
9c8e89ff79
Fix importing
2021-05-10 16:55:27 +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
95b43d1284
Merge pull request #5985 from aaronraimist/blank-device-name
...
Show device ID in UserInfo when there is no device name
2021-05-10 16:19:56 +01:00
J. Ryan Stinnett
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
Michael Telatynski
c96bb374ea
Allow user to progress through space setup wizard using Enter/Return
2021-05-10 16:06:23 +01:00
RiotRobot
1b372b17e0
Reset matrix-js-sdk back to develop branch
2021-05-10 15:23:03 +01:00
RiotRobot
82642f17fd
Resetting package fields for development
2021-05-10 15:22:30 +01:00
RiotRobot
3e534b5d30
Merge branch 'master' into develop
2021-05-10 15:22:12 +01:00
J. Ryan Stinnett
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
RiotRobot
f68013524c
v3.20.0
2021-05-10 15:02:08 +01:00
RiotRobot
a1572e9ea3
Prepare changelog for v3.20.0
2021-05-10 15:02:07 +01:00
J. Ryan Stinnett
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
RiotRobot
a11c3a22c9
Upgrade matrix-js-sdk to 10.1.0
2021-05-10 14:55:31 +01:00
J. Ryan Stinnett
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
Michael Telatynski
3a75eb1226
Fix handling of enter/return in space creation menu
2021-05-10 14:39:10 +01:00
J. Ryan Stinnett
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
Šimon Brandner
3b97e52246
Simplifie code a bit
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:08:32 +01:00
Šimon Brandner
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
dependabot[bot]
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
Ayush PS
2ad0032f72
Added regression tests for Natural headers
2021-05-09 01:10:54 +05:30
Travis Ralston
c2ae6c279b
Merge pull request #5991 from robintown/forbid-encryption-redaction
...
Forbid redaction of encryption events
2021-05-07 19:19:55 -06:00
Aaron Raimist
fa307ee14c
Update src/components/views/right_panel/UserInfo.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-05-07 18:41:47 -05:00
Robin Townsend
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
Travis Ralston
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
