5eed9f6cba
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227
2021-05-11 09:14:01 +01:00
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
392cde719c
Merge pull request #5940 from DantrazTrev/err
...
Fix the two todays problem
2021-05-10 20:15:06 -06:00
12657f0fbc
Merge branch 'develop' into edit-slashcommands
2021-05-10 20:09:33 -06:00
beef07bdef
Merge branch 'develop' into err
2021-05-10 20:08:19 -06:00
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js
2021-05-10 20:03:20 -06:00
379d19e2e0
Lint
2021-05-10 19:56:30 -06:00
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
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
c96bb374ea
Allow user to progress through space setup wizard using Enter/Return
2021-05-10 16:06:23 +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
3a75eb1226
Fix handling of enter/return in space creation menu
2021-05-10 14:39:10 +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
2ad0032f72
Added regression tests for Natural headers
2021-05-09 01:10:54 +05:30
c2ae6c279b
Merge pull request #5991 from robintown/forbid-encryption-redaction
...
Forbid redaction of encryption events
2021-05-07 19:19:55 -06:00
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
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
cea5421660
Merge branch 'err' of https://github.com/DantrazTrev/matrix-react-sdk into err
2021-05-07 19:16:35 +05:30
32edbc155f
Merge remote-tracking branch 'origin/develop' into err
2021-05-07 19:16:00 +05:30
d758d2b296
Merge branch 'matrix-org:develop' into err
2021-05-07 18:43:02 +05:30
b90a1de178
Merge branch 'develop' into err
2021-05-07 18:37:23 +05:30
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
90fa738734
Fix that one final pesky test
2021-05-07 11:22:10 +01:00
f0e61e6286
short circuit automatic switch to related space behaviour and fix tests
2021-05-07 11:08:18 +01:00
9d9dce7a91
update orphan room behaviour test to expect new home space behaviour
2021-05-07 10:48:55 +01:00
57be074811
i18n
2021-05-07 10:48:03 +01:00
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
4079b03ae0
Bring back filter all spaces behaviour
2021-05-07 10:39:35 +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
d1f23fb994
Partially added the tests [WIP]
2021-05-07 11:45:52 +05:30
Michael Telatynski