Commit graph

29203 commits

Author SHA1 Message Date
Travis Ralston
a501d698aa Add a UI Feature flag for room history settings 2020-10-28 09:00:36 -06:00
RiotRobot
a708dbf6e9 Reset matrix-js-sdk back to develop branch 2020-10-28 14:32:26 +00:00
RiotRobot
6233df9d70 Merge branch 'master' into develop 2020-10-28 14:31:19 +00:00
RiotRobot
bdfac1d858 v3.7.1 2020-10-28 14:25:35 +00:00
RiotRobot
6c7284afba Prepare changelog for v3.7.1 2020-10-28 14:25:34 +00:00
RiotRobot
de6589705c Upgrade matrix-js-sdk to 9.0.1 2020-10-28 14:17:48 +00:00
J. Ryan Stinnett
e1e77b2191
Merge pull request #5361 from matrix-org/jryans/hide-inline-images
Hide inline images when preference disabled
2020-10-28 14:16:57 +00:00
J. Ryan Stinnett
5f840da38a Fix typo 2020-10-28 13:12:12 +00:00
J. Ryan Stinnett
ac7991c494 Add comment 2020-10-28 13:11:35 +00:00
J. Ryan Stinnett
9c8bc583e0 Hide inline images when preference disabled
As a first attempt, this drops inline images (as if they were not present at
all) when the "show images" preference is disabled. Future work might expose
some UI to reveal them like standalone image events have.

Fixes https://github.com/vector-im/element-web/issues/15573
2020-10-28 13:03:48 +00:00
Michael Telatynski
e06550b748 Watch replyToEvent at RoomView to prevent races 2020-10-28 12:47:59 +00:00
J. Ryan Stinnett
557d9ad90c
Merge pull request #5359 from matrix-org/jryans/react-key-checkboxes
Fix React warning by moving handler to each button
2020-10-28 11:27:07 +00:00
Travis Ralston
0adb920448
Merge pull request #5352 from matrix-org/hs/mvideobody
Do not preload encrypted videos|images unless autoplay or thumbnailing is on
2020-10-27 18:56:29 -06:00
J. Ryan Stinnett
bb18e44042 Fix React warning by moving handler to each button
React is disturbed that the buttons don't have their own event handlers, so
let's just move it there.
2020-10-27 17:11:09 +00:00
Michael Telatynski
a093a64d70
Merge pull request #5358 from matrix-org/t3chguy/fix/jitsi-cherry-pick
[Release] Fix theme variable passed to Jitsi
2020-10-27 12:05:13 +00:00
Michael Telatynski
2fb0525756 Fix theme variable passed to Jitsi 2020-10-27 11:51:10 +00:00
Michael Telatynski
914699259b
Merge pull request #5357 from matrix-org/t3chguy/fix/jitsi
Fix theme variable passed to Jitsi
2020-10-27 11:38:30 +00:00
Michael Telatynski
17717e27c6 Fix theme variable passed to Jitsi 2020-10-27 11:26:16 +00:00
Michael Telatynski
cb510f7d74
Merge pull request #5351 from matrix-org/t3chguy/cherry-pick/6
[Release] Widget fixes
2020-10-27 11:15:53 +00:00
RiotRobot
6f37875d38 Reset matrix-js-sdk back to develop branch 2020-10-26 16:57:24 +00:00
RiotRobot
1f2ff33fc8 Merge branch 'master' into develop 2020-10-26 16:56:37 +00:00
RiotRobot
492f85da00 v3.7.0 2020-10-26 16:55:16 +00:00
RiotRobot
25dd5e045e Prepare changelog for v3.7.0 2020-10-26 16:55:16 +00:00
RiotRobot
5446184e6e Upgrade matrix-js-sdk to 9.0.0 2020-10-26 16:49:16 +00:00
Travis Ralston
b10a6a5720
Merge pull request #5349 from RinkiyaKeDad/comments
docs: added comment explanation
2020-10-26 08:48:39 -06:00
Will Hunt
7eb54cc83c Also only download images after clicking on them 2020-10-23 17:16:09 +01:00
Will Hunt
e5228e2795 alt is not valid on video element 2020-10-23 16:42:23 +01:00
Will Hunt
7164284bb6 Do not download encrypted video if autoplay is not on 2020-10-23 16:33:40 +01:00
Will Hunt
bbb4c7f801 Convert MVideoBody to typescript 2020-10-23 16:32:04 +01:00
Travis Ralston
646ed4c4d4
Merge pull request #5252 from matrix-org/t3chguy/feat/modal-widgets
Modal Widgets - MSC2790
2020-10-23 07:29:10 -06:00
Michael Telatynski
cf93f75d09 fix sandbox flags 2020-10-22 22:09:16 +01:00
Michael Telatynski
0004dd4475 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-10-22 21:40:05 +01:00
Michael Telatynski
12bc3ea9dc remove stale comments 2020-10-22 21:34:48 +01:00
Michael Telatynski
cf23417e6e Fix WidgetStore wrongly hanging onto old Widget definitions during removal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:32:13 +01:00
Michael Telatynski
951ad5d581 Remove redundant event listener
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:32:12 +01:00
Michael Telatynski
a2280aae64 Fix stickerpicker not having correct contexts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:32:12 +01:00
Michael Telatynski
ca4e7202ae
Merge pull request #5350 from matrix-org/t3chguy/fix/widgets
Widgets fixes
2020-10-21 16:30:24 +01:00
Michael Telatynski
25c9b2694e
Merge pull request #5348 from matrix-org/t3chguy/fix/15511
Fix User Menu avatar colouring being based on wrong string
2020-10-21 16:09:23 +01:00
Michael Telatynski
5f2058a6a0 Fix WidgetStore wrongly hanging onto old Widget definitions during removal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:06:22 +01:00
Michael Telatynski
a16a6d2b54 Remove redundant event listener
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:05:44 +01:00
Michael Telatynski
6196c03c0a Fix stickerpicker not having correct contexts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:05:20 +01:00
Arsh Sharma
e57f4fbd54 docs: fixed whitespace 2020-10-21 20:13:50 +05:30
Arsh Sharma
312d46917c docs: added comment explanation 2020-10-21 20:10:35 +05:30
RiotRobot
5c7e9e8a46 v3.7.0-rc.2 2020-10-21 15:21:44 +01:00
RiotRobot
ecfd61de56 Prepare changelog for v3.7.0-rc.2 2020-10-21 15:21:43 +01:00
RiotRobot
b585cf76bd Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 15:16:46 +01:00
RiotRobot
2f3eb0cd01 v3.7.0-rc.1 2020-10-21 14:44:21 +01:00
RiotRobot
0a7e8049f2 Prepare changelog for v3.7.0-rc.1 2020-10-21 14:44:21 +01:00
RiotRobot
65d7b9c0f2 Upgrade matrix-js-sdk to 8.5.0 2020-10-21 14:38:51 +01:00
Michael Telatynski
0170fa608e Fix User Menu avatar colouring being based on wrong string
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 14:11:39 +01:00