Commit graph

1035 commits

Author SHA1 Message Date
RiotRobot
b9ea0af44c Merge branch 'master' into develop 2020-05-22 14:35:27 +01:00
RiotRobot
075299a7eb v1.6.2 2020-05-22 14:21:24 +01:00
RiotRobot
9e88a7d1c0 Upgrade matrix-react-sdk to 2.6.1 2020-05-22 14:17:58 +01:00
Michael Telatynski
3bbd3e246a Fix EventEmitter typescript signature in node typings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 13:52:40 +01:00
RiotRobot
16ecc007d6 Reset matrix-react-sdk back to develop branch 2020-05-19 11:36:17 +01:00
RiotRobot
92b94af9ed Reset matrix-js-sdk back to develop branch 2020-05-19 11:36:07 +01:00
RiotRobot
ef0076bd83 Merge branch 'master' into develop 2020-05-19 11:34:45 +01:00
RiotRobot
482d6a7fb3 v1.6.1 2020-05-19 11:31:35 +01:00
RiotRobot
a9fbc190bf Upgrade matrix-react-sdk to 2.6.0 2020-05-19 11:28:08 +01:00
RiotRobot
f35ec09b54 Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:27:41 +01:00
RiotRobot
f56ee6df34 v1.6.1-rc.1 2020-05-14 16:53:00 +01:00
RiotRobot
fe32590e30 Upgrade matrix-react-sdk to 2.6.0-rc.1 2020-05-14 16:35:02 +01:00
RiotRobot
710dc18f2c Upgrade matrix-js-sdk to 6.1.0-rc.1 2020-05-14 16:33:28 +01:00
Michael Telatynski
911bd2e469 Replace favico.js dependency with simplified variant grown from it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-13 05:19:08 +01:00
Michael Telatynski
f4e21c3fc7 Remove electron_app as we now have riot-desktop repo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-06 11:32:13 +01:00
RiotRobot
fb33b6082d Reset matrix-react-sdk back to develop branch 2020-05-05 11:41:33 +01:00
RiotRobot
99af02eecd Reset matrix-js-sdk back to develop branch 2020-05-05 11:41:11 +01:00
RiotRobot
d5d4b95fee Merge branch 'master' into develop 2020-05-05 11:39:12 +01:00
RiotRobot
beda6c3b25 v1.6.0 2020-05-05 11:35:22 +01:00
RiotRobot
3e13de3069 Upgrade matrix-react-sdk to 2.5.0 2020-05-05 11:31:28 +01:00
RiotRobot
cc192ab882 Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:30:41 +01:00
RiotRobot
be76d2ef3c v1.6.0-rc.6 2020-05-01 16:35:10 +01:00
RiotRobot
1edfde3932 Upgrade matrix-react-sdk to 2.5.0-rc.6 2020-05-01 16:33:00 +01:00
RiotRobot
43879c410c Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:32:34 +01:00
RiotRobot
29df8a8a2e v1.6.0-rc.5 2020-04-30 11:37:43 +01:00
RiotRobot
3c7de2c08f Upgrade matrix-react-sdk to 2.5.0-rc.5 2020-04-30 11:34:11 +01:00
RiotRobot
ecc73905c1 Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:33:23 +01:00
Michael Telatynski
08f9018cd4 remove wasmMock.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 16:28:42 +01:00
Michael Telatynski
15894ed8bd mock out wasm imports in jest
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 16:04:20 +01:00
RiotRobot
58b7bbd3d2 v1.6.0-rc.4 2020-04-23 16:00:41 +01:00
RiotRobot
e7cb2e4022 Upgrade matrix-react-sdk to 2.5.0-rc.4 2020-04-23 15:58:10 +01:00
RiotRobot
7600571cf5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:57:32 +01:00
Michael Telatynski
6584ff29af mock out scss imports for jest
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 18:58:44 +01:00
RiotRobot
4e07c64790 v1.6.0-rc.3 2020-04-17 18:00:55 +01:00
RiotRobot
393d701ee9 Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:58:52 +01:00
RiotRobot
ef5d1f421d Upgrade matrix-react-sdk to 2.5.0-rc.3 2020-04-17 17:57:33 +01:00
RiotRobot
c71338852e v1.6.0-rc.2 2020-04-16 20:09:16 +01:00
RiotRobot
6ca2f4c87d Upgrade matrix-react-sdk to 2.5.0-rc.2 2020-04-16 20:06:01 +01:00
RiotRobot
0c12630b89 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 20:04:19 +01:00
Travis Ralston
005269e2ad Make Jitsi download script a JS script
It's awful but means that we create the directory on all platforms in-process.

Fixes https://github.com/vector-im/riot-web/issues/13215
2020-04-16 12:37:41 -06:00
RiotRobot
d3bc7fb400 v1.6.0-rc.1 2020-04-15 19:27:55 +01:00
RiotRobot
2cd585cd6c Upgrade matrix-react-sdk to 2.5.0-rc.1 2020-04-15 19:24:18 +01:00
RiotRobot
0b32f7c87f Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:22:38 +01:00
RiotRobot
08ef4ff3b1 Merge branch 'release-v1.5.16' into release-v1.6.0 2020-04-15 19:08:28 +01:00
Danny Colin
c128e75f5d fix build:jitsi scripts crash caused by a missing folder
On a freshly install of the developer environment, the build:jitsi try
to create a file in ./webapp with the cURL command. However, ./webapp
folder doesn't exist and the build script crash. This patch makes sure
the appropriate folder is created if it doesn't already exist

Signed-off-by: Danny Colin <contact@dannycolin.com>
2020-04-10 14:14:19 -04:00
RiotRobot
8b6ec2c50b v1.5.16-rc.1 2020-04-08 14:10:59 +01:00
RiotRobot
48018b33cc Upgrade matrix-react-sdk to 2.4.0-rc.1 2020-04-08 14:06:02 +01:00
RiotRobot
83af795358 Upgrade matrix-js-sdk to 5.3.0-rc.1 2020-04-08 14:03:43 +01:00
Michael Telatynski
b647e35c48
Merge pull request #13049 from vector-im/t3chguy/default_home
Add new default home page fallback
2020-04-07 14:47:01 +01:00
Michael Telatynski
e58cd1f73a Add new default home page fallback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:48:56 +01:00