Commit graph

3343 commits

Author SHA1 Message Date
RiotRobot
469df236d9 Upgrade matrix-js-sdk to 9.0.1 2020-10-28 15:13:31 +00:00
RiotRobot
a708dbf6e9 Reset matrix-js-sdk back to develop branch 2020-10-28 14:32:26 +00:00
RiotRobot
de6589705c Upgrade matrix-js-sdk to 9.0.1 2020-10-28 14:17:48 +00:00
RiotRobot
059366f07a Upgrade matrix-react-sdk to 3.7.0 2020-10-26 17:00:07 +00:00
RiotRobot
40384ffe42 Upgrade matrix-js-sdk to 9.0.0 2020-10-26 16:58:20 +00:00
RiotRobot
5446184e6e Upgrade matrix-js-sdk to 9.0.0 2020-10-26 16:49:16 +00:00
Aleks Kissinger
4536f51ec0 Merge branch 'develop' into katex 2020-10-25 12:28:17 +00:00
RiotRobot
9856978d0a Upgrade matrix-react-sdk to 3.7.0-rc.2 2020-10-21 15:25:48 +01:00
RiotRobot
b585cf76bd Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 15:16:46 +01:00
RiotRobot
d005d1f1c6 Upgrade matrix-react-sdk to 3.7.0-rc.1 2020-10-21 14:48:47 +01:00
RiotRobot
6f6c6d7b75 Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 14:47:40 +01:00
RiotRobot
65d7b9c0f2 Upgrade matrix-js-sdk to 8.5.0 2020-10-21 14:38:51 +01:00
RiotRobot
a4e28cce88 Reset matrix-react-sdk back to develop branch 2020-10-20 11:46:35 +01:00
RiotRobot
68c4d005f1 Reset matrix-js-sdk back to develop branch 2020-10-20 11:46:24 +01:00
RiotRobot
2716629642 Upgrade matrix-react-sdk to 3.6.1 2020-10-20 11:38:05 +01:00
RiotRobot
bd1276c56b Reset matrix-js-sdk back to develop branch 2020-10-20 11:27:33 +01:00
J. Ryan Stinnett
55153ba7d2 Shake lock file 2020-10-19 17:46:36 +01:00
J. Ryan Stinnett
2d97ff4eba Upgrade widget API 2020-10-19 17:46:35 +01:00
J. Ryan Stinnett
06aa5a9aa9 Shake lock file 2020-10-19 17:08:07 +01:00
J. Ryan Stinnett
0f76c858ac Upgrade widget API 2020-10-19 16:57:18 +01:00
J. Ryan Stinnett
d6a166d3bf Upgrade widget API 2020-10-19 16:56:36 +01:00
Sebastian Denz
7f4f9b2cf1 Use HTTPS_PROXY environment variable for downloading external_api.min.js if set 2020-10-16 14:48:28 +02:00
RiotRobot
f8e84c42ad Reset matrix-react-sdk back to develop branch 2020-10-12 13:59:58 +01:00
RiotRobot
fd2895eb40 Reset matrix-js-sdk back to develop branch 2020-10-12 13:59:47 +01:00
RiotRobot
2d03ccfa57 Upgrade matrix-react-sdk to 3.6.0 2020-10-12 13:40:53 +01:00
RiotRobot
ed86341ba5 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:40:35 +01:00
RiotRobot
d007b06d7c Reset matrix-js-sdk back to develop branch 2020-10-12 13:40:23 +01:00
RiotRobot
ddd3d97b71 Merge branch 'master' into develop 2020-10-12 13:39:18 +01:00
RiotRobot
0ac4f21652 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:24:53 +01:00
Aleks Kissinger
aafaf34233 Merge branch 'develop' into katex 2020-10-10 19:31:46 +01:00
Travis Ralston
2caf679024 Update widget-api 2020-10-08 21:22:17 -06:00
Travis Ralston
25db3e9efa Update widget-api 2020-10-08 21:21:11 -06:00
Michael Telatynski
177b76d882
Merge pull request #5284 from matrix-org/t3chguy/fix/10353
Track replyToEvent along with Cider state & history
2020-10-08 14:59:14 +01:00
J. Ryan Stinnett
f77dace173 Shake lock file to attempt fixing CI 2020-10-07 17:07:44 +01:00
RiotRobot
b5f114c157 Upgrade matrix-react-sdk to 3.6.0-rc.1 2020-10-07 14:39:28 +01:00
RiotRobot
27ff4e9488 Upgrade matrix-js-sdk to 8.5.0-rc.1 2020-10-07 14:36:06 +01:00
RiotRobot
2fd9b9b3b9 Upgrade matrix-js-sdk to 8.5.0-rc.1 2020-10-07 14:23:52 +01:00
Michael Telatynski
25eb587e3b
Merge pull request #15402 from vector-im/t3chguy/fix/10353
Update Jest and JSDOM
2020-10-07 10:43:43 +01:00
Michael Telatynski
0d6edab708 Workaround Jest bug with ArrayBuffers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 01:22:29 +01:00
Michael Telatynski
07c0b20075 Update Jest and JSDOM
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:08:41 +01:00
Michael Telatynski
13afb8d4f1 Update Jest and JSDOM
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:08:40 +01:00
Hubert Chathi
72aeb6ea5d bump olm version again 2020-10-06 18:04:13 -04:00
Hubert Chathi
520e6e5fef update yarn.lock 2020-10-06 15:33:39 -04:00
Travis Ralston
5f353c4907
Merge pull request #15102 from vector-im/travis/widget-api
Switch to using the Widget API SDK for Jitsi widgets
2020-10-01 10:16:11 -06:00
Michael Telatynski
ad95d1fa64 Update yarn.lock
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-01 14:06:28 +01:00
Michael Telatynski
cfee4c925a Revert "Attempt to fix tests some more"
This reverts commit c76a5f2c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-01 14:05:07 +01:00
Travis Ralston
408766366c Use the beta release of the widget-api 2020-09-30 20:43:21 -06:00
Travis Ralston
08c5e9e039 Use the beta release of the widget-api 2020-09-30 20:42:37 -06:00
RiotRobot
11600238ed Merge branch 'master' into develop 2020-09-28 16:33:11 +01:00
RiotRobot
4d84df11c4 Upgrade matrix-react-sdk to 3.5.0 2020-09-28 16:25:04 +01:00