Commit Graph

14911 Commits (a5b43ca7ca0a4b57bf649652ba8ef5f96ff13fbe)

Author SHA1 Message Date
James Salter 57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
Germain a07df5e9d8
Merge pull request #6512 from SimonBrandner/fix/mirroring/5633 2021-08-04 08:51:22 +01:00
Šimon Brandner d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
David Baker 28f5dc483b Update eslint plugin & fix silly indenting
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00
Šimon Brandner 65451805a2
Merge remote-tracking branch 'upstream/develop' into fix/mirroring/5633
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 16:06:12 +02:00
Germain Souquet 54c685bfa8 Migrate LogoutDialog to TypeScript 2021-08-03 13:52:46 +02:00
Germain Souquet 81b45f8aa9 Make defaultProps a static property of LogoutDialog 2021-08-03 13:44:14 +02:00
James Salter dc7aad1abf Revert "Revert "Add support for Posthog Analytics under a labs flag""
This reverts commit c5ea253181.
2021-08-03 11:55:02 +01:00
James Salter c5ea253181
Revert "Add support for Posthog Analytics under a labs flag" 2021-08-03 07:30:02 +01:00
David Baker 3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting
Show an avatar/a turned off microphone icon for muted users
2021-08-02 17:20:55 +01:00
James Salter a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
James Salter 1ca547802f lint 2021-08-02 13:28:56 +01:00
James Salter 4755a81403 Disable analytics when user hasn't opted in or out 2021-08-02 12:23:42 +01: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
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 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
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 7b6536c297
Fix incorrect height for encoded placeholder images 2021-07-30 11:53:56 +02:00
Šimon Brandner 0c30566cae
Fix import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-30 08:20:36 +02:00
Š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 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
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
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
Michael Telatynski efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
James Salter a1ffd240e1 Use .instance pattern 2021-07-29 14:40:18 +01:00
Šimon Brandner 871f1b7a5c
Handle all possible playMedia() in componentDidUpdate()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:31:25 +02:00
Šimon Brandner 38a1b922bd
Add missing await
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:26:04 +02:00
Šimon Brandner cb89dd408c
Use mic mute icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:05:26 +02:00
Michael Telatynski ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091 2021-07-29 13:20:19 +01:00
Michael Telatynski 08c883ed07 Update all copy of `subspace` to `space` 2021-07-29 13:02:07 +01:00
Dariusz Niemczyk 7baa3284e3
Fix grecaptcha regression 2021-07-29 12:39:32 +02:00
Germain Souquet e140dd6ba1 Merge branch 'develop' into gsouquet/fix-18132 2021-07-29 10:27:00 +02:00
Šimon Brandner cf973cdb95
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-29 09:06:24 +02:00
Šimon Brandner ae64765870
playMedia only if necessary
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 08:45:32 +02:00
Michael Telatynski 67b8c0a811 remove unused import 2021-07-28 19:33:54 +01:00
Michael Telatynski 9fb1c8e4cd Iterate PR 2021-07-28 19:33:07 +01:00