Commit Graph

1231 Commits (566e7bc8d6cb655a187c7cd6bcf89ec409d3e19e)

Author SHA1 Message Date
Jaiwanth 544761329c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-24 18:33:30 +05:30
Michael Telatynski f965d449b8
Merge pull request #6249 from SimonBrandner/ts/member-list 2021-06-24 13:25:59 +01:00
Travis Ralston e290fdaabc Update widget-api for https://github.com/matrix-org/matrix-react-sdk/pull/6178 2021-06-23 11:21:56 -06:00
Šimon Brandner b7a821a9e4
.tsx can also be tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:13 +02:00
Germain Souquet 057f46ad9d fix dependency and lockfile mismatch 2021-06-23 08:44:48 +01:00
Jaiwanth b2162c3be9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-23 12:09:46 +05:30
Jaiwanth 438b9d4730 Get rid of jszip and replace it with a custom library 2021-06-23 11:58:50 +05:30
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
Jaiwanth 45be4a6d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-22 09:27:37 +05:30
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
Jaiwanth cff4521106 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-16 10:52:00 +05:30
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
Jaiwanth dbb3614374
Merge branch 'develop' into export-conversations 2021-06-08 18:43:03 +05:30
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
Jaiwanth 5f1c9d0f88 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-05-31 22:58:11 +05:30
Jaiwanth 0ee290648a Add support for firefox 2021-05-25 17:49:18 +05:30
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
Jaiwanth 3147acec0c Switch completely to TypeScript, updated userColors 2021-05-24 18:01:09 +05:30
Jaiwanth ebdb340a5c Create a basic HTML export tool with support only for text based events 2021-05-21 10:50:56 +05:30
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