mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
RiotRobot 2023-02-28 11:20:25 +00:00
commit bfc672c580
3 changed files with 78 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
yarn.lock
View file

@ -1625,10 +1625,10 @@
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.4.tgz#1b20294e0354c3dcc9c7dc810d883198a4042f04"
integrity sha512-mdaDKrw3P5ZVCpq0ioW0pV6ihviDEbS8ZH36kpt9stLKHwwDSopPogE6CkQhi0B1jn1yBUtOYi32mBV/zcOR7g==
"@matrix-org/matrix-wysiwyg@^0.23.0":
version "0.23.0"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.23.0.tgz#32242b18ae9dbb28d920c31f50bbac87ff4317fe"
integrity sha512-wO5KYznlfsSIMo0R8tyZqfvZrPkQMaL1qBHzhaeKIsC4vK4MnJ9mj6JiS6+XiuHJyc9nqN+IdeUjKyJOnStHaA==
"@matrix-org/matrix-wysiwyg@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-1.1.1.tgz#a07b13097e72a9bae220a647527d6418c5423827"
integrity sha512-pp7poyd3vfC/P34ZRj6u2oyLJuex77egeSsIA1MPowBqtrIAmHkji9xviBdXPcDss2zEI4EZuX77JWXtAfaz7Q==
"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz":
version "3.2.12"
@ -8336,9 +8336,10 @@ matrix-events-sdk@0.0.1:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "23.3.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/108f1573249b733870d287e11ce38531a73e15b0"
matrix-js-sdk@23.4.0:
version "23.4.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.4.0.tgz#345c72bd1c5eae26f8db680db64636dda64dc8c1"
integrity sha512-3gHT6IrDYBkFYzaZM052uZXv1WFGoN+q83rTvmTpMtxZYrwosLHb6Y/w/Lfl26y1N1gTDdyQ0Vd3NpSycKmpJA==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.3"
@ -8360,13 +8361,14 @@ matrix-mock-request@^2.5.0:
dependencies:
expect "^28.1.0"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.66.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/49e0228fa025f48034c24e7d9d3fd413575c8acc"
matrix-react-sdk@3.67.0:
version "3.67.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.67.0.tgz#36f38eecede02c7b10b521442bce7d3ed2da5405"
integrity sha512-Q7KoofgEYAyz97wI5gmN4xy9HZfxWLF9r9aM+/Wjn+VBUUs9N38KqRmJmSnUsetE2w5TAV/+m1gulhvtSw+dRw==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.4.0"
"@matrix-org/matrix-wysiwyg" "^0.23.0"
"@matrix-org/matrix-wysiwyg" "^1.1.1"
"@matrix-org/react-sdk-module-api" "^0.0.3"
"@sentry/browser" "^7.0.0"
"@sentry/tracing" "^7.0.0"
@ -8402,7 +8404,7 @@ matrix-mock-request@^2.5.0:
maplibre-gl "^2.0.0"
matrix-encrypt-attachment "^1.0.3"
matrix-events-sdk "0.0.1"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "23.4.0"
matrix-widget-api "^1.1.1"
minimist "^1.2.5"
opus-recorder "^8.0.3"
@ -8420,7 +8422,7 @@ matrix-mock-request@^2.5.0:
react-transition-group "^4.4.1"
rfc4648 "^1.4.0"
sanitize-filename "^1.6.3"
sanitize-html "^2.3.2"
sanitize-html "2.8.0"
tar-js "^0.3.0"
ua-parser-js "^1.0.2"
url "^0.11.0"
@ -11105,6 +11107,18 @@ sanitize-filename@^1.6.3:
dependencies:
truncate-utf8-bytes "^1.0.0"
sanitize-html@2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.8.0.tgz#651d1d0e5b2d61b4ec6147cc46f6d6680eef98ce"
integrity sha512-ZsGyc6avnqgvEm3eMKrcy8xa7WM1MrGrfkGsUgQee2CU+vg3PCfNCexXwBDF/6dEPvaQ4k/QqRjnYKHL8xgNjg==
dependencies:
deepmerge "^4.2.2"
escape-string-regexp "^4.0.0"
htmlparser2 "^8.0.0"
is-plain-object "^5.0.0"
parse-srcset "^1.0.2"
postcss "^8.3.11"
sanitize-html@^2.3.2:
version "2.7.3"
resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.3.tgz#166c868444ee4f9fd7352ac8c63fa86c343fc2bd"