5303 Commits

Author SHA1 Message Date
Germain Souquet 6e0a908c59 Merge branch 'develop' into gsouquet/react-17 2021-06-09 12:01:35 +01:00
Germain Souquet 4b8a05a667 Upgrade to React@17 2021-06-09 11:40:36 +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 2784bc7916 Reset matrix-react-sdk back to develop branch 2021-06-07 17:52:34 +01:00
RiotRobot 8fc12bddd7 Reset matrix-js-sdk back to develop branch 2021-06-07 17:52:24 +01:00
RiotRobot 74d51a3ab5 v1.7.30 2021-06-07 17:48:13 +01:00
RiotRobot 0a3eb467fc Upgrade matrix-react-sdk to 3.23.0 2021-06-07 17:46:00 +01:00
RiotRobot 5da849099f Upgrade matrix-js-sdk to 11.2.0 2021-06-07 17:45:33 +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 8e111e2b9d v1.7.30-rc.1 2021-06-01 16:24:53 +01:00
RiotRobot 122e9ac087 Upgrade matrix-react-sdk to 3.23.0-rc.1 2021-06-01 16:21:14 +01:00
RiotRobot d70c651040 Upgrade matrix-js-sdk to 11.2.0-rc.1 2021-06-01 16:20:57 +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 f78be2631a Reset matrix-react-sdk back to develop branch 2021-05-24 17:49:06 +01:00
RiotRobot a380f9c9f2 Reset matrix-js-sdk back to develop branch 2021-05-24 17:48:59 +01:00
RiotRobot 3a67dc18e9 v1.7.29 2021-05-24 17:40:21 +01:00
RiotRobot cef446d7fa Upgrade matrix-react-sdk to 3.22.0 2021-05-24 17:28:39 +01:00
RiotRobot 59e00cb41d Upgrade matrix-js-sdk to 11.1.0 2021-05-24 17:27:24 +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 4960838e58 bump to olm 3.2.3 2021-05-24 16:35:21 +01:00
Hubert Chathi 06ac124bab Bump libolm dependency, and update package name. 2021-05-24 16:34:13 +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 618665f655 v1.7.29-rc.1 2021-05-19 15:33:04 +01:00
RiotRobot d95a6a38ae Upgrade matrix-react-sdk to 3.22.0-rc.1 2021-05-19 14:45:45 +01:00
RiotRobot 1ef1c4fbae Upgrade matrix-js-sdk to 11.1.0-rc.1 2021-05-19 14:44:08 +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
Michael Telatynski bf01ebae6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	package.json
	src/components/views/messages/MImageBody.js
	yarn.lock
2021-05-18 13:48:40 +01:00
Travis Ralston 51b380da65 Update matrix-widget-api/react-sdk dependency reference
To fix inevitable build errors.
2021-05-17 16:39:04 -06:00
Travis Ralston 7cdca77f39 Update widget-api 2021-05-17 16:27:48 -06:00
RiotRobot c41ba297e3 Reset matrix-react-sdk back to develop branch 2021-05-17 14:00:39 +01:00
RiotRobot e565044aa3 Reset matrix-js-sdk back to develop branch 2021-05-17 14:00:27 +01:00
RiotRobot 304fccaec4 Merge branch 'master' into develop 2021-05-17 14:00:15 +01:00
RiotRobot 4e0ea04d3c v1.7.28 2021-05-17 13:57:04 +01:00
RiotRobot 0cd7d9a57d Upgrade matrix-react-sdk to 3.21.0 2021-05-17 13:52:21 +01:00