Commit Graph

16504 Commits

Author SHA1 Message Date
Š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
Michael Telatynski 56cd0e1c4f Merge branch 't3chguy/fix/18091' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-07-29 12:52:01 +01:00
Michael Telatynski 6f37e8b223 Use getChildren instead of getSpaceSummary as MSC2946 has moved on 2021-07-29 12:16:59 +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
Michael Telatynski ac800ad94d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 2021-07-28 19:24:26 +01:00
Michael Telatynski 40493634ae Iterate PR 2021-07-28 19:23:33 +01:00
Michael Telatynski ed950875e7 Fix space hierarchy not updating when user mutates it 2021-07-28 19:08:59 +01:00
Michael Telatynski 5d9e421de0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 2021-07-28 17:58:34 +01:00
Michael Telatynski a5606c72de Update feedback prompt to match designs 2021-07-28 17:56:57 +01:00
James Salter 07eaee25d2 Default properties to {} to avoid passing it superfluously for events with no properties 2021-07-28 17:54:35 +01:00
Michael Telatynski 6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Michael Telatynski 67ef263940 Refactor SpaceButton to be more reusable and add context menu to Home button 2021-07-28 17:40:33 +01:00
Michael Telatynski b3a28bde89 Factor out useEventEmitterState hook 2021-07-28 17:39:56 +01:00
Michael Telatynski cdf0d98c3f Fix IconizedContextMenuCheckbox layout 2021-07-28 17:39:02 +01:00
James Salter b1bd5f57a4 Document IEvent.properties, fix IWelcomeScreenLoad
IEvent.properties is a placeholder that needs to be overriden by extenders for type validation to take place.

IWelcomeScreenLoad should have had properties declared for it. Because it didn't, a faulty call using it was possible.
2021-07-28 16:43:13 +01:00
Šimon Brandner e0762827fe Fix typo
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 17:19:32 +02:00
Šimon Brandner 168a32902e Remove additional word
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 16:50:40 +02:00
Šimon Brandner 9ec4507da5 Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 16:49:03 +02:00
Šimon Brandner 537ce40f42 Add a TODO
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 16:32:55 +02:00
Michael Telatynski 07b9d6b30b Fix styling of setting flag descriptions in preferences
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
2021-07-28 14:39:19 +01:00
Šimon Brandner 7c4e3efbff Extend PureComponent to avoid unnecessary renders
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 15:11:31 +02:00
Šimon Brandner 91e65534fa await setState to avoid races where we would try to play media without an HTMLVideoElement
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 15:04:33 +02:00
Šimon Brandner e445c9c3ff Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 13:28:11 +02:00
James Salter bd7e2dee3d Merge remote-tracking branch 'origin' into posthog-analytics 2021-07-28 11:13:22 +01:00
Germain 771dda0341 Merge pull request #6472 from SimonBrandner/fix/call-view/18221 2021-07-28 11:10:37 +01:00
James Salter 1d81bdc6f9 Interface changes and anonymity fixes 2021-07-28 09:37:08 +01:00
Michael Telatynski 98f3a5120c Merge pull request #6492 from matrix-org/t3chguy/fix/18275.1 2021-07-28 09:10:00 +01:00
Michael Telatynski 52e50863f8 Fix CreateRoomDialog exploding when making public room outside of a space 2021-07-28 08:39:59 +01:00
Michael Telatynski 0a9d3302ba Fix home vs all rooms requiring app reload and change default to home
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
Šimon Brandner 5f6a1e336e Remove unnecessary curly braces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:46:19 +02:00
Šimon Brandner 9761c38f3d Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:39:22 +02:00
Germain f82744db97 Merge pull request #6487 from matrix-org/gsouquet/fix-18265 2021-07-27 17:20:02 +01:00
Germain 7e453d7745 Typo
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-27 17:14:39 +01:00
Šimon Brandner bc11e215b8 Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 18:14:23 +02:00
Šimon Brandner 36607fa8a2 Fix call crashing because element was undefined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:05:50 +02:00
Germain Souquet 30ce7b5eab Make link within replies clickable 2021-07-27 17:57:46 +02:00
Šimon Brandner 6f77d3bbab Correctly hide the dialpad
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 17:52:13 +02:00
Šimon Brandner 8294d324e3 Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
Šimon Brandner 371de23b00 Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 16:40:47 +02:00
David Baker 3e7aee3a87 Merge pull request #5992 from SimonBrandner/fix/12652/screen-share
Add support for screen sharing in 1:1 calls
2021-07-27 15:34:27 +01:00
Šimon Brandner b9e305daae Delete mistake line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:26:46 +02:00