Bruno Windels
|
5c6a36f89a
|
Merge pull request #5072 from matrix-org/bwindels/make-reply-not-overlay
Make reply preview not an overlay so you can see new messages
|
2020-08-18 11:48:41 +00:00 |
|
Michael Telatynski
|
d1971cb163
|
Merge pull request #5113 from matrix-org/t3chguy/room-list/14959
Allow room tile context menu when minimized using right click
|
2020-08-18 12:45:55 +01:00 |
|
Michael Telatynski
|
aef8784b78
|
Merge pull request #5121 from matrix-org/t3chguy/null-guard-group-inviter
Add null guard to group inviter for corrupted groups
|
2020-08-18 12:45:06 +01:00 |
|
Michael Telatynski
|
b6dd856649
|
Merge pull request #5118 from matrix-org/t3chguy/room-list/14617.2
Room List styling tweaks
|
2020-08-18 12:44:09 +01:00 |
|
Bruno Windels
|
5d98805d77
|
Merge branch 'develop' into bwindels/make-reply-not-overlay
|
2020-08-18 13:39:06 +02:00 |
|
Bruno Windels
|
fa1e27076d
|
remove dupe method
|
2020-08-18 12:34:43 +02:00 |
|
RiotRobot
|
c91fc99d4b
|
Reset matrix-js-sdk back to develop branch
|
2020-08-17 13:08:45 +01:00 |
|
RiotRobot
|
8a37c90ec1
|
Merge branch 'master' into develop
|
2020-08-17 13:07:27 +01:00 |
|
RiotRobot
|
ea337465ae
|
v3.2.0
|
2020-08-17 12:59:51 +01:00 |
|
RiotRobot
|
18ae1a9547
|
Prepare changelog for v3.2.0
|
2020-08-17 12:59:51 +01:00 |
|
RiotRobot
|
32ca810809
|
Upgrade matrix-js-sdk to 8.1.0
|
2020-08-17 12:53:33 +01:00 |
|
Michael Telatynski
|
0329f5d77e
|
Merge pull request #5122 from matrix-org/t3chguy/cherry-pick/5120
[Release] Fix corner rounding on images not always affecting right side
|
2020-08-17 11:41:33 +01:00 |
|
Michael Telatynski
|
9a5134eff2
|
Fix corner rounding on images not always affecting right side
|
2020-08-17 11:14:36 +01:00 |
|
Michael Telatynski
|
758e37fe50
|
Merge pull request #5120 from matrix-org/t3chguy/fix/14948
Fix corner rounding on images not always affecting right side
|
2020-08-17 11:11:23 +01:00 |
|
Michael Telatynski
|
70f0701de5
|
null guard group inviter for corrupted groups
|
2020-08-17 10:59:43 +01:00 |
|
Michael Telatynski
|
6e2a26443d
|
Fix corner rounding on images not always affecting right side
|
2020-08-17 10:55:54 +01:00 |
|
Michael Telatynski
|
27df9c038d
|
Merge pull request #5108 from matrix-org/t3chguy/room-list/14617
Change add room action for rooms to context menu
|
2020-08-17 09:41:42 +01:00 |
|
Michael Telatynski
|
d727455c17
|
Merge branch 't3chguy/room-list/14617' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2
|
2020-08-14 18:59:07 +01:00 |
|
Michael Telatynski
|
21cdf5073c
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617
|
2020-08-14 18:58:26 +01:00 |
|
Michael Telatynski
|
4381bdfdbf
|
fix typo
|
2020-08-14 18:53:56 +01:00 |
|
Michael Telatynski
|
90d99239bb
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2
|
2020-08-14 18:10:59 +01:00 |
|
Michael Telatynski
|
be1d390a93
|
Merge pull request #5106 from matrix-org/t3chguy/room-list/14608
Switch out the globe icon and colour it depending on theme
|
2020-08-14 18:10:29 +01:00 |
|
Michael Telatynski
|
2eb48bc588
|
Merge pull request #5116 from matrix-org/t3chguy/cherry-pick/5115
[Release] Message Action Bar watch for event send changes
|
2020-08-14 14:39:28 +01:00 |
|
Michael Telatynski
|
57f15bb1dd
|
fix typo
|
2020-08-14 13:46:51 +01:00 |
|
Michael Telatynski
|
cd87480088
|
Watch for Event.status instead as we can do some things in SENT
|
2020-08-14 13:46:46 +01:00 |
|
Michael Telatynski
|
1f6ec421f4
|
Make event subscriptions conditional when needed
|
2020-08-14 13:46:42 +01:00 |
|
Michael Telatynski
|
d34f166187
|
Message Action Bar, subscribe to localEventIdReplaced events
|
2020-08-14 13:46:40 +01:00 |
|
Michael Telatynski
|
5f5828522b
|
Merge pull request #5115 from matrix-org/t3chguy/fix/14803
Message Action Bar watch for event send changes
|
2020-08-14 13:45:38 +01:00 |
|
Michael Telatynski
|
655cc95570
|
fix typo
|
2020-08-14 13:37:28 +01:00 |
|
Michael Telatynski
|
591847b274
|
Watch for Event.status instead as we can do some things in SENT
|
2020-08-14 13:37:11 +01:00 |
|
Michael Telatynski
|
de9816574f
|
Make event subscriptions conditional when needed
|
2020-08-14 13:30:27 +01:00 |
|
Michael Telatynski
|
f982c7b334
|
Message Action Bar, subscribe to localEventIdReplaced events
|
2020-08-14 13:22:52 +01:00 |
|
Michael Telatynski
|
315435e3ef
|
Merge pull request #5114 from matrix-org/t3chguy/cherry-pick/5109
Fix /op slash command to release
|
2020-08-14 12:15:26 +01:00 |
|
Michael Telatynski
|
38701f3e71
|
Fix /op slash command
(cherry picked from commit 3f2c1500e5)
|
2020-08-14 12:05:54 +01:00 |
|
Michael Telatynski
|
8f0e4dae9d
|
Allow room tile context menu when minimized using right click
|
2020-08-14 12:01:16 +01:00 |
|
Michael Telatynski
|
b577667447
|
Merge pull request #5110 from matrix-org/t3chguy/room-list/14298
Put message previews for Emoji behind Labs
|
2020-08-14 11:33:37 +01:00 |
|
Michael Telatynski
|
228d1af6dc
|
i18n
|
2020-08-14 11:01:03 +01:00 |
|
Michael Telatynski
|
d861536487
|
Make globe transparent
|
2020-08-14 10:30:54 +01:00 |
|
Michael Telatynski
|
4ec602b960
|
Make cutout in the decorated room avatar transparent rather than fixed
|
2020-08-14 10:20:59 +01:00 |
|
Michael Telatynski
|
a4847da0c2
|
Merge pull request #5107 from matrix-org/t3chguy/room-list/community-active-marker
Fix styling for selected community marker
|
2020-08-13 20:22:35 +01:00 |
|
J. Ryan Stinnett
|
054067abbe
|
Merge pull request #5112 from matrix-org/jryans/repair-action-bar-safe-area-release
Fix action bar safe area regression
|
2020-08-13 20:04:16 +01:00 |
|
J. Ryan Stinnett
|
df65d03473
|
Fix action bar safe area regression
The action bar was recently moved, but the safe area was not, which left a gap
between the event and the action bar, making it quite easy to trigger hover on a
different event instead of reaching the action bar.
Fixes https://github.com/vector-im/element-web/issues/14953
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5056
|
2020-08-13 19:44:15 +01:00 |
|
J. Ryan Stinnett
|
ad7d5b74a6
|
Merge pull request #5111 from matrix-org/jryans/repair-action-bar-safe-area
Fix action bar safe area regression
|
2020-08-13 19:42:58 +01:00 |
|
J. Ryan Stinnett
|
3ece2dd21d
|
Fix action bar safe area regression
The action bar was recently moved, but the safe area was not, which left a gap
between the event and the action bar, making it quite easy to trigger hover on a
different event instead of reaching the action bar.
Fixes https://github.com/vector-im/element-web/issues/14953
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5056
|
2020-08-13 19:24:11 +01:00 |
|
Michael Telatynski
|
fbb058a8e3
|
Merge pull request #5109 from matrix-org/t3chguy/fix/14951
Fix /op slash command
|
2020-08-13 17:16:47 +01:00 |
|
Michael Telatynski
|
62c1798bec
|
try to fix the e2e tests
|
2020-08-13 16:55:48 +01:00 |
|
Michael Telatynski
|
e7bd656a19
|
i18n
|
2020-08-13 16:41:25 +01:00 |
|
Michael Telatynski
|
50b9da7597
|
Put message previews for Emoji behind Labs
|
2020-08-13 16:40:18 +01:00 |
|
Michael Telatynski
|
3f2c1500e5
|
Fix /op slash command
|
2020-08-13 16:29:25 +01:00 |
|
Michael Telatynski
|
b8a260bb84
|
Change add room action for rooms to context menu
|
2020-08-13 16:18:26 +01:00 |
|