Šimon Brandner
3b1ee979fd
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-06-19 12:27:33 +02:00
Šimon Brandner
c8cf23b87c
Implement LERP
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 12:21:24 +02:00
Šimon Brandner
39ca2844bd
Add AnimationUtils
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 10:10:27 +02:00
Šimon Brandner
61929e3fc2
Implement snapping
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 09:34:45 +02:00
Germain Souquet
6271c5c3d8
first iteration for message bubble layout
2021-06-18 18:59:22 +01:00
Travis Ralston
273fb75fc9
Merge branch 'develop' into travis/event-fixes
2021-06-18 11:26:51 -06:00
Šimon Brandner
946317ddf8
Move moving out of state
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 19:11:48 +02:00
Šimon Brandner
6fb3bdbcd0
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-06-18 19:02:56 +02:00
David Teller
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
Michael Telatynski
ab94b284b8
Updates around the use of private fields out of class
2021-06-18 16:29:10 +01:00
Travis Ralston
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
Michael Telatynski
233e2aa425
Fix bugs identified by the typescripting
2021-06-18 16:22:31 +01:00
Michael Telatynski
0ae4e7b11d
Fix typescript types
2021-06-18 16:21:46 +01:00
Michael Telatynski
3b7c92fd9e
Use new js-sdk types properly
2021-06-18 16:18:42 +01:00
Michael Telatynski
058cbbbd0c
Fix imports
2021-06-18 16:13:55 +01:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
Michael Telatynski
9cce5ef10f
Consolidate types with js-sdk changes
2021-06-18 15:31:12 +01:00
Robin Townsend
d08f8087c6
Merge branch 'matrix-org:develop' into text-for-event-perf
2021-06-18 10:29:41 -04:00
J. Ryan Stinnett
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
Germain Souquet
fcda0604e0
Fix RoomMember import
2021-06-18 12:48:31 +01:00
Germain Souquet
d22617c422
More specific type definition and adhering to code style better
2021-06-18 12:44:15 +01:00
Germain Souquet
3f1ca970d6
Merge branch 'develop' into gsouquet/dialogs-ts-migration
2021-06-18 12:27:00 +01:00
Michael Telatynski
566b8af2a4
Initial support for MSC3083 via MSC3244
2021-06-18 12:18:23 +01:00
Michael Telatynski
e508ff003b
Clean up typing to Security Room Settings
2021-06-18 11:48:08 +01:00
Michael Telatynski
18cafeb221
Add ability to disable entire StyledRadioGroup
2021-06-18 11:40:02 +01:00
Michael Telatynski
56fe7f8763
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
2021-06-18 10:05:58 +01:00
Michael Telatynski
bf66a72054
Move JoinRule, GuestAccess, HistoryVisibility enums into the js-sdk
2021-06-18 10:05:46 +01:00
Michael Telatynski
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5
2021-06-18 09:49:03 +01:00
Michael Telatynski
d9caa3533b
Merge pull request #5858 from matrix-org/t3chguy/fix/12740
2021-06-18 08:22:21 +01:00
Travis Ralston
98e0200b4a
Function name
2021-06-17 14:21:50 -06:00
Travis Ralston
a687391b98
Switch order
2021-06-17 14:21:01 -06:00
Ayush Pratap Singh
1259247380
Merge branch 'matrix-org:develop' into Bubble-bericht
2021-06-18 00:16:16 +05:30
Ayush PS
1394e5b0a4
Updated changes for the tile
...
Signed-off-by: Ayush PS <ayushpratap16@gmail.com>
2021-06-18 00:12:39 +05:30
Šimon Brandner
512c054656
Add call type icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 17:55:18 +02:00
Germain
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591
2021-06-17 16:41:00 +01:00
Michael Telatynski
7d90612371
Iterate PR
2021-06-17 16:22:40 +01:00
Michael Telatynski
35e68b8aa5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
2021-06-17 15:45:32 +01:00
Šimon Brandner
7b6c3aec63
Change some styling to better match the designs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 16:33:00 +02:00
Michael Telatynski
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
Michael Telatynski
2e73647a85
Fix tests by updating private field names and spies
2021-06-17 15:18:52 +01:00
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-17 15:53:25 +02:00
Šimon Brandner
ab3ccecc96
Use UIStore
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 15:52:55 +02:00
Robin Townsend
e4250e254c
Propertly thread showHiddenEventsInTimeline through groupers
2021-06-17 09:52:15 -04:00
Michael Telatynski
3e38d92fa4
Fix up some more type defs
2021-06-17 14:49:27 +01:00
Šimon Brandner
d89392a1d9
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-06-17 15:41:19 +02:00
Michael Telatynski
02e72d8b04
Fix more type definitions
2021-06-17 14:24:53 +01:00
Germain Souquet
ae5cd9d7ac
Add new layout switcher UI
...
Co-authored-by: Quirin Götz <codeworks@supercable.onl>
2021-06-17 14:11:44 +01:00
Michael Telatynski
f929d2ee5f
Typescript fixes due to MatrixEvent being TSified
2021-06-17 14:06:03 +01:00
Robin Townsend
9e2ab0d432
Fix import whitespace in TextForEvent
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-17 07:35:40 -04:00
Michael Telatynski
cce4ccb157
Fix types in SlashCommands which assumed something was a promise but it wasn't
2021-06-17 11:37:06 +01:00