e582b1559b
Fix redacted messages (again)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-02 15:09:02 +02:00
0fe10e4502
Fix replies to deleted messages
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-02 14:22:46 +02:00
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-02 13:14:14 +02:00
5240209529
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-02 12:39:51 +03:00
190ccb6f00
Merge and add export support for the modified MAudioBody
2021-07-02 10:41:04 +05:30
1f337b28ac
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
...
Conflicts:
src/ContentMessages.tsx
src/components/structures/UploadBar.tsx
src/components/views/messages/MImageBody.js
src/components/views/messages/MStickerBody.js
src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
5e3c8fae5c
put this just on the buttons
2021-07-01 15:22:44 +01:00
d90d1ca8db
event list summary alignment in bubble layout
2021-07-01 14:56:34 +01:00
66d95ed7b2
Fix button styling in verification bubbles
2021-07-01 14:51:20 +01:00
223b40c9d6
Add dark theme support
2021-07-01 14:23:00 +01:00
da8a783ca0
lint
2021-06-30 14:51:18 -06:00
12d7be2b6a
Merge branch 'develop' into travis/new-audio
2021-06-30 13:25:41 -06:00
209344d443
improvements to bubble layout
2021-06-30 17:06:51 +01:00
d1c6cfe6b9
Improved message bubble layout (no reply)
2021-06-30 12:06:16 +01:00
d9eec1c03b
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-06-30 08:58:20 +01:00
fdced3da1b
Remove reminescent references to the tinter
2021-06-30 08:09:55 +01:00
551639811b
Merge and resolve conflicts
2021-06-30 12:29:13 +05:30
4cfdad8aa2
Add spacing between toast buttons with cross browser support in mind
2021-06-29 11:59:13 +01:00
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu
2021-06-29 08:18:07 +01:00
637e3afa48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-29 11:31:30 +05:30
025a7eb9a5
Iterate PR
2021-06-29 10:36:24 +05:30
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
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648
...
Fix IRC layout regressions
2021-06-28 16:10:02 +01:00
494f4d3ab4
Merge pull request #6248 from matrix-org/t3chguy/fix/17731
2021-06-28 16:08:12 +01:00
56514d51a6
Fix tiny scrollbar dot on chrome/electron in Forward Dialog
2021-06-28 15:37:28 +01:00
6cb86057c5
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
2021-06-28 09:29:11 +01:00
43732e5c12
Inherit font-family
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-26 20:53:14 +02:00
398d49245f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-06-26 23:42:42 +05:30
e505646f21
Finish dialog implementation of export settings
2021-06-26 21:54:10 +05:30
ed78bd9096
Remove explicitly set font-family in place where comments talk about FF
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-26 09:12:51 +02:00
ffc6f96d45
Remove explicitly set font-family
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-26 09:12:45 +02:00
fbe3eb7726
Remove unused class
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-06-26 09:00:42 +02:00
4d6ad91e52
Add export option to right panel
2021-06-25 22:45:14 +05:30
1d374f6cbb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731
2021-06-25 14:50:24 +01:00
2e940b7763
Update res/css/structures/_RoomStatusBar.scss
...
Co-authored-by: Germain <germain@souquet.com >
2021-06-25 14:47:17 +01:00
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click
2021-06-25 14:42:18 +01:00
5932b93325
make backdrop closer to what is happening in production
2021-06-25 14:09:49 +01:00
b371abe556
Merge pull request #6266 from matrix-org/t3chguy/fix/17768
...
Fix space avatar management layout being broken
2021-06-25 11:58:41 +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
620e14eb4b
Fix space avatar management layout being broken
2021-06-25 11:10:37 +01:00
6d293d1092
Merge branch 'develop' into gsouquet/fix-backdrop-filter
2021-06-25 09:43:54 +01:00
652ad3617d
Backdrop filter compatibility for Firefox and Safari
2021-06-25 09:20:03 +01:00
7a6ee7d918
I know how CSS works.
2021-06-25 00:22:05 -06:00
e0a73a583e
Increase clickable area of seek bar
2021-06-25 00:19:57 -06:00
dd53c25706
Fix right panel sizing
2021-06-24 20:37:34 -06:00
ebb6f1b602
Add seeking and notes about clock desync
2021-06-24 20:18:50 -06: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
6ea79b297f
tweak message context icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu >
2021-06-24 22:20:51 +02:00
Šimon Brandner