f3b4a21815
Remove Tinter reference
2021-06-30 09:02:00 +01:00
fdced3da1b
Remove reminescent references to the tinter
2021-06-30 08:09:55 +01:00
29904a7ffc
Merge pull request #6263 from matrix-org/t3chguy/ts/4
2021-06-29 22:31:16 +01:00
6250d9ba61
Merge branch 'develop' into t3chguy/ts/4
2021-06-29 22:24:47 +01:00
a59e94b907
delint
2021-06-29 22:21:05 +01:00
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
21b8c81eb8
Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2
2021-06-29 15:25:30 +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
db015519ed
Code style changes for FilePanel
2021-06-29 12:19:27 +01:00
56e05041fd
Import curly spaces
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-29 12:13:41 +01:00
652f57371a
Migrate FilePanel to TypeScript
2021-06-29 11:38:19 +01:00
14ef38e057
Merge pull request #6280 from robintown/group-acls
...
Group ACLs with MELS
2021-06-29 10:02:12 +01:00
0cc7f42f08
Merge pull request #6282 from matrix-org/t3chguy/fix/17738
...
Fix editState not getting passed through
2021-06-29 09:14:17 +01:00
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu
2021-06-29 08:18:07 +01:00
298bf30b18
Fix editState not getting passed through
2021-06-29 08:16:43 +01:00
734dbae248
Merge branch 'develop' into string-pl
2021-06-28 22:49:13 -05:00
434b313850
Merge branch 'develop' into string-pl
2021-06-28 22:13:51 -05:00
7a4ceec985
Restore clamped dimensions on voice recorder waveform
2021-06-28 21:02:42 -06:00
d6cf2346fe
Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240
2021-06-28 21:00:36 -06:00
964a97d59e
Merge remote-tracking branch 'origin/develop' into travis/new-audio
2021-06-28 20:52:44 -06: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
86228e08d8
Merge pull request #6278 from matrix-org/t3chguy/fix/17738
2021-06-28 23:24:31 +01: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
e43df0e3c6
delint
2021-06-28 16:11:38 +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
c708afe216
Pull scroll_to_bottom up a level similarly to prevent it firing on NotifPanel/FilePanel when sending a message
2021-06-28 16:03:52 +01:00
fd9e891647
Clean up by pulling listeners up to parent RoomView
2021-06-28 16:02:34 +01:00
83af38a85f
Fix multiple timeline panels handling composer and edit events
2021-06-28 15:56:37 +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
1c8e24023e
Fix space preview for when user cannot join the space
2021-06-25 11:00:27 +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
76caba0385
Restore mx_VoiceMessagePrimaryContainer class
2021-06-25 00:10:32 -06:00
d724af600f
Remove copy/paste fails
2021-06-24 20:41:00 -06:00
c5a72ee6ad
Fix arrow seeking
2021-06-24 20:26:40 -06:00
ebb6f1b602
Add seeking and notes about clock desync
2021-06-24 20:18:50 -06:00
231b40473b
fix the upset CI
2021-06-24 21:22:56 +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
9c752680ba
Tile styling and early behaviour
2021-06-24 13:56:11 -06:00
ffef2e58cb
Unify audio message types to new media body
2021-06-24 11:38:35 -06:00
dda60949c3
Introduce basic audio playback control
2021-06-24 11:38:35 -06:00
470778cbb8
Move voice message components to audio-generic directory
2021-06-24 11:38:35 -06:00
9f2eba4351
Fix class identifiers
2021-06-24 11:38:35 -06:00
50127da227
Replace MAudioBody with a voice message body as a template
2021-06-24 11:38:35 -06:00
8f6d31b73c
Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile
2021-06-24 17:05:16 +01:00
3d6c6cea89
Fix AutoHideScrollbar typing
2021-06-24 16:43:12 +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
bc786cdf4a
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1
2021-06-24 15:23:59 +01:00
8fb788ae56
Iterate EntityTile once more
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:39:51 +02:00
5b21cff240
Iterate MemberTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:38:21 +02:00
1b64cd0c88
Iterate PresenceLabel
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:36:22 +02:00
298e505381
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:29:24 +02:00
f965d449b8
Merge pull request #6249 from SimonBrandner/ts/member-list
2021-06-24 13:25:59 +01:00
d2d8cb3c24
Think about what you copy-paste, Simon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:15:44 +02:00
a774aed365
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:07:43 +02:00
6333d4aa36
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:02:06 +02:00
01aadb460d
Fix cyclic imports
2021-06-24 11:12:32 +01:00
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
21caa6df12
move live recording logic down the component tree
2021-06-24 09:58:11 +01:00
56467485f5
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
2021-06-24 09:42:47 +01:00
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
7b7ad76fe4
Merge branch 'develop' into string-pl
2021-06-23 17:54:42 -05:00
0e51fcc761
Fix pinning event in a room which hasn't had events pinned in before
2021-06-23 21:12:25 +01:00
e25940cbdd
Convert PresenceLabel to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:11 +02:00
87d27593de
Convert MemberTile to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:11 +02:00
d5acfc6cf4
Convert EntityTile to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:06 +02:00
9d07519214
Merge remote-tracking branch 'nordeck/nic/feat/DisableModalWidgetButtons' into develop
2021-06-23 11:21:19 -06:00
99c442cea7
Convert MemberList to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:06 +02:00
a8dfc4488f
Convert more of js-sdk crypto and fix underscored field accesses
2021-06-23 14:47:24 +01:00
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad
...
Dial Pad UI bug fixes
2021-06-23 11:41:41 +01:00
1fe1288427
Merge pull request #6247 from SimonBrandner/feature/media-device-handler
2021-06-23 11:10:09 +01:00
a6367c0796
Reintroduce LiveRecording components for maintenance reasons
2021-06-23 09:33:38 +01:00
58151d71c5
Handle mid-call output changes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:09:53 +02:00
35b8f79fbd
Merge pull request #6228 from matrix-org/gsouquet/fix-17673
2021-06-23 09:08:43 +01:00
9bceb40820
CallMediaHandler -> MediaDeviceHandler
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
38d0ab3c44
Do not honor string power levels
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-22 22:35:59 -05:00
759a4e796f
Merge pull request #6234 from SimonBrandner/fix/room-dir-click/13751
...
Improve room directory click behaviour
2021-06-22 19:44:20 -06:00
d5581f00cc
Merge pull request #6239 from matrix-org/t3chguy/fix/17605
2021-06-22 22:56:49 +01:00
50a5c03730
Merge pull request #6151 from matrix-org/t3chguy/fix/17244
2021-06-22 22:52:33 +01:00
9f20d6661d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
2021-06-22 22:49:28 +01:00
e4542e13d9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
2021-06-22 22:42:59 +01:00
24b03366a8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17368
2021-06-22 22:40:59 +01:00
bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7
2021-06-22 22:34:15 +01:00
ffaa19ef2c
fix typing
2021-06-22 22:27:12 +01:00
9dc8493a5c
Hide communities invites and the community autocompleter when Spaces Beta is enabled
2021-06-22 22:07:42 +01:00
1286be1ffb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
5dc542f189
Iterate PR
2021-06-22 22:01:18 +01:00
c316eb841a
Merge pull request #6179 from aaronraimist/open-local-addresses
...
Open local addresses section by default when there are no existing local addresses
2021-06-22 14:48:02 -06:00
6e3c647109
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
...
Conflicts:
package.json
src/components/views/spaces/SpacePanel.tsx
src/i18n/strings/en_EN.json
src/stores/SpaceStore.tsx
yarn.lock
2021-06-22 21:15:53 +01:00
1180741cc2
Merge pull request #6000 from robintown/event-tile-preview-fixes
...
EventTilePreview fixes
2021-06-22 13:57:07 -06:00
cecf0ce299
Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
2021-06-22 20:41:26 +01:00
6fd1dc7d18
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7
2021-06-22 18:09:24 +01:00
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665
2021-06-22 17:46:57 +01:00
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
59258585b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-22 17:28:19 +01:00
a839d0f396
More typescript conversion
2021-06-22 17:23:13 +01:00
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051
2021-06-22 15:07:04 +01:00
ded738ce8c
Add spaces around curlies
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-22 14:57:44 +01:00
a85c6c67e0
Make waveform update match the screen refresh rate
2021-06-22 12:28:23 +01:00
27d255f30e
Reduce audio waveform layout trashing
2021-06-22 12:27:54 +01:00
1f0fdb95cd
Improve accessibility of subspaces in the space panel
2021-06-22 11:59:04 +01:00
66b3feb802
Fix keyboard accessibility of the space panel
2021-06-22 11:50:00 +01:00
dd58c9f413
Add TruncatedList in AddExistingToSpaceDialog
2021-06-22 10:52:33 +01:00
9dee75a7b1
Merge pull request #6229 from matrix-org/gsouquet/fix-17678
2021-06-22 10:27:50 +01:00
3d3c428455
Fix DesktopBuildsNotice return type
2021-06-22 10:26:49 +01:00
db9ffe9b3e
Fix AccessibleButton label for VerificationRequest
2021-06-22 10:18:09 +01:00
e9d87478e2
Spaces before/after curlies
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-22 10:06:31 +01:00
066ef18db2
Replace onClick by onMouseDown
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:24:42 +02:00
a59deeb491
Add onClick handlers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:16:45 +02:00
de40657194
Don't show room if we don't click on buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:12:41 +02:00
845bb95887
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-21 20:46:28 +01:00
6b16b9aca6
Merge pull request #6232 from SimonBrandner/fix/quote/17715
...
Fix quote button
2021-06-21 20:29:54 +01:00
903f898bee
Remove ComposerInsertPayload as this is a JS file
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 18:28:30 +02:00
88d25ad6af
Fix typo in default import name
2021-06-21 15:44:09 +01:00
7825c30bf7
Improve event index initialisation failure message in search bar for supported platforms
2021-06-21 15:41:47 +01:00
7f635c68c5
Migrate SearchBar to TypeScript
2021-06-21 14:50:21 +01:00
adb42b7927
Deprecate FormButton to use AccessibleButton everywhere
2021-06-21 14:16:37 +01:00
ca123d3c4d
Migrate MKeyVerificationRequest to TypeScript
2021-06-21 14:05:56 +01:00
d2595dcd61
use TruncatedList to improve ForwardDialog rendering time
2021-06-21 12:29:59 +01:00
9756a99220
Migrate TruncatedList to TypeScript
2021-06-21 12:14:30 +01:00
e79b7d7adb
Fix View Source accessing renamed private field on MatrixEvent
2021-06-21 09:45:22 +01:00
b380e43e4f
Merge pull request #6219 from matrix-org/t3chguy/ts/6
...
Fix ConfirmUserActionDialog returning an input field rather than text
2021-06-21 08:53:43 +01:00
9344adb2d2
Revert "Partially restore immutable event objects at the rendering layer"
2021-06-19 13:38:19 -06:00
c0f34c9a01
Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648
2021-06-19 17:24:30 +02:00
2c5ddea1d9
Fix ConfirmUserActionDialog returning an input field rather than text
2021-06-19 15:57:07 +01:00
a2a5158411
Fix View Source accessing renamed private field on MatrixEvent
2021-06-19 15:37:48 +01:00
3b1ee979fd
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-06-19 12:27:33 +02:00
c8cf23b87c
Implement LERP
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 12:21:24 +02:00
61929e3fc2
Implement snapping
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 09:34:45 +02:00
273fb75fc9
Merge branch 'develop' into travis/event-fixes
2021-06-18 11:26:51 -06:00
946317ddf8
Move moving out of state
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 19:11:48 +02:00
6fb3bdbcd0
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-06-18 19:02:56 +02:00
77a4d345bd
Submitting abuse reports to moderators ( #6213 )
...
This patch is part of MSC3215. It implements `feature_report_to_moderator`
to let end-users send report to room moderators instead of homeserver
administrators.
This only works if the room has been setup for moderation, something that
does not have a UX yet.
Signed-off-by: David Teller <davidt@element.io>
2021-06-18 18:09:02 +02:00
ab94b284b8
Updates around the use of private fields out of class
2021-06-18 16:29:10 +01:00
bc74a7366b
Merge pull request #6197 from matrix-org/travis/voice-messages/fix-msc-number
...
Update MSC number references for voice messages
2021-06-18 09:23:28 -06:00
233e2aa425
Fix bugs identified by the typescripting
2021-06-18 16:22:31 +01:00
0ae4e7b11d
Fix typescript types
2021-06-18 16:21:46 +01:00
3b7c92fd9e
Use new js-sdk types properly
2021-06-18 16:18:42 +01:00
058cbbbd0c
Fix imports
2021-06-18 16:13:55 +01:00
9cce5ef10f
Consolidate types with js-sdk changes
2021-06-18 15:31:12 +01:00
538165d515
Fix phase enum usage in JS modules as well
...
https://github.com/matrix-org/matrix-react-sdk/pull/6185 converted
`SetupEncryptionStore` to TS, including moving the phase states to an enum. The
calling JS modules were forgotten, so they got a bit confused.
Fixes https://github.com/vector-im/element-web/issues/17689
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6185
2021-06-18 14:05:12 +01:00
fcda0604e0
Fix RoomMember import
2021-06-18 12:48:31 +01:00
d22617c422
More specific type definition and adhering to code style better
2021-06-18 12:44:15 +01:00
3f1ca970d6
Merge branch 'develop' into gsouquet/dialogs-ts-migration
2021-06-18 12:27:00 +01:00
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5
2021-06-18 09:49:03 +01:00
d9caa3533b
Merge pull request #5858 from matrix-org/t3chguy/fix/12740
2021-06-18 08:22:21 +01:00
98e0200b4a
Function name
2021-06-17 14:21:50 -06:00
a687391b98
Switch order
2021-06-17 14:21:01 -06:00
1259247380
Merge branch 'matrix-org:develop' into Bubble-bericht
2021-06-18 00:16:16 +05:30
1394e5b0a4
Updated changes for the tile
...
Signed-off-by: Ayush PS <ayushpratap16@gmail.com>
2021-06-18 00:12:39 +05:30
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591
2021-06-17 16:41:00 +01:00
7d90612371
Iterate PR
2021-06-17 16:22:40 +01:00
35e68b8aa5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
2021-06-17 15:45:32 +01:00
f38cd38bd3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
...
Conflicts:
src/components/structures/TimelinePanel.js
src/components/views/context_menus/MessageContextMenu.js
src/components/views/right_panel/UserInfo.tsx
src/dispatcher/actions.ts
2021-06-17 15:31:06 +01:00
ab3ccecc96
Use UIStore
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 15:52:55 +02:00
3e38d92fa4
Fix up some more type defs
2021-06-17 14:49:27 +01:00
d89392a1d9
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-06-17 15:41:19 +02:00
02e72d8b04
Fix more type definitions
2021-06-17 14:24:53 +01:00
f929d2ee5f
Typescript fixes due to MatrixEvent being TSified
2021-06-17 14:06:03 +01:00
6e827ad4c9
Merge pull request #6204 from robintown/forward-dialog-display-name
...
Fix forward dialog message preview display names
2021-06-17 10:10:54 +01:00
1a08af8ccf
remove stray bullet point in reply preview
2021-06-17 08:45:09 +01:00
2750d64495
Merge branch 'develop' into event-tile-preview-fixes
2021-06-16 18:27:10 -04:00
79bf7bee56
Fix EventTilePreview display names
...
Because of 91df392a2a
2021-06-16 18:23:44 -04:00
Germain Souquet