Travis Ralston
d6cf2346fe
Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240
2021-06-28 21:00:36 -06:00
Travis Ralston
964a97d59e
Merge remote-tracking branch 'origin/develop' into travis/new-audio
2021-06-28 20:52:44 -06:00
Travis Ralston
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
Germain Souquet
6607294573
Deprecate Tinter and TintableSVG
2021-06-28 17:13:23 +01:00
J. Ryan Stinnett
a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht
...
Removes the override on the Bubble Container
2021-06-28 16:23:40 +01:00
Germain Souquet
6cb86057c5
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
2021-06-28 09:29:11 +01:00
Travis Ralston
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
Jaiwanth
398d49245f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-06-26 23:42:42 +05:30
J. Ryan Stinnett
18b470820d
Merge pull request #6270 from SimonBrandner/fix/presence/17786
...
Fix hyper-precise presence
2021-06-26 18:47:17 +01:00
Jaiwanth
c3dc51c452
Create export dialog and async import export utils
2021-06-26 12:14:18 +05:30
Šimon Brandner
3c6612df93
Fix hyper-precise presence
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-26 07:53:42 +02:00
Travis Ralston
b5bb767b8f
Appease the linter
2021-06-25 14:11:50 -06:00
Travis Ralston
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
Andrew Morgan
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
Travis Ralston
76caba0385
Restore mx_VoiceMessagePrimaryContainer class
2021-06-25 00:10:32 -06:00
Jaiwanth
3718826e94
refactor to share downloading code across all formats
2021-06-25 11:16:59 +05:30
Robin Townsend
e35e836052
Convert TextualEvent and SearchResultTile to TypeScript
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 18:45:23 -04:00
Robin Townsend
f9fe28a6ad
Merge branch 't3chguy/ts/8' into text-for-event-perf
2021-06-24 18:45:08 -04:00
Travis Ralston
ffef2e58cb
Unify audio message types to new media body
2021-06-24 11:38:35 -06:00
Travis Ralston
470778cbb8
Move voice message components to audio-generic directory
2021-06-24 11:38:35 -06:00
Jaiwanth
91b8b2ac5a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 22:54:40 +05:30
Michael Telatynski
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
Šimon Brandner
dc2f71bee6
Even more fixes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:55:44 +02:00
Šimon Brandner
b065f6d1a4
Remove sdk...
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:48:36 +02:00
Šimon Brandner
f0dbc974fa
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile
2021-06-24 16:44:13 +02:00
Šimon Brandner
c0a1127cb7
Fix PowerStatus
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:43:11 +02:00
Šimon Brandner
f08b92309f
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:35:33 +02:00
Jaiwanth
544761329c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 18:33:30 +05:30
Jaiwanth
112dfa2b96
Finish JSON export implementation
2021-06-24 18:19:12 +05:30
Šimon Brandner
8fb788ae56
Iterate EntityTile once more
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:39:51 +02:00
Šimon Brandner
5b21cff240
Iterate MemberTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:38:21 +02:00
Šimon Brandner
1b64cd0c88
Iterate PresenceLabel
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:36:22 +02:00
Šimon Brandner
298e505381
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:29:24 +02:00
Šimon Brandner
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
Šimon Brandner
a774aed365
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:07:43 +02:00
Germain Souquet
21caa6df12
move live recording logic down the component tree
2021-06-24 09:58:11 +01:00
Germain Souquet
56467485f5
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
2021-06-24 09:42:47 +01:00
Šimon Brandner
e25940cbdd
Convert PresenceLabel to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:11 +02:00
Šimon Brandner
87d27593de
Convert MemberTile to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:11 +02:00
Šimon Brandner
d5acfc6cf4
Convert EntityTile to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 19:22:06 +02:00
Šimon Brandner
99c442cea7
Convert MemberList to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:06 +02:00
Germain Souquet
a6367c0796
Reintroduce LiveRecording components for maintenance reasons
2021-06-23 09:33:38 +01:00
Šimon Brandner
9bceb40820
CallMediaHandler -> MediaDeviceHandler
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
Jaiwanth
b2162c3be9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-23 12:09:46 +05:30
Jaiwanth
438b9d4730
Get rid of jszip and replace it with a custom library
2021-06-23 11:58:50 +05:30
Michael Telatynski
24b03366a8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17368
2021-06-22 22:40:59 +01:00
Michael Telatynski
9dc8493a5c
Hide communities invites and the community autocompleter when Spaces Beta is enabled
2021-06-22 22:07:42 +01:00
Michael Telatynski
cecf0ce299
Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
2021-06-22 20:41:26 +01:00
Michael Telatynski
6fd1dc7d18
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7
2021-06-22 18:09:24 +01:00
Michael Telatynski
59258585b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-22 17:28:19 +01:00