PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
12299 commits 1 branch 0 tags 338 MiB
Commit graph

996 commits

Author SHA1 Message Date
dependabot[bot]
d2549263e4
Bump loader-utils from 2.0.2 to 2.0.3 (#23730) 
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.3/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.2...v2.0.3)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-08 13:43:01 +00:00
RiotRobot
fde64885ae Upgrade matrix-react-sdk to 3.60.0-rc.2 2022-11-08 13:15:00 +00:00
renovate[bot]
65b8bc196a
Update dependency loader-utils to v2 [SECURITY] (#23717) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-11-07 12:13:59 +00:00
Michael Telatynski
1b51456718
Update to @casualbot/jest-sonar-reporter (#23690) 2022-11-03 14:54:21 +00:00
Michael Telatynski
b92dd88303
Add eslint rule unicorn/no-instanceof-array (#23667) 2022-11-02 18:13:30 -04:00
renovate[bot]
0e36757780
Update jest monorepo to v29.2.1 (#23674) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-11-02 09:25:40 +00:00
renovate[bot]
5a734685d9
Update typescript-eslint monorepo to v5.42.0 (#23678) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-11-02 08:51:10 +00:00
renovate[bot]
235d6bce5d
Update dependency @babel/runtime to v7.20.1 (#23675) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-11-01 15:37:00 -04:00
RiotRobot
b467ec1072 Upgrade matrix-react-sdk to 3.60.0-rc.1 2022-11-01 14:56:34 +00:00
RiotRobot
730c576d48 Upgrade matrix-js-sdk to 21.1.0-rc.1 2022-11-01 14:50:54 +00:00
RiotRobot
1176e51b5f Reset matrix-react-sdk back to develop branch 2022-11-01 10:09:16 +00:00
RiotRobot
42b73de184 Reset matrix-js-sdk back to develop branch 2022-11-01 10:08:58 +00:00
RiotRobot
8eafb70327 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-11-01 10:08:19 +00:00
RiotRobot
3402b388a1 Upgrade matrix-react-sdk to 3.59.1 2022-11-01 09:38:52 +00:00
RiotRobot
8f466061c3 Upgrade matrix-js-sdk to 21.0.1 2022-11-01 09:37:16 +00:00
RiotRobot
5da11ae436 Reset matrix-react-sdk back to develop branch 2022-10-26 16:51:36 +01:00
RiotRobot
fe0280cbf0 Reset matrix-js-sdk back to develop branch 2022-10-26 16:51:25 +01:00
RiotRobot
3f192f927c Merge branch 'master' into develop 2022-10-26 16:51:07 +01:00
ElementRobot
446d944888
Fix config.json failing to load for Jitsi wrapper in non-root deployment (#23577) (#23615) 
(cherry picked from commit a3ece528e5)

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2022-10-26 16:41:58 +01:00
RiotRobot
2f49467152 Reset matrix-react-sdk back to develop branch 2022-10-25 18:07:27 +01:00
RiotRobot
b4399402a6 Reset matrix-js-sdk back to develop branch 2022-10-25 18:06:42 +01:00
RiotRobot
b3ed90a9b3 Merge branch 'master' into develop 
# Conflicts:
#	yarn.lock
 2022-10-25 18:05:52 +01:00
RiotRobot
5f38137734 Upgrade matrix-react-sdk to 3.59.0 2022-10-25 17:48:39 +01:00
RiotRobot
748c900dce Upgrade matrix-js-sdk to 21.0.0 2022-10-25 17:47:47 +01:00
RiotRobot
629341894b Upgrade matrix-react-sdk to 3.59.0-rc.2 2022-10-24 17:05:23 +01:00
RiotRobot
416ca55fa9 Upgrade matrix-js-sdk to 21.0.0-rc.2 2022-10-24 17:04:14 +01:00
Michael Telatynski
a3ece528e5
Fix config.json failing to load for Jitsi wrapper in non-root deployment (#23577) 2022-10-24 13:48:32 +01:00
renovate[bot]
b924594c19
Update jest monorepo to v29.2.0 (#23544) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-10-21 12:07:56 +00:00
renovate[bot]
663754e7ed
Update typescript-eslint monorepo to v5.40.1 (#23525) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-10-21 12:57:51 +01:00
renovate[bot]
189f4c53b2
Update babel monorepo (#23524) 
* Update babel monorepo

* Update yarn.lock

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2022-10-20 15:27:24 +00:00
RiotRobot
e4e2738c3c Upgrade matrix-react-sdk to 3.59.0-rc.1 2022-10-18 14:23:41 +01:00
RiotRobot
a7478f58ae Upgrade matrix-js-sdk to 21.0.0-rc.1 2022-10-18 14:21:49 +01:00
Michael Telatynski
172f2f3993
Fix tests and convert to RTL (#23474) 2022-10-13 09:22:34 +01:00
Michael Telatynski
2ef6abbfb8
Move from browser-request to fetch (#23427) 2022-10-12 18:59:10 +01:00
RiotRobot
44eeb6fddc Reset matrix-react-sdk back to develop branch 2022-10-11 18:04:37 +01:00
RiotRobot
7afa416ed5 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-10-11 18:03:36 +01:00
RiotRobot
e356c38948 Upgrade matrix-react-sdk to 3.58.1 2022-10-11 17:55:10 +01:00
RiotRobot
d1f7454dc0 Reset matrix-react-sdk back to develop branch 2022-10-11 14:10:12 +01:00
RiotRobot
3bf3237774 Reset matrix-js-sdk back to develop branch 2022-10-11 14:09:53 +01:00
RiotRobot
f0e6673fec Merge branch 'master' into develop 2022-10-11 14:09:34 +01:00
RiotRobot
2aae3de956 Upgrade matrix-react-sdk to 3.58.0 2022-10-11 14:02:50 +01:00
RiotRobot
c61556e885 Upgrade matrix-js-sdk to 20.1.0 2022-10-11 14:01:39 +01:00
RiotRobot
5f355bf25e Upgrade matrix-react-sdk to 3.58.0-rc.2 2022-10-05 14:16:02 +01:00
RiotRobot
1708f7f1b8 Upgrade matrix-js-sdk to 20.1.0-rc.2 2022-10-05 13:48:58 +01:00
renovate[bot]
fb686ec5b6
Update dependency jest-mock to v29 (#23421) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-10-04 22:18:56 +01:00
renovate[bot]
1d86a75a29
Update typescript-eslint monorepo to v5.39.0 (#23420) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-10-04 22:18:33 +01:00
renovate[bot]
ee5b20e12e
Update jest monorepo to v29.1.1 (#23418) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-10-04 17:57:36 +01:00
renovate[bot]
c8184e2497
Update babel monorepo to v7.19.3 (#23417) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-10-04 16:34:12 +00:00
RiotRobot
e5dcb6e8c2 Upgrade matrix-react-sdk to 3.58.0-rc.1 2022-10-04 14:44:19 +01:00
RiotRobot
db89364395 Upgrade matrix-js-sdk to 20.1.0-rc.1 2022-10-04 14:26:21 +01:00
RiotRobot
8e841be393 Reset matrix-react-sdk back to develop branch 2022-09-28 16:07:23 +01:00
RiotRobot
1b164dbc42 Reset matrix-js-sdk back to develop branch 2022-09-28 16:07:01 +01:00
RiotRobot
5ae4d0b8c9 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-09-28 16:06:22 +01:00
RiotRobot
2d0becc8c5 Upgrade matrix-react-sdk to 3.57.0 2022-09-28 15:59:24 +01:00
RiotRobot
a074636773 Upgrade matrix-js-sdk to 20.0.0 2022-09-28 15:59:01 +01:00
RiotRobot
9009e62cc6 Reset matrix-react-sdk back to develop branch 2022-09-28 14:29:17 +01:00
RiotRobot
dca486ca10 Reset matrix-js-sdk back to develop branch 2022-09-28 14:29:01 +01:00
RiotRobot
fa966348ee Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-09-28 14:27:56 +01:00
RiotRobot
a529afc133 Upgrade matrix-react-sdk to 3.56.0 2022-09-28 14:20:52 +01:00
RiotRobot
2ba9c13165 Upgrade matrix-js-sdk to 19.7.0 2022-09-28 14:20:28 +01:00
RiotRobot
40ba9c76b1 Reset deps back to develop branch 2022-09-27 20:15:57 +01:00
RiotRobot
958f4d6b86 Merge branch 'master' into develop 2022-09-27 20:04:30 +01:00
RiotRobot
4552cb9778 Upgrade matrix-react-sdk to 3.55.0 2022-09-27 18:21:25 +01:00
RiotRobot
51117fa11f Upgrade matrix-js-sdk to 19.6.0 2022-09-27 18:20:47 +01:00
Robin
c797c06f92
Fix the lockfile, take 4 (#23349) 2022-09-24 07:55:34 +02:00
Michael Telatynski
5ec96f5abe
Add test coverage (#23341) 2022-09-23 09:42:03 +01:00
Robin
31b4dae26b
Fix the lockfile (#23343) 2022-09-22 15:37:17 -06:00
renovate[bot]
287a73506c
Update all (#23325) 
* Update all

* Hold some upgrades back

* Fix yarn.lock

* Revert @types/react

* Hold back `typescript`

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2022-09-21 10:59:14 +00:00
renovate[bot]
8de92bb14b
Update jest monorepo to v29.0.3 (#23321) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-09-21 08:25:25 +00:00
renovate[bot]
991fee51c5
Update babel monorepo to v7.19.1 (#23320) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-09-21 09:13:09 +01:00
renovate[bot]
d1754559ad
Update typescript-eslint monorepo to v5.38.0 (#23322) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-09-21 08:26:38 +02:00
RiotRobot
b87ecc3ae5 Upgrade matrix-react-sdk to 3.55.0-rc.1 2022-09-20 14:35:38 +01:00
RiotRobot
fc8920a69a Upgrade matrix-js-sdk to 19.6.0-rc.1 2022-09-20 14:24:15 +01:00
Robin
461bd8c572
Update matrix-widget-api to 1.1.1 (#23236) 
* Update matrix-widget-api to 1.1.0

* Upgrade matrix-widget-api to 1.1.1
 2022-09-14 14:18:21 +00:00
Robin
1617ab45db
Fix the lockfile (#23278) 2022-09-14 14:42:42 +01:00
RiotRobot
6e2f66987c Merge branch 'master' into develop 
# Conflicts:
#	package.json
 2022-09-13 13:11:15 +01:00
RiotRobot
f5ffd4dd77 Upgrade matrix-react-sdk to 3.54.0 2022-09-13 13:03:03 +01:00
RiotRobot
226e189c4a Upgrade matrix-js-sdk to 19.5.0 2022-09-13 13:02:26 +01:00
renovate[bot]
665f532301
Update all (#23223) 
* Update all

* Upgrade @types

* Update lockfile

* Make typescript happier

* Make webpack happier, pin postcss-hexrgba

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2022-09-09 21:03:46 -06:00
Travis Ralston
db3ca10c91
Upgrade postcss-scss (#23229) 
* Upgrade postcss-scss

The version conflict with the react-sdk can cause issues.

* Upgrade mini-css-extract-plugin too

* Actually add postcss as a dependency
 2022-09-07 09:44:26 -06:00
renovate[bot]
5814bcfd99
Update jest monorepo to v29 (#23231) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-09-07 08:13:01 +00:00
renovate[bot]
e8aa7edbdc
Update babel monorepo to v7.19.0 (#23227) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-09-06 22:02:54 -06:00
renovate[bot]
15f046a344
Update typescript-eslint monorepo to v5.36.2 (#23228) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-09-06 22:02:27 -06:00
renovate[bot]
24947ad280
Update dependency @types/jest to v28.1.8 (#23224) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-09-06 22:06:02 +01:00
RiotRobot
c3d4bfc05e Upgrade matrix-react-sdk to 3.54.0-rc.1 2022-09-06 13:33:03 +01:00
RiotRobot
46dcd771f1 Upgrade matrix-js-sdk to 19.5.0-rc.4 2022-09-06 13:27:05 +01:00
RiotRobot
7ade21ad9b Reset matrix-react-sdk back to develop branch 2022-08-31 16:49:07 +01:00
RiotRobot
900df8ce16 Reset matrix-js-sdk back to develop branch 2022-08-31 16:48:56 +01:00
RiotRobot
9d830f4837 Upgrade matrix-react-sdk to 3.53.0 2022-08-31 16:41:14 +01:00
RiotRobot
269ffe385a Upgrade matrix-js-sdk to 19.4.0 2022-08-31 16:40:28 +01:00
RiotRobot
89691b19fd Upgrade matrix-react-sdk to 3.53.0-rc.2 2022-08-25 16:54:00 +01:00
RiotRobot
09562bccf6 Upgrade matrix-react-sdk to 3.53.0-rc.1 2022-08-23 11:04:30 +01:00
RiotRobot
0b23334ed2 Upgrade matrix-js-sdk to 19.4.0-rc.1 2022-08-23 11:04:08 +01:00
RiotRobot
65edff3821 Reset matrix-react-sdk back to develop branch 2022-08-16 16:19:31 +01:00
RiotRobot
5946f1cd87 Reset matrix-js-sdk back to develop branch 2022-08-16 16:19:19 +01:00
renovate[bot]
39eee10c57
Update all (#23052) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-08-11 08:08:17 +01:00
Robin
2cd0bb7312
Upgrade matrix-widget-sdk (#23029) 
* Upgrade matrix-widget-sdk

* Remove matrix-react-sdk's old dependency
 2022-08-10 12:58:31 +00:00
t3chguy
9d05e01907 [create-pull-request] automated change 2022-08-10 07:36:52 +00:00
renovate[bot]
2a38ccbd77
Update babel monorepo to v7.18.10 (#23040) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-08-10 07:27:20 +01:00
renovate[bot]
22f011bdbf
Update typescript-eslint monorepo to v5.33.0 (#23041) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-08-10 07:27:06 +01:00
RiotRobot
fc6c859976 Reset matrix-react-sdk back to develop branch 2022-08-03 09:23:24 +01:00
RiotRobot
bf9d69cd1b Reset matrix-js-sdk back to develop branch 2022-08-03 09:23:09 +01:00
RiotRobot
f103492e50 Merge branch 'master' into develop 2022-08-03 09:22:31 +01:00
RiotRobot
ef7dab792d Upgrade matrix-react-sdk to 3.51.0 2022-08-02 17:15:19 +01:00
RiotRobot
4a789991c8 Upgrade matrix-js-sdk to 19.2.0 2022-08-02 17:14:31 +01:00
Michael Weimann
c4593091d6
Update matrix-org/react (enzyme deprecation) (#22959) 2022-08-02 12:15:38 +02:00
Kerry
f4480c9968
Update jest to v28 (#22946) 
* Update jest monorepo to v28

* stop using deprecated jest-environment-jsdom-sixteen, set testURL

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-07-28 14:03:38 +02:00
renovate[bot]
267179aac0
Update babel monorepo to v7.18.9 (#22942) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-07-28 09:31:26 +01:00
renovate[bot]
a620ff2b6a
Update typescript-eslint monorepo to v5.31.0 (#22943) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2022-07-28 08:15:56 +02:00
Germain
03cce754d4
Disallow invalid inline style comments in stylesheets (#22930) 2022-07-27 14:39:22 +01:00
RiotRobot
bf0a05798c Upgrade matrix-react-sdk to 3.51.0-rc.1 2022-07-26 17:58:42 +01:00
RiotRobot
2fa98d7ad6 Upgrade matrix-js-sdk to 19.2.0-rc.1 2022-07-26 17:58:01 +01:00
RiotRobot
ebfa4c4b09 Reset matrix-react-sdk back to develop branch 2022-07-26 16:50:48 +01:00
RiotRobot
6726a1d3e9 Reset matrix-js-sdk back to develop branch 2022-07-26 16:50:36 +01:00
RiotRobot
3de75c20c1 Merge branch 'master' into develop 
# Conflicts:
#	yarn.lock
 2022-07-26 16:49:20 +01:00
RiotRobot
9f53b83bdb Upgrade matrix-react-sdk to 3.49.0 2022-07-26 16:41:50 +01:00
RiotRobot
caf6a1ce62 Upgrade matrix-js-sdk to 19.1.0 2022-07-26 16:41:27 +01:00
Hubert Chathi
b3b8e2e0a2
Merge pull request #22906 from uhoreg/olm_3.2.12 
bump olm version to match bump in matrix-js-sdk
 2022-07-21 08:17:59 -04:00
dependabot[bot]
a6a1e1fffd
Bump terser from 4.8.0 to 4.8.1 (#22900) 2022-07-20 16:06:37 +02:00
Hubert Chathi
dd82f4b47d bump olm version to match bump in matrix-js-sdk 2022-07-20 09:21:11 -04:00
Michael Telatynski
64ed6ebdad
Rename PostCSS files to .pcss (#22769) 
* Rename PostCSS files to `.pcss`

* Make Stylelint happy

* Make Stylelint happy v2

* Update CompatibilityView.tsx

* Update res/css/structures/ErrorView.pcss

Co-authored-by: Michael Weimann <mail@michael-weimann.eu>

* Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/pcss

 Conflicts:
	package.json
	res/css/_components.scss
	res/css/structures/_NotificationPanel.pcss
	res/css/views/dialogs/_SpotlightDialog.pcss
	res/css/views/rooms/_EventTile.pcss
	res/css/views/rooms/_ReadReceiptGroup.pcss
	yarn.lock

* Only use CI_PACKAGE mode on develop, it skips minification which can find some errors

* Keep name to not break existing PRs

Co-authored-by: Michael Weimann <mail@michael-weimann.eu>
 2022-07-15 14:53:21 +01:00
RiotRobot
73df4077da Upgrade matrix-react-sdk to 3.49.0-rc.2 2022-07-15 14:51:16 +01:00
ElementRobot
9414af4dca
Upgrade dependencies (#22428) 
* [create-pull-request] automated change

* Pin postcss-hexrgba as 2.1.0 needs postcss 8

* Bump typescript version

Co-authored-by: t3chguy <t3chguy@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2022-07-13 17:11:22 +01:00
Šimon Brandner
e1d4817d54
Add a script to check for dead code (#22793) 2022-07-13 10:04:32 +02:00
RiotRobot
c12f51c7ab Upgrade matrix-react-sdk to 3.49.0-rc.1 2022-07-12 14:20:19 +01:00
RiotRobot
3b109fbaeb Upgrade matrix-js-sdk to 19.1.0-rc.1 2022-07-12 14:13:54 +01:00
Travis Ralston
f1e5b95554
Wire up module loading to application startup (#21703) 
* Early module loader bundler

* Add a module installer script

* Add dev-friendly docs

* Add real module-api dependency

* Speed up `yarn add` for mulitple modules

* Fix version check for modules

* Appease the linter
 2022-07-05 12:26:54 -06:00
RiotRobot
f03200f8e6 Reset matrix-react-sdk back to develop branch 2022-07-05 14:36:58 +01:00
RiotRobot
1070081217 Reset matrix-js-sdk back to develop branch 2022-07-05 14:36:48 +01:00
RiotRobot
2b29c24483 Upgrade matrix-react-sdk to 3.48.0 2022-07-05 14:24:28 +01:00
RiotRobot
9c40422b7d Upgrade matrix-js-sdk to 19.0.0 2022-07-05 14:18:42 +01:00
RiotRobot
abc4c62fe4 Upgrade matrix-react-sdk to 3.48.0-rc.1 2022-06-28 16:25:53 +01:00
RiotRobot
323fb47c79 Upgrade matrix-js-sdk to 19.0.0-rc.1 2022-06-28 16:25:16 +01:00
Michael Telatynski
ab8cfa2d28
Update matrix-web-i18n (#22666) 2022-06-28 14:15:50 +01:00
dependabot[bot]
9eda502a9b
Bump jsrsasign from 10.5.20 to 10.5.25 (#22646) 
Bumps [jsrsasign](https://github.com/kjur/jsrsasign) from 10.5.20 to 10.5.25.
- [Release notes](https://github.com/kjur/jsrsasign/releases)
- [Changelog](https://github.com/kjur/jsrsasign/blob/master/ChangeLog.txt)
- [Commits](https://github.com/kjur/jsrsasign/compare/10.5.20...10.5.25)

---
updated-dependencies:
- dependency-name: jsrsasign
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-26 14:39:04 -06:00
RiotRobot
b69d4b6346 Reset matrix-react-sdk back to develop branch 2022-06-14 14:49:43 +01:00
RiotRobot
a7260f004e Reset matrix-js-sdk back to develop branch 2022-06-14 14:49:30 +01:00
RiotRobot
b400463ff3 Merge branch 'master' into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2022-06-14 14:48:50 +01:00
RiotRobot
e0adf93e21 Upgrade matrix-react-sdk to 3.47.0 2022-06-14 14:29:51 +01:00
RiotRobot
1f3826f3ce Reset matrix-react-sdk back to develop branch 2022-06-07 12:22:33 +01:00
RiotRobot
91c56831d1 Reset matrix-js-sdk back to develop branch 2022-06-07 12:22:20 +01:00
RiotRobot
59d90b3a69 Upgrade matrix-react-sdk to 3.46.0 2022-06-07 12:16:33 +01:00
RiotRobot
e89892c4d5 Upgrade matrix-js-sdk to 18.1.0 2022-06-07 12:15:43 +01:00
RiotRobot
82a564a1be Upgrade matrix-react-sdk to 3.46.0-rc.1 2022-05-31 11:51:35 +01:00
RiotRobot
fa585521d0 Upgrade matrix-js-sdk to 18.1.0-rc.1 2022-05-31 11:50:00 +01:00
Kerry
e92d44eb56
matrix-mock-request to 2.0 (#22395) 2022-05-30 13:20:50 +01:00
RiotRobot
863e5f6c78 Reset matrix-react-sdk back to develop branch 2022-05-24 15:14:34 +01:00
RiotRobot
4e6836d00e Reset matrix-js-sdk back to develop branch 2022-05-24 15:14:21 +01:00
RiotRobot
1cdbcf29ce Merge branch 'master' into develop 
# Conflicts:
#	yarn.lock
 2022-05-24 15:13:38 +01:00
RiotRobot
bf1f297bed Upgrade matrix-react-sdk to 3.45.0 2022-05-24 13:35:48 +01:00