8f4879ea96
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/ScrollPanel.tsx
src/components/structures/TimelinePanel.tsx
src/components/views/elements/ErrorBoundary.tsx
src/components/views/elements/EventListSummary.tsx
src/components/views/messages/TileErrorBoundary.tsx
2021-06-29 22:14:40 +01:00
782e793925
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
2021-06-29 15:27:24 +01:00
623317cd47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/TimelinePanel.tsx
2021-06-29 15:22:54 +01:00
640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter
...
Deprecate Tinter and TintableSVG
2021-06-29 15:22:48 +01:00
0551becafd
Fix long lines
2021-06-29 13:42:51 +01:00
fe123fc605
Rework lint comments
2021-06-29 13:35:43 +01:00
bbdd93f592
Auto-fix more errors
2021-06-29 13:26:09 +01:00
b501665971
Fix parsing errors
2021-06-29 13:23:13 +01:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
4c5720a573
Update lint comments
2021-06-29 12:51:13 +01:00
14ef38e057
Merge pull request #6280 from robintown/group-acls
...
Group ACLs with MELS
2021-06-29 10:02:12 +01:00
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu
2021-06-29 08:18:07 +01:00
b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf
...
Improve audio recording performance
2021-06-28 20:49:21 -06:00
e519e704e9
Apply suggestions from code review
2021-06-28 20:40:11 -06:00
a11193e243
Group ACLs with MELS
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-06-28 12:36:40 -04:00
d3bc7fe806
remove list keys
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-28 18:29:32 +02:00
e685f1239d
use null vars for context menu lists
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-28 18:29:32 +02:00
6607294573
Deprecate Tinter and TintableSVG
2021-06-28 17:13:23 +01:00
a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht
...
Removes the override on the Bubble Container
2021-06-28 16:23:40 +01:00
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648
...
Fix IRC layout regressions
2021-06-28 16:10:02 +01:00
6cb86057c5
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
2021-06-28 09:29:11 +01:00
652e06a7b1
remove cancelAnimationFrame complexity and rely on MarkedExecution class
2021-06-28 09:24:35 +01:00
a576362c74
Merge pull request #6275 from matrix-org/gsouquet/toast-button-kind
2021-06-28 09:10:09 +01:00
d669f55b60
Make toast dismiss button less prominent
2021-06-28 08:52:15 +01:00
1874f3b963
Merge pull request #6269 from matrix-org/travis/encrypt-voice
...
Encrypt the voice message file if needed
2021-06-28 01:30:16 -06:00
18b470820d
Merge pull request #6270 from SimonBrandner/fix/presence/17786
...
Fix hyper-precise presence
2021-06-26 18:47:17 +01:00
3c6612df93
Fix hyper-precise presence
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-26 07:53:42 +02:00
b5bb767b8f
Appease the linter
2021-06-25 14:11:50 -06:00
cb0d2a2c4f
Encrypt the voice message file if needed
...
Fixes https://github.com/vector-im/element-web/issues/17729
"oops, should have done that"
2021-06-25 13:54:05 -06:00
4e6260e617
delint
2021-06-25 20:01:03 +01:00
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770
2021-06-25 15:43:33 +01:00
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click
2021-06-25 14:42:18 +01:00
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu ( #6237 )
...
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
2021-06-25 11:45:15 +01:00
5facee56b0
Fix space settings using join rule private instead of invite
2021-06-25 10:41:45 +01:00
2b9e2e2e85
Fix private space creation setting an alias anyway
2021-06-25 10:41:13 +01:00
086042f078
update message context texts and icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-24 22:20:53 +02:00
9a1be63baa
reorder message context menu items
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-24 22:20:52 +02:00
c2d51a115b
tweak message context labels
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-24 22:20:52 +02:00
ffca23344a
tweak context menu order
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-24 22:20:51 +02:00
62efea7e19
add message context menu icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-24 22:20:50 +02:00
e4eeafd485
migrate the message context menu to IconizedContextMenu
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-24 22:20:49 +02:00
8f6d31b73c
Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile
2021-06-24 17:05:16 +01:00
c5a1da49ce
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/AutoHideScrollbar.tsx
2021-06-24 16:42:03 +01:00
d83a92959b
Fix UserInfo not working when rendered without a room
2021-06-24 16:30:40 +01:00
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 16:59:18 +02:00
dc2f71bee6
Even more fixes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:55:44 +02:00
b065f6d1a4
Remove sdk...
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:48:36 +02:00
f0dbc974fa
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile
2021-06-24 16:44:13 +02:00
c0a1127cb7
Fix PowerStatus
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:43:11 +02:00
f08b92309f
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-24 16:35:33 +02:00
Michael Telatynski