Commit graph

1217 commits

Author SHA1 Message Date
Michael Telatynski
bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7 2021-06-22 22:34:15 +01:00
Michael Telatynski
6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
2021-06-22 21:15:53 +01:00
Michael Telatynski
28c61cca27 Remove pinned resolution for @types/react to 16.x 2021-06-22 17:56:52 +01:00
Michael Telatynski
a839d0f396 More typescript conversion 2021-06-22 17:23:13 +01:00
Michael Telatynski
deb075777d Upgrade @types/react and @types/react-dom 2021-06-22 08:17:22 +01:00
RiotRobot
54c3832b5b Resetting package fields for development 2021-06-21 16:54:41 +01:00
RiotRobot
d89710defe v3.24.0 2021-06-21 16:53:20 +01:00
RiotRobot
174a43f1ef Upgrade matrix-js-sdk to 12.0.0 2021-06-21 16:37:49 +01:00
RiotRobot
2eb7d35ea1 v3.24.0-rc.1 2021-06-15 16:22:34 +01:00
RiotRobot
b3912dc5b8 Upgrade matrix-js-sdk to 12.0.0-rc.1 2021-06-15 16:16:42 +01:00
Germain Souquet
4a23ebae1e upgrade matrix-react-test-utils for react 17 peer deps 2021-06-15 12:00:44 +01:00
Michael Telatynski
66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	yarn.lock
2021-06-14 21:39:06 +01:00
Germain Souquet
84679cf8ec remove legacy polyfills and unused dependencies 2021-06-11 12:19:14 +01:00
Germain Souquet
6e0a908c59 Merge branch 'develop' into gsouquet/react-17 2021-06-09 12:01:35 +01:00
Germain Souquet
85d1bb65c6 Upgrade to React@17 2021-06-09 11:40:20 +01:00
RiotRobot
8ccdf9a3e8 Reset matrix-js-sdk back to develop branch 2021-06-07 17:43:27 +01:00
RiotRobot
bcd0ba8d45 Resetting package fields for development 2021-06-07 17:42:46 +01:00
RiotRobot
a3dac02e4c v3.23.0 2021-06-07 17:41:18 +01:00
RiotRobot
dd089bf969 Upgrade matrix-js-sdk to 11.2.0 2021-06-07 17:03:05 +01:00
Michael Telatynski
e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +01:00
Michael Telatynski
0b7d3f007a Remove react-beautiful-dnd 2021-06-01 17:35:31 +01:00
RiotRobot
300b0016d6 v3.23.0-rc.1 2021-06-01 16:18:26 +01:00
RiotRobot
0c5e8ef381 Upgrade matrix-js-sdk to 11.2.0-rc.1 2021-06-01 16:13:01 +01:00
RiotRobot
7123abc122 Reset matrix-js-sdk back to develop branch 2021-05-24 17:26:24 +01:00
RiotRobot
f8ef2d42f5 Resetting package fields for development 2021-05-24 17:25:58 +01:00
RiotRobot
fbc01d4930 v3.22.0 2021-05-24 17:20:31 +01:00
RiotRobot
ad30e89967 Upgrade matrix-js-sdk to 11.1.0 2021-05-24 17:15:16 +01:00
Hubert Chathi
140258d3d6 bump to olm 3.2.3 2021-05-24 16:29:54 +01:00
Hubert Chathi
73221e4d08 Bump libolm version. 2021-05-24 16:29:54 +01:00
RiotRobot
10bc96dc37 v3.22.0-rc.1 2021-05-19 14:40:37 +01:00
RiotRobot
7d0f3b0d99 Upgrade matrix-js-sdk to 11.1.0-rc.1 2021-05-19 14:33:21 +01:00
Travis Ralston
7cdca77f39 Update widget-api 2021-05-17 16:27:48 -06:00
RiotRobot
12a9ce1a94 Reset matrix-js-sdk back to develop branch 2021-05-17 13:50:34 +01:00
RiotRobot
9d46fa7b99 Resetting package fields for development 2021-05-17 13:50:24 +01:00
RiotRobot
f5a6864ca9 Merge branch 'master' into develop 2021-05-17 13:50:23 +01:00
RiotRobot
3673292c34 v3.21.0 2021-05-17 13:49:00 +01:00
RiotRobot
6c066ee401 Upgrade matrix-js-sdk to 11.0.0 2021-05-17 13:33:45 +01:00
Travis Ralston
d1cfde6f12
Merge pull request #5989 from matrix-org/travis/voicemessages/safari
Support voice messages on Safari
2021-05-11 10:12:31 -06:00
RiotRobot
392505e7a1 v3.21.0-rc.1 2021-05-11 16:36:53 +01:00
RiotRobot
965b0ab58d Upgrade matrix-js-sdk to 11.0.0-rc.1 2021-05-11 16:28:00 +01:00
J. Ryan Stinnett
49f1dd37f2 Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types 2021-05-11 09:42:58 +01:00
J. Ryan Stinnett
3e68d73597 Upgrade sanitize types 2021-05-10 17:43:10 +01:00
J. Ryan Stinnett
7821e00bc6 Revert to internal option 2021-05-10 17:36:33 +01:00
J. Ryan Stinnett
f41fc7e46c Upgrade cheerio and resolve type errors
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
2021-05-10 16:10:39 +01:00
RiotRobot
1b372b17e0 Reset matrix-js-sdk back to develop branch 2021-05-10 15:23:03 +01:00
RiotRobot
82642f17fd Resetting package fields for development 2021-05-10 15:22:30 +01:00
RiotRobot
3e534b5d30 Merge branch 'master' into develop 2021-05-10 15:22:12 +01:00
RiotRobot
f68013524c v3.20.0 2021-05-10 15:02:08 +01:00
J. Ryan Stinnett
7f4c525d62 Switch back to release version of sanitize-html
The limit depth option has been available in a released version for a while now.
2021-05-10 14:57:35 +01:00
RiotRobot
a11c3a22c9 Upgrade matrix-js-sdk to 10.1.0 2021-05-10 14:55:31 +01:00