Commit Graph

36430 Commits

Author SHA1 Message Date
David Baker
cb00796a25
Merge pull request from GHSA-f69q-vrfp-27g2
Sanitize untrusted variables from message previews before translation
2021-08-02 12:49:07 +01:00
James Salter
2cee2b5fd6 Update comment 2021-08-02 12:26:18 +01:00
James Salter
4755a81403 Disable analytics when user hasn't opted in or out 2021-08-02 12:23:42 +01:00
James Salter
ce11e6c981
Update src/PosthogAnalytics.ts
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-08-02 11:45:49 +01:00
Šimon Brandner
9ef70f027e
Make the version box smaller
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 11:36:53 +02:00
Šimon Brandner
44258fd278
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603 2021-08-02 11:32:57 +02:00
Andrew Morgan
645c128e44
Prevent backspace and delete functionality in the in-call dial pad. (#6522)
Just as one cannot do when there inputting number while
on a call on their phone, it doesn't make much sense to
be able to do so while on a call in Element. The DTMF
tone history should be preserved.
2021-08-02 10:18:35 +01:00
Andrew Morgan
442992b30e
Fix symbol entry in the in-call dialpad (#6521)
The field had RTL direction set on it, which meant symbols, like *,
appeared at the beginning of the field instead of the end.

RTL was introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/5786,
however its removal seems to have had no adverse affects
from testing.
2021-08-02 10:18:17 +01:00
Travis Ralston
711210d16e
Merge pull request #6437 from matrix-org/travis/voice-messages/delabs
Remove voice messages labs flag
2021-08-02 02:02:36 -06:00
Travis Ralston
9e0ec63ea7 Use correct variable 2021-07-31 11:50:25 -06:00
Travis Ralston
0923dd37ab Sanitize untrusted variables from message previews before translation
Fixes https://github.com/vector-im/element-web/issues/18314
2021-07-31 11:43:05 -06:00
Aaron Raimist
cf2a4ddde7
Fix typo which broke feature_mjolnir
Regressed in b2d9dd7214

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-07-31 02:11:49 -05:00
Jano Garcia
59a86bc0e7
Merge pull request #6515 from matrix-org/janogarcia/fix-contributing-url
Fix wrong URL in README.md
2021-07-30 19:28:22 +02:00
Travis Ralston
1efd226896
Merge pull request #6510 from matrix-org/travis/relfix/vm/dl-1
[Release] Improve download interactions
2021-07-30 10:50:50 -06:00
Travis Ralston
dd53324981
Merge pull request #6509 from matrix-org/travis/voice-messages/download-2
Improve download interactions
2021-07-30 10:50:27 -06:00
Travis Ralston
bfd96b7e58 Add file size to tooltip 2021-07-30 08:57:56 -06:00
Travis Ralston
c5c58a5e91 Add file size to tooltip 2021-07-30 08:56:55 -06:00
Michael Telatynski
21bb8e00ab
Merge pull request #6516 from matrix-org/t3chguy/fix/18301 2021-07-30 15:31:17 +01:00
Michael Telatynski
fe2993ef7f
Merge pull request #6517 from matrix-org/t3chguy/cp/6516
[Release] createRoom, only send join rule event if we have a join rule to put in it
2021-07-30 15:31:09 +01:00
Michael Telatynski
f86265bd03 createRoom, only send join rule event if we have a join rule to put inside it 2021-07-30 15:20:20 +01:00
Michael Telatynski
868cb2132e createRoom, only send join rule event if we have a join rule to put inside it 2021-07-30 15:10:08 +01:00
Jano Garcia
b5d25eb5f8
Fix wrong URL in README.md 2021-07-30 14:10:47 +02:00
Jano Garcia
27e432df4b
Merge pull request #6513 from matrix-org/jano/fix-link-decoration
Fix inconsistent styling for links on hover
2021-07-30 14:08:15 +02:00
Michael Telatynski
42d6afd4b1
Merge pull request #6497 from matrix-org/t3chguy/fix/18093 2021-07-30 12:25:44 +01:00
Michael Telatynski
3c436c9617 update setting naming to match style 2021-07-30 12:20:02 +01:00
Dariusz Niemczyk
7c9df71a57
Merge pull request #6514 from matrix-org/palid/fix/image-placeholders-incorrect-height
Fix incorrect height for encoded placeholder images
2021-07-30 12:03:19 +02:00
Dariusz Niemczyk
7b6536c297
Fix incorrect height for encoded placeholder images 2021-07-30 11:53:56 +02:00
Germain
8509096fc4
Merge pull request #6465 from matrix-org/gsouquet/fix-18144 2021-07-30 09:07:52 +01:00
janogarcia
adfbcdce40 Fix the inconsistent styling between non-markdown and markdown parsed links on hover.
It also improves accessibility by not relying exclusively on color for the hover state. That is even more evident for links that are contained within a parent block link (e.g., a quoted message block linking to the source message).

https://webaim.org/techniques/hypertext/link_text#underlining
2021-07-30 09:54:28 +02:00
Germain Souquet
11322b8999 Appease linter 2021-07-30 09:19:34 +02:00
Germain
375f7b670a
Merge branch 'develop' into gsouquet/fix-18144 2021-07-30 08:10:15 +01:00
Jaiwanth
17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
Šimon Brandner
0c30566cae
Fix import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-30 08:20:36 +02:00
Jaiwanth
04edf4103f Remove unnecessary awaits 2021-07-30 11:46:55 +05:30
Šimon Brandner
e0df785538
Mirror only usermedia feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-30 08:15:45 +02:00
Travis Ralston
a8ec8f4c4b Appease the linter 2021-07-29 16:03:08 -06:00
Travis Ralston
b1090a35b5 Use new getter for content in MFileBody 2021-07-29 16:03:03 -06:00
Travis Ralston
ac1014ae3f Fix file name not ellipsizing
Turns out the tooltip component doesn't copy over class names.
2021-07-29 16:02:58 -06:00
Travis Ralston
15f6c6300a Improve general style per design direction 2021-07-29 16:02:53 -06:00
Travis Ralston
790696a4bb Change "Downloading" tooltip to "Decrypting"
Fixes https://github.com/vector-im/element-web/issues/18239
2021-07-29 16:02:50 -06:00
Travis Ralston
bde2f757aa Unify and improve download interactions
With help from Palid.

This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).

The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 16:02:46 -06:00
Travis Ralston
761fb6e1d5 Appease the linter 2021-07-29 16:01:26 -06:00
Travis Ralston
455c103890 Use new getter for content in MFileBody 2021-07-29 15:57:54 -06:00
Travis Ralston
bb1b2d10c8 Fix file name not ellipsizing
Turns out the tooltip component doesn't copy over class names.
2021-07-29 15:55:45 -06:00
Travis Ralston
c322761abb Improve general style per design direction 2021-07-29 15:49:23 -06:00
Travis Ralston
d1e7c79333 Change "Downloading" tooltip to "Decrypting"
Fixes https://github.com/vector-im/element-web/issues/18239
2021-07-29 15:37:09 -06:00
Travis Ralston
fb89b45c06 Unify and improve download interactions
With help from Palid.

This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).

The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 15:36:50 -06:00
Andrew Morgan
a7c15b2ac0
Fix DialPad and Call Menu buttons not working when a call is fullscreened. (#6496)
This PR:
* Moves the dialpad and hold/transfer menu buttons into the part of the DOM that's included when a call is fullscreen'd.
* Tweaks `ContextMenu` to allow menu content to be mount as a child of the current component, rather than at the root of the DOM (which was not included in the full-screen'd content).

<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->

<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->

`Signed-off-by: Andrew Morgan <andrewm@element.io>`
2021-07-29 17:51:27 +01:00
Michael Telatynski
02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071 2021-07-29 15:57:26 +01:00