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
Weblate
25e01c2752
Merge branch 'origin/develop' into Weblate.
2021-07-30 12:08:20 +00: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
Weblate
9f3da3ef53
Merge branch 'origin/develop' into Weblate.
2021-07-30 11:25:49 +00: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
Weblate
d5426d37b3
Merge branch 'origin/develop' into Weblate.
2021-07-30 10:03:30 +00:00
waclaw66
294eb2418b
Translated using Weblate (Czech)
...
Currently translated at 100.0% (3107 of 3107 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-07-30 10:03:30 +00: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
Weblate
3b2af17efc
Merge branch 'origin/develop' into Weblate.
2021-07-30 08:08:15 +00:00
XoseM
7e0c37e11a
Translated using Weblate (Galician)
...
Currently translated at 100.0% (3098 of 3098 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-07-30 08:08:15 +00:00
waclaw66
2fdcd66611
Translated using Weblate (Czech)
...
Currently translated at 99.2% (3084 of 3107 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-07-30 08:08:10 +00:00
Jeff Huang
eb909ad9f2
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (3098 of 3098 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-30 08:08:08 +00:00
Szimszon
95d040e649
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (3098 of 3098 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-07-30 08:08:02 +00: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
Weblate
f53f6eac50
Merge branch 'origin/develop' into Weblate.
2021-07-29 16:51:32 +00: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
Weblate
a33e9f5a11
Merge branch 'origin/develop' into Weblate.
2021-07-29 14:57:31 +00:00
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
Weblate
1cd640881b
Merge branch 'origin/develop' into Weblate.
2021-07-29 14:54:02 +00:00
Michael Telatynski
d587ae44af
Merge pull request #6466 from matrix-org/t3chguy/fix/18096
2021-07-29 15:53:57 +01:00
Michael Telatynski
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
Weblate
2c9317074b
Merge branch 'origin/develop' into Weblate.
2021-07-29 14:40:31 +00:00
David Baker
0b9c422d47
Merge pull request #6508 from SimonBrandner/fix/pill-click/18283
...
Fix clicking pills inside replies
2021-07-29 15:40:27 +01:00
Michael Telatynski
251b6eb04e
update copy
2021-07-29 15:30:49 +01:00
Šimon Brandner
f0f2d3621e
Fix clicking pills inside replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 16:30:07 +02:00
Michael Telatynski
af851f7f44
fix merge conflict resolution issue
2021-07-29 15:24:42 +01:00
Michael Telatynski
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00