Commit Graph

63001 Commits

Author SHA1 Message Date
Michael Telatynski
b4891715c0 Update CHANGELOG.md 2023-11-21 11:37:24 +00:00
RiotRobot
23eb48132a Reset matrix-js-sdk back to develop branch 2023-11-21 11:36:19 +00:00
RiotRobot
0ea2091b2d Reset matrix-react-sdk back to develop branch 2023-11-21 11:36:10 +00:00
RiotRobot
2debdda2b3 Merge branch 'master' into develop 2023-11-21 11:35:52 +00:00
Michael Telatynski
4bd9336be1 Update release-gitflow.yml 2023-11-21 11:35:01 +00:00
RiotRobot
38dd45a51c v1.11.50 v1.11.50 2023-11-21 11:21:42 +00:00
RiotRobot
af3f25eb4d Upgrade matrix-js-sdk to 30.1.0 2023-11-21 11:21:41 +00:00
RiotRobot
c8b916fdff Upgrade matrix-react-sdk to 3.85.0 2023-11-21 11:21:32 +00:00
RiotRobot
c968f11833 Reset matrix-js-sdk back to develop branch 2023-11-21 11:09:46 +00:00
RiotRobot
4b6eb9b171 Resetting package fields for development 2023-11-21 11:09:37 +00:00
RiotRobot
feb4a4a559 Merge branch 'master' into develop 2023-11-21 11:09:36 +00:00
RiotRobot
a869ff1750 v3.85.0 2023-11-21 11:07:51 +00:00
RiotRobot
bf456e59bf Upgrade matrix-js-sdk to 30.1.0 2023-11-21 11:07:50 +00:00
R Midhun Suresh
6b78c95cfb Provide commit hash (#11896) 2023-11-21 06:33:35 +00:00
Kerry
20fd1111c8 set disabled state on invite to room button in memberlist (#11893) 2023-11-21 01:43:32 +00:00
Michael Telatynski
2f0eb8fb05 Fix ended polls overlapping event bubbles (#11895)
* Fix ended polls overlapping event bubbles

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

* Update snapshot

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

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-11-20 17:27:54 +00:00
Richard van der Hoff
fc37f2d0e3 Remove workaround for rust-SDK bug (#11900)
Now that https://github.com/matrix-org/matrix-rust-sdk/issues/2193 is fixed, I
believe we can remove this
2023-11-20 12:49:42 +00:00
Johannes Marbach
619f36b82a Merge pull request #26229 from vector-im/johannes/webpack-5 2023-11-20 13:30:36 +01:00
Richard van der Hoff
2cb5e0771b Reduce amount of log spam (#11898) 2023-11-20 12:24:13 +00:00
Johannes Marbach
0a03b09f5d Merge pull request #11869 from matrix-org/johannes/webpack-5 2023-11-20 13:30:30 +01:00
Johannes Marbach
e069d87afa Merge branch 'develop' into johannes/webpack-5 2023-11-20 11:22:22 +01:00
Michael Telatynski
4a519916e5 Add documentation around releases (#26602) 2023-11-20 09:58:18 +00:00
Michael Telatynski
25ca51a41c Disable axe check which only fails in Chrome (#11909)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-11-20 09:58:09 +00:00
Johannes Marbach
9af4038fa0 Merge branch 'develop' into johannes/webpack-5 2023-11-20 09:42:39 +01:00
Richard van der Hoff
29ed91749e EditWysiwygComposer-test: wait for the wasm to load in beforeAll (#11904) 2023-11-19 21:15:23 +00:00
Johannes Marbach
37c1c4e8ae Set es2022 globally but force CommonJS when using ts-node for scripts 2023-11-19 20:38:51 +01:00
Johannes Marbach
d43debce8a Merge branch 'develop' into johannes/webpack-5 2023-11-18 21:53:07 +01:00
Johannes Marbach
f46cdd0757 Merge branch 'develop' into johannes/webpack-5 2023-11-18 21:52:51 +01:00
Johannes Marbach
6093cd8fe8 Move worklet rule up to where it used to be 2023-11-18 21:39:17 +01:00
Johannes Marbach
e35b2135b4 Appease the linter 2023-11-18 21:37:49 +01:00
Johannes Marbach
e2fdddaa1f Add custom loader for recorder worklet 2023-11-18 21:37:30 +01:00
Johannes Marbach
980633a7f5 Revert back to worklet-loader compatible syntax 2023-11-18 21:36:11 +01:00
Timo
3c3ec88bba Add feature_disable_call_per_sender_encryption documentation (in labs.md) (#26548)
* add feature_disable_call_per_sender_encryption doc

Co-authored-by: aceArt-GmbH <33117017+aceArt-GmbH@users.noreply.github.com>

---------

Signed-off-by: Timo K <toger5@hotmail.de>
Co-authored-by: aceArt-GmbH <33117017+aceArt-GmbH@users.noreply.github.com>
2023-11-17 17:38:13 +01:00
Andy Balaam
6b73700b05 Merge pull request #11892 from matrix-org/andybalaam/bump-rich-text-editor-to-2-17-0
Bump matrix-wysiwyg to 2.17.0
2023-11-17 13:01:44 +00:00
Johannes Marbach
8114f4dc09 Merge pull request #11894 from matrix-org/midhun/fix-knapsack 2023-11-17 08:33:06 +01:00
R Midhun Suresh
bfab177394 Use github_env 2023-11-17 12:08:19 +05:30
Johannes Marbach
8dbefcc589 Undo auto public path disablement as it doesn't work with workers 2023-11-16 19:39:39 +01:00
Johannes Marbach
4e32b6fbe1 Update copy-webpack-plugin to latest 2023-11-16 19:22:34 +01:00
Johannes Marbach
a56a2268f0 Merge branch 'develop' into johannes/webpack-5 2023-11-16 19:20:22 +01:00
Johannes Marbach
d6ea051e46 Merge branch 'develop' into johannes/webpack-5 2023-11-16 18:59:39 +01:00
R Midhun Suresh
085b39c7af Use knapsack pro to speed up cypress tests (#11863)
* Install knapsack pro

* Use knapsack pro command

* Lint

* Use chrome

* Add test file pattern

* Use two different tokens for knapsack

* Use the correct secret

* Update lockfile

* Fix conflict

* Remove redundant options

* Add explaining comment

* Remove outdated variables and steps

* Update comment

* Fix conflict

* Use the chrome we setup earlier

* Add back percy config

* Set knapsack pro branch

* Use github_env to get browser path

* Add badge to readme

* Update .github/workflows/cypress.yaml

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* Apply prettier

---------

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2023-11-16 16:11:03 +00:00
Johannes Marbach
e6f69f7dce Merge pull request #26599 from vector-im/johannes/copy-webpack-plugin 2023-11-16 14:58:48 +01:00
Andy Balaam
32d1bb0498 Bump matrix-wysiwyg to 2.17.0 2023-11-16 13:54:55 +00:00
Johannes Marbach
710336208f Allow config.json to be missing 2023-11-16 14:45:31 +01:00
Johannes Marbach
47b37c996d Revert "Try explicitly relative path for config.json"
This reverts commit 46ecafa73b.
2023-11-16 14:44:42 +01:00
Johannes Marbach
46ecafa73b Try explicitly relative path for config.json 2023-11-16 14:42:19 +01:00
Johannes Marbach
d2fa827fad Replace copy/watching of non-language assets with copy-webpack-plugin 2023-11-16 14:21:45 +01:00
Timo
62256a3d12 Fix call encryption settings flag update not having effect on running widgets (#11888)
Signed-off-by: Timo K <toger5@hotmail.de>
2023-11-16 11:43:33 +00:00
Michael Telatynski
39801b4c35 Remove unused dependencies and add transitive deps (#11850)
* Remove unused dependencies and add transitive deps

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

* Iterate

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

* prettier

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

* prettier

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

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-11-16 10:42:08 +00:00
Andy Balaam
03b2246068 Disable flaky test 'Reading a thread after a reaction to a redacted message marks the thread as read' (#11890) 2023-11-16 10:21:13 +00:00