6ece4ef2ab
i18n
2021-05-11 14:08:09 +01:00
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
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
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
b0f23aa65b
Improve permissions error when adding new server to room directory
2021-05-11 12:20:18 +01:00
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
23001cb10d
remove unused import
2021-05-11 10:11:51 +01:00
de04d82395
Switch to using forms for implicit submission
2021-05-11 10:01:40 +01:00
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
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
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
7821e00bc6
Revert to internal option
2021-05-10 17:36:33 +01:00
9c8e89ff79
Fix importing
2021-05-10 16:55:27 +01: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
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
c96bb374ea
Allow user to progress through space setup wizard using Enter/Return
2021-05-10 16:06:23 +01:00
3a75eb1226
Fix handling of enter/return in space creation menu
2021-05-10 14:39:10 +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
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
32edbc155f
Merge remote-tracking branch 'origin/develop' into err
2021-05-07 19:16:00 +05:30
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
cb13200c2d
last minute copy tweak
2021-05-07 11:56:41 +01:00
1fc591628a
i18n
2021-05-07 11:51:37 +01:00
a8c4aabb52
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +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
f0e61e6286
short circuit automatic switch to related space behaviour and fix tests
2021-05-07 11:08:18 +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
db5c0012c2
Add dev dependency for parse5 typings
2021-05-07 10:11:56 +01:00
1f2895dbe9
Merge branch 'develop' into blank-device-name
2021-05-06 20:19:49 -05:00
5d7535738a
Show device ID in UserInfo when there is no device name
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-05-06 20:01:53 -05: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
90538c95aa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
2021-05-06 08:05:14 +01:00
Michael Telatynski