Commit Graph

5027 Commits

Author SHA1 Message Date
Michael Telatynski
643d13066c
Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/repo-merge
# Conflicts:
#	package.json
2024-10-15 15:38:52 +01:00
Michael Telatynski
fd62350ce9
Make yarn lock file happier
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-15 15:37:40 +01:00
Michael Telatynski
f0ee7f7905
Merge matrix-react-sdk into element-web
Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-15 15:32:09 +01:00
David Baker
07ed8e8a2d Merge remote-tracking branch 'origin/staging' into develop 2024-10-15 15:26:19 +01:00
RiotRobot
89380ab59f v1.11.81 2024-10-15 11:43:34 +00:00
RiotRobot
8904453bbf Upgrade dependency to matrix-react-sdk@3.113.0 2024-10-15 11:04:13 +00:00
RiotRobot
0943ffa0aa Upgrade dependency to matrix-js-sdk@34.8.0 2024-10-15 10:55:03 +00:00
Michael Telatynski
d9e943d9a8
Update to Compound v7 (#151)
* Update to Compound v7

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update test

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-15 08:56:43 +00:00
Michael Telatynski
b428b4aa9d
Update to Compound v7 (#28191) 2024-10-15 09:56:39 +01:00
R Midhun Suresh
786a0286cf
Upgrade compound also in element-web (#28157) 2024-10-14 17:11:54 +01:00
R Midhun Suresh
91e84f7951
Upgrade to latest compound-web package (#84)
* Upgrade to latest compound-web package

* Use a custom render function for jest tests

This way we don't need to manually wrap our components with
<TooltipProvider>

* Pin wrap-ansi to fix broken yarn install

* Add playwright helper to find tooltip from element

and use it in the failing test

* Exclude floating-ui divs/spans from axe testing

This is rendered outside .MatrixChat by compound and contains all the
tooltips.

* Wrap outermost components with TooltipProvider

* Remove onChange and use onSelect for toggle

* Fix jest tests and update snapshots

* Use vector-im/matrix-wysiwig

---------

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-14 16:11:58 +00:00
David Langley
c71dc6b0f8
Upgrade emojibase-bindings and remove local handling of emoticon variations (#127)
* Updgrade emojibase-bindings and remove local handling of emoticon variations

* bump bindings to fix issue of mission emojis with version == 0

* update lockfile

* test emoji variation in RTE
2024-10-10 14:52:45 +00:00
RiotRobot
8d77b2a15a Reset matrix-js-sdk back to develop branch 2024-10-08 12:37:43 +00:00
RiotRobot
7cb80d560d Reset matrix-react-sdk back to develop branch 2024-10-08 12:37:34 +00:00
RiotRobot
b318c40f4d Merge branch 'master' into develop 2024-10-08 12:37:22 +00:00
RiotRobot
46d6935517 v1.11.80 2024-10-08 12:34:40 +00:00
RiotRobot
097506f0c1 Upgrade dependency to matrix-react-sdk@3.112.0 2024-10-08 12:31:52 +00:00
RiotRobot
b5944e2eeb Upgrade dependency to matrix-js-sdk@34.7.0 2024-10-08 12:24:10 +00:00
David Langley
a0cb9470cc
Update to @vector-im/matrix-wysiwyg (#125) 2024-10-07 14:56:34 +00:00
Michael Telatynski
36285699ac
Remove more bits surrounding hmr
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-04 14:12:08 +01:00
Michael Telatynski
0a9b4aecd3
Tweak default right panel size to be 320px except for maximised widgets at 420px (#110)
* Add extra buttons to room summary card

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Remove right panel tabs in favour of X button on each panel

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update room summary card header to align close button correctly

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix typo in pinned messages heading

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update screenshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Improve coverage

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Tweak default right panel size to be 320px except for video rooms/maximised widgets at 420px

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Track panel resizing in analytics

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix import cycle

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update screenshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Improve coverage

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update test/components/structures/MainSplit-test.tsx

Co-authored-by: David Baker <dbkr@users.noreply.github.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2024-10-04 09:41:00 +00:00
David Baker
67cb8b7590
Force verification even for refreshed clients (#44)
* Force verification even for refreshed cients

Set a flag on login to remember that the device needs to be verified
so that we don't forget if the user refreshes the page, but still allow
user with an existing unverified session to stay logged in.

* Hopefully make matrixchat tests pass?

Much, much tweaking to make the matrixchat tests pass again. Should
hopefully make them a bit more solid in general with judicious use of
waitFor rather than flushPromises(). Also lots of fun to stop the state
bleeding between tests.

* Manual yarn.lock manipulation

to hopefully resolve infinite package sadness

* Make final test pass(?)

Mock out the createClient method to return the same client, because
we've mocked the peg to always return that client, so if we let the
code make another one having still overridden the peg, everything becomes
cursed.

Also mock out the autodiscovery stuff rather than relying on fetch-mock.

* another waitFor

* death to flushPromises

* Put the logged in dispatch back

Actually it breaks all sorts of other things too, having fixed all the
MatrixChat tests (although this is useful anyway).

* Try displaying the screen in onClientStarted instead

* Put post login screen back in logged in

but move ready transition to avoid flash of main UI

* Rejig more in the hope it does the right thing

* Make hook work before push rules are fetched

* Add test for unskippable verification

* Add test for use case selection

* Fix test

* Add playwright test for unskippable verification

* Remove console log

* Add log message to log line

* Add tsdoc

* Use useTypedEventEmitter

* Remove commented code

* Use catch instead of empty then on unawaited promises

or in one case just await it because the caller was async anyway

* Add new mock
2024-10-03 08:55:06 +00:00
renovate[bot]
107ba592c8
Update dependency @types/express to v5 (#117)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-01 19:08:37 +00:00
RiotRobot
aa3096ab79 v1.11.80-rc.0 2024-10-01 15:17:28 +00:00
RiotRobot
c44555cdf0 Upgrade dependency to matrix-react-sdk@3.112.0-rc.0 2024-10-01 15:08:37 +00:00
RiotRobot
60cf3ce192 Upgrade dependency to matrix-js-sdk@34.7.0-rc.0 2024-10-01 14:56:42 +00:00
David Baker
ebd632cf47 Merge remote-tracking branch 'origin/staging' into develop 2024-10-01 15:21:47 +01:00
RiotRobot
ec60099105 v1.11.79 2024-10-01 12:03:22 +00:00
RiotRobot
14dc9a0418 Upgrade dependency to matrix-react-sdk@3.111.0 2024-10-01 11:59:43 +00:00
renovate[bot]
7721c9e410
Update dependency typescript to v5.6.2 2024-09-26 14:42:40 +00:00
renovate[bot]
81192f6989
Update dependency typescript to v5.6.2 (#71)
* Update dependency typescript to v5.6.2

* Fix TS errors

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
2024-09-26 14:25:49 +00:00
RiotRobot
fed93f5759 Reset matrix-react-sdk back to develop branch 2024-09-24 12:52:57 +00:00
RiotRobot
95b981a203 Merge branch 'master' into develop 2024-09-24 12:52:41 +00:00
RiotRobot
8b7dafffc9 v1.11.78 2024-09-24 12:49:41 +00:00
RiotRobot
8fa6acd0f0 Upgrade dependency to matrix-react-sdk@3.110.0 2024-09-24 12:46:21 +00:00
RiotRobot
e92d75b4fd Upgrade dependency to matrix-js-sdk@34.6.0 2024-09-24 12:39:34 +00:00
renovate[bot]
a37d5d6a2b
Update dependency @types/react to v17.0.82 2024-09-23 10:12:31 +00:00
renovate[bot]
47a9377d63
Update dependency @types/react to v17.0.82 (#66)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-23 09:47:09 +00:00
renovate[bot]
d56b9ed9bd
Update dependency eslint to v8.57.1 (#68)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-23 08:13:49 +00:00
David Baker
f81f82c404
Merge pull request #28083 from element-hq/renovate/major-css
Update dependency postcss-mixins to v11
2024-09-20 09:10:27 +00:00
renovate[bot]
19166b57ba
Update dependency chokidar to v4 2024-09-19 22:31:58 +00:00
renovate[bot]
b055908fa4
Update dependency css-tree to v3 (#74)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-19 22:00:02 +00:00
David Baker
8a4990b56a
Merge pull request #28082 from element-hq/renovate/concurrently-9.x
Update dependency concurrently to v9
2024-09-19 21:59:41 +00:00
renovate[bot]
87f2b6fb0b
Update dependency postcss-mixins to v11 2024-09-19 19:27:16 +00:00
renovate[bot]
5a84da09cc
Update dependency concurrently to v9 2024-09-19 19:26:50 +00:00
renovate[bot]
4535503e71
Update dependency eslint to v8.57.1 2024-09-19 19:25:14 +00:00
RiotRobot
9ac9bc77aa v1.11.78-rc.0 2024-09-19 12:38:16 +00:00
RiotRobot
a3e7ab0bb4 Upgrade dependency to matrix-react-sdk@3.110.0-rc.1 2024-09-19 11:20:28 +00:00
RiotRobot
6512b236cd Upgrade dependency to matrix-js-sdk@34.6.0-rc.0 2024-09-18 13:32:50 +00:00
David Baker
191b1dd570 Merge remote-tracking branch 'origin/staging' into develop 2024-09-18 13:44:42 +01:00