Travis Ralston
|
aaec9857fd
|
Add optional mark function callback
|
2021-06-24 11:38:35 -06:00 |
|
Travis Ralston
|
ffef2e58cb
|
Unify audio message types to new media body
|
2021-06-24 11:38:35 -06:00 |
|
Travis Ralston
|
8ce77e618f
|
Reduce pointless CSS vars by 2
|
2021-06-24 11:38:35 -06:00 |
|
Travis Ralston
|
dda60949c3
|
Introduce basic audio playback control
|
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 |
|
Travis Ralston
|
9f2eba4351
|
Fix class identifiers
|
2021-06-24 11:38:35 -06:00 |
|
Travis Ralston
|
50127da227
|
Replace MAudioBody with a voice message body as a template
|
2021-06-24 11:38:35 -06:00 |
|
Michael Telatynski
|
8f6d31b73c
|
Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile
|
2021-06-24 17:05:16 +01:00 |
|
Michael Telatynski
|
3d6c6cea89
|
Fix AutoHideScrollbar typing
|
2021-06-24 16:43:12 +01:00 |
|
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 |
|
Michael Telatynski
|
767b8cd5c7
|
Merge pull request #6260 from matrix-org/t3chguy/2
Fix UserInfo not working when rendered without a room
|
2021-06-24 16:37:35 +01:00 |
|
Michael Telatynski
|
d83a92959b
|
Fix UserInfo not working when rendered without a room
|
2021-06-24 16:30:40 +01:00 |
|
Šimon Brandner
|
ff11244de8
|
Trailing spaces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 17:27:53 +02:00 |
|
Šimon Brandner
|
e282c4aa54
|
Simplifie code
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
|
2021-06-24 17:23:42 +02:00 |
|
Šimon Brandner
|
430ae0e79f
|
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
|
2021-06-24 16:59:18 +02:00 |
|
Šimon Brandner
|
cc1f68296e
|
Iterate
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 16:58:56 +02: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 |
|
Travis Ralston
|
006c6df205
|
Merge pull request #6253 from matrix-org/travis/leave-reasons
Update membership reason handling, including leave reason displaying
|
2021-06-24 08:52:34 -06: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 |
|
Michael Telatynski
|
bc786cdf4a
|
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1
|
2021-06-24 15:23:59 +01:00 |
|
Š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 |
|
Michael Telatynski
|
f6bb0f4e75
|
Merge pull request #6258 from matrix-org/t3chguy/fix/17752
|
2021-06-24 13:34:45 +01:00 |
|
Šimon Brandner
|
e436e28f01
|
Make TS happy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:31:04 +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 |
|
Michael Telatynski
|
cc1ff2ce1c
|
Remove unused import
|
2021-06-24 13:28:16 +01:00 |
|
Michael Telatynski
|
f965d449b8
|
Merge pull request #6249 from SimonBrandner/ts/member-list
|
2021-06-24 13:25:59 +01: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
|
0542c69b66
|
Fix types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:13:27 +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 |
|
Šimon Brandner
|
6333d4aa36
|
Iterate PR
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 14:02:06 +02:00 |
|
Michael Telatynski
|
7b1d64fe49
|
Merge pull request #6259 from matrix-org/t3chguy/1
|
2021-06-24 12:36:12 +01:00 |
|
Michael Telatynski
|
6d3e7730ef
|
Fix two PRs duplicating the css attribute
|
2021-06-24 11:40:49 +01:00 |
|
Šimon Brandner
|
a8b2c6d36b
|
Type event
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 12:24:42 +02:00 |
|
Michael Telatynski
|
71414904fc
|
Merge pull request #6201 from matrix-org/t3chguy/fix/15051
|
2021-06-24 11:20:12 +01:00 |
|
Michael Telatynski
|
4993fc3e7a
|
Fix edit history modal
defining enums in ts module declarations sadly isn't magic
|
2021-06-24 11:16:13 +01:00 |
|
Michael Telatynski
|
01aadb460d
|
Fix cyclic imports
|
2021-06-24 11:12:32 +01:00 |
|
Michael Telatynski
|
cd8f8dc458
|
Merge pull request #6256 from matrix-org/t3chguy/fix/17744
Fix invite dialog being cut off when it has limited results
|
2021-06-24 10:52:41 +01:00 |
|
Michael Telatynski
|
26d8c4d2e6
|
Improve design of the multi inviter error dialog
|
2021-06-24 10:03:32 +01:00 |
|
Germain Souquet
|
09c22c37ff
|
Add comment to specify variable origin
|
2021-06-24 10:01:44 +01:00 |
|
Germain Souquet
|
21caa6df12
|
move live recording logic down the component tree
|
2021-06-24 09:58:11 +01:00 |
|
Šimon Brandner
|
0fe6a28853
|
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
|
2021-06-24 10:57:09 +02:00 |
|
Germain Souquet
|
56467485f5
|
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
|
2021-06-24 09:42:47 +01:00 |
|
Šimon Brandner
|
7eb3642692
|
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 10:42:01 +02:00 |
|
Šimon Brandner
|
8d47ea63c2
|
Make pinned message text clickable
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 10:41:55 +02:00 |
|
Šimon Brandner
|
ebe19168c2
|
Add allowClose to payload
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-24 10:39:45 +02:00 |
|