Commit Graph

1448 Commits (b8fb8b0460956bcdd6d7f18000be27b942a90263)

Author SHA1 Message Date
RiotRobot d4d1b957af v1.7.9 2020-10-12 13:56:01 +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 c0143e58a2 v1.7.9-rc.1 2020-10-07 14:44:54 +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
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 07c0b20075 Update Jest and JSDOM
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:08:41 +01:00
Hubert Chathi 72aeb6ea5d bump olm version again 2020-10-06 18:04:13 -04:00
Hubert Chathi e710346fd6 depend on newer olm 2020-10-06 15:30:36 -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 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
RiotRobot 11600238ed Merge branch 'master' into develop 2020-09-28 16:33:11 +01:00
RiotRobot 802829f0ea v1.7.8 2020-09-28 16:28:04 +01:00
RiotRobot 4d84df11c4 Upgrade matrix-react-sdk to 3.5.0 2020-09-28 16:25:04 +01:00
RiotRobot 191fd2fb2d Upgrade matrix-js-sdk to 8.4.1 2020-09-28 16:24:30 +01:00
Travis Ralston 14daccecfc Rebrand the webpack pipeline for Element 2020-09-23 12:39:10 -06:00
Michael Telatynski 477b7a362b
Merge pull request #15196 from vector-im/t3chguy/fix/12591
Replace dummy sw.js with pre-caching and runtime-caching workbox SW
2020-09-23 17:03:26 +01:00
RiotRobot 7f6c2bbe44 v1.7.8-rc.1 2020-09-23 15:45:46 +01:00
RiotRobot 3939a1dc1e Add sanitize-html types 2020-09-23 15:43:53 +01:00
RiotRobot b0de2d9108 Upgrade matrix-react-sdk to 3.5.0-rc.1 2020-09-23 15:35:23 +01:00
RiotRobot 6223d0742d Upgrade matrix-js-sdk to 8.4.0-rc.1 2020-09-23 15:35:02 +01:00
J. Ryan Stinnett 9e7ff5e126 Upgrade sanitize-html
Part of https://github.com/vector-im/element-web/issues/15122
2020-09-22 18:07:17 +01:00
Michael Telatynski c76a5f2c52 Attempt to fix tests some more 2020-09-15 13:19:47 +01:00
RiotRobot df5cb15cf9 Reset matrix-react-sdk back to develop branch 2020-09-14 16:10:18 +01:00
RiotRobot 82cfc751af Reset matrix-js-sdk back to develop branch 2020-09-14 16:10:08 +01:00
RiotRobot 2f4299e836 v1.7.7 2020-09-14 16:00:49 +01:00
RiotRobot 0eccd03a78 Upgrade matrix-react-sdk to 3.4.1 2020-09-14 15:57:32 +01:00
RiotRobot 70febe3109 v1.7.6 2020-09-14 13:46:13 +01:00
RiotRobot 6d124e6c28 Upgrade matrix-react-sdk to 3.4.0 2020-09-14 13:44:41 +01:00
RiotRobot c8a0d94b61 Upgrade matrix-js-sdk to 8.3.0 2020-09-14 13:42:53 +01:00
RiotRobot cf448f1f0a v1.7.6-rc.1 2020-09-09 16:00:06 +01:00
RiotRobot 2ad02e4feb Upgrade matrix-react-sdk to 3.4.0-rc.1 2020-09-09 15:56:58 +01:00
RiotRobot fcdda7a956 Upgrade matrix-js-sdk to 8.3.0-rc.1 2020-09-09 15:56:42 +01:00
Jason Robinson 5108697ac8 Add support for Jitsi openidtoken-jwt auth
If the widget URL specifies this auth, generate a JWT token
containing the info needed by the Jitsi backend.
2020-09-04 13:14:52 +03:00
RiotRobot e5a4092adc Reset matrix-react-sdk back to develop branch 2020-09-01 17:51:03 +01:00
RiotRobot 3ed750a9ab Reset matrix-js-sdk back to develop branch 2020-09-01 17:50:49 +01:00
RiotRobot a89661de44 v1.7.5 2020-09-01 17:46:13 +01:00
RiotRobot a20b9c4c24 Upgrade matrix-react-sdk to 3.3.0 2020-09-01 17:41:33 +01:00
RiotRobot a09ab52be3 Upgrade matrix-js-sdk to 8.2.0 2020-09-01 17:40:19 +01:00
RiotRobot 669a5e6d01 v1.7.5-rc.1 2020-08-26 12:14:54 +01:00
RiotRobot 9163aee0fc Upgrade matrix-react-sdk to 3.3.0-rc.1 2020-08-26 12:10:33 +01:00
RiotRobot de4550099e Upgrade matrix-js-sdk to 8.2.0-rc.1 2020-08-26 12:08:33 +01:00
RiotRobot d969a96cd2 Reset matrix-react-sdk back to develop branch 2020-08-17 13:17:44 +01:00
RiotRobot 4a7c2318dd Reset matrix-js-sdk back to develop branch 2020-08-17 13:17:27 +01:00
RiotRobot 8aa46ba700 v1.7.4 2020-08-17 13:12:41 +01:00
RiotRobot 5ac891d70e Upgrade matrix-react-sdk to 3.2.0 2020-08-17 13:09:23 +01:00
RiotRobot 16be9e4774 Upgrade matrix-js-sdk to 8.1.0 2020-08-17 13:09:04 +01:00
RiotRobot 05816fca36 v1.7.4-rc.1 2020-08-13 12:23:41 +01:00
RiotRobot 871733388c Upgrade matrix-react-sdk to 3.2.0-rc.1 2020-08-13 12:20:41 +01:00
RiotRobot 89ee32a32d Upgrade matrix-js-sdk to 8.1.0-rc.1 2020-08-13 12:20:15 +01:00
RiotRobot 04afd0232b Reset matrix-react-sdk back to develop branch 2020-08-05 16:20:15 +01:00
RiotRobot 5935e3b145 Reset matrix-js-sdk back to develop branch 2020-08-05 16:20:01 +01:00
RiotRobot f8102105a9 v1.7.3 2020-08-05 16:15:17 +01:00
RiotRobot 6b7909c732 Upgrade matrix-react-sdk to 3.1.0 2020-08-05 16:12:43 +01:00
RiotRobot d283b4161c Upgrade matrix-js-sdk to 8.0.1 2020-08-05 16:12:29 +01:00
RiotRobot 0b3487981c v1.7.3-rc.1 2020-07-31 13:40:26 +01:00
RiotRobot 7f0c8216ae Upgrade matrix-react-sdk to 3.1.0-rc.1 2020-07-31 13:35:05 +01:00
RiotRobot 6004d02b98 Upgrade matrix-js-sdk to 8.0.1-rc.1 2020-07-31 13:33:19 +01:00
J. Ryan Stinnett 269e82edc9 Remove redundant lint dependencies
These are no longer needed with the new standard lint repo.
2020-07-29 12:05:50 +01:00
RiotRobot f4e6828949 Reset matrix-react-sdk back to develop branch 2020-07-27 21:39:12 +01:00
RiotRobot b799a6eb84 Reset matrix-js-sdk back to develop branch 2020-07-27 21:39:01 +01:00
RiotRobot 788a6f0527 v1.7.2 2020-07-27 21:35:05 +01:00
RiotRobot 36802afe92 Upgrade matrix-react-sdk to 3.0.0 2020-07-27 21:30:30 +01:00
RiotRobot c20776a264 Upgrade matrix-js-sdk to 8.0.0 2020-07-27 21:30:13 +01:00
Jorik Schellekens 9bb1f99bd9 Confiure eslint package and fix lint issues 2020-07-21 11:30:28 +01:00
J. Ryan Stinnett 869c379264 Remove webpack -p option
This option is redundant, as it means the same as `--mode production`, and it
prevents us from tweaking the mode via `CI_PACKAGE`.
2020-07-17 14:55:01 +01:00
J. Ryan Stinnett 8ae4298637 Webpack modes also manage NODE_ENV
We don't need to manually define `NODE_ENV` in the Webpack config, nor do we
need to set it outside Webpack with `cross-env` either, as Webpack's modes will
take care of this for us.
2020-07-17 14:18:08 +01:00
Michael Telatynski d328cab538 Move dev dep to the right place
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 10:36:38 +01:00
RiotRobot dbd82c7425 Reset matrix-react-sdk back to develop branch 2020-07-16 16:20:02 +01:00
RiotRobot da5008bab1 Reset matrix-js-sdk back to develop branch 2020-07-16 16:19:49 +01:00
RiotRobot 9c9da4345b v1.7.1 2020-07-16 16:15:39 +01:00
RiotRobot 0159699d1b Upgrade matrix-react-sdk to 2.10.1 2020-07-16 16:13:15 +01:00
RiotRobot 1262a1ef08 Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:12:35 +01:00
RiotRobot 7c17272c83 Reset matrix-react-sdk back to develop branch 2020-07-15 12:14:38 +01:00
RiotRobot 6886dbcbd4 Reset matrix-js-sdk back to develop branch 2020-07-15 12:14:27 +01:00
RiotRobot 15203bb32b v1.7.0 2020-07-15 12:10:02 +01:00
RiotRobot e5398f4345 Upgrade matrix-react-sdk to 2.10.0 2020-07-15 12:05:47 +01:00
RiotRobot e077bea046 Upgrade matrix-js-sdk to 7.1.0 2020-07-15 12:05:31 +01:00
RiotRobot 449ac2e5e4 Reset matrix-react-sdk back to develop branch 2020-07-03 13:37:33 +01:00
RiotRobot ebe1d7c336 Reset matrix-js-sdk back to develop branch 2020-07-03 13:37:22 +01:00
RiotRobot 1f543994d4 v1.6.8 2020-07-03 13:33:15 +01:00
RiotRobot 7815810cf8 Upgrade matrix-react-sdk to 2.9.0 2020-07-03 13:31:26 +01:00
RiotRobot 14fc25e635 Upgrade matrix-js-sdk to 7.1.0 2020-07-03 13:30:52 +01:00
RiotRobot 1726615b8a v1.6.8-rc.1 2020-07-01 14:43:57 +01:00
RiotRobot a14cff6539 Upgrade matrix-react-sdk to 2.9.0-rc.1 2020-07-01 14:37:15 +01:00
RiotRobot 003a2942fe Upgrade matrix-js-sdk to 7.1.0-rc.1 2020-07-01 14:34:47 +01:00
RiotRobot af349a7ac5 Reset matrix-react-sdk back to develop branch 2020-06-29 16:23:35 +01:00
RiotRobot d4fa099877 Reset matrix-js-sdk back to develop branch 2020-06-29 16:23:22 +01:00
RiotRobot 70e981f588 v1.6.7 2020-06-29 16:18:15 +01:00
RiotRobot ec49f4555b Upgrade matrix-react-sdk to 2.8.1 2020-06-29 16:15:21 +01:00
RiotRobot 42c6a26e9f v1.6.6 2020-06-23 15:26:55 +01:00
RiotRobot b1c106e8b2 Upgrade matrix-react-sdk to 2.8.0 2020-06-23 15:20:43 +01:00
RiotRobot ae7f354811 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 15:20:24 +01:00
RiotRobot d12f33fb58 v1.6.6-rc.1 2020-06-17 21:52:14 +01:00
RiotRobot d587a8e910 Upgrade matrix-react-sdk to 2.8.0-rc.1 2020-06-17 21:49:25 +01:00
RiotRobot 2c227f68d4 Upgrade matrix-js-sdk to 7.0.0-rc.1 2020-06-17 21:49:00 +01:00
RiotRobot 59d37ec94b Reset matrix-react-sdk back to develop branch 2020-06-16 12:01:07 +01:00
RiotRobot 6558d6d828 Reset matrix-js-sdk back to develop branch 2020-06-16 12:00:53 +01:00
RiotRobot d75045e852 v1.6.5 2020-06-16 11:53:53 +01:00
RiotRobot 9ed7c96df6 Upgrade matrix-react-sdk to 2.7.2 2020-06-16 11:51:28 +01:00
RiotRobot 93da1f192b Upgrade matrix-js-sdk to 6.2.2 2020-06-16 11:51:11 +01:00
RiotRobot 3b28ebecef v1.6.4 2020-06-05 15:57:45 +01:00
RiotRobot 21dd4c99f3 Upgrade matrix-react-sdk to 2.7.1 2020-06-05 15:53:38 +01:00
RiotRobot 45fb8adc5d Upgrade matrix-js-sdk to 6.2.1 2020-06-05 15:52:31 +01:00
RiotRobot 97f45723a3 v1.6.3 2020-06-04 15:34:58 +01:00
RiotRobot 451138617b Upgrade matrix-react-sdk to 2.7.0 2020-06-04 15:23:38 +01:00
RiotRobot a0ea1bfda8 Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:23:02 +01:00
RiotRobot 765927203d v1.6.3-rc.1 2020-06-02 15:55:48 +01:00
RiotRobot f8dad68958 Add flux types as a dev dependency
This is not the right thing to do, since we don't directly use Flux at this
layer, but for the moment we need it to get distribution builds working.
2020-06-02 15:53:11 +01:00
RiotRobot e37680b6c1 Upgrade matrix-react-sdk to 2.7.0-rc.2 2020-06-02 14:41:44 +01:00
RiotRobot 94fee233a8 Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 14:40:00 +01:00
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
Michael Telatynski b1575524aa Switch things to typescript, use @types/modernizr, fix global.d.ts. Move mobile_guide redirect to index.ts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-05 00:55:36 +01:00
RiotRobot cb8319ea2d Reset matrix-react-sdk back to develop branch 2020-04-01 15:35:13 +01:00
RiotRobot af35696db9 Reset matrix-js-sdk back to develop branch 2020-04-01 15:35:02 +01:00
RiotRobot 0cfdc7b66a v1.5.15 2020-04-01 15:28:24 +01:00
RiotRobot 5f5d46eb11 Upgrade matrix-react-sdk to 2.3.1 2020-04-01 15:08:57 +01:00
David Baker 51c675c6fe Give the jitsi wrapper its own external api script 2020-04-01 13:36:51 +01:00
RiotRobot 413b26d71b v1.5.14 2020-03-30 13:48:40 +01:00
RiotRobot 51f4327ce1 Upgrade matrix-react-sdk to 2.3.0 2020-03-30 13:45:21 +01:00
RiotRobot 37cebf38cc Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:44:42 +01:00
RiotRobot 0a83f9c763 v1.5.14-rc.1 2020-03-26 13:31:03 +00:00
RiotRobot 5b35d6e570 Upgrade matrix-react-sdk to 2.3.0-rc.1 2020-03-26 13:28:04 +00:00
RiotRobot 9269d9b669 Upgrade matrix-js-sdk to 5.2.0-rc.1 2020-03-26 13:27:40 +00:00
Michael Telatynski 0620da4351 Add webpack stats which will be used by CI and stored to artifacts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-23 12:07:26 +00:00
Michael Telatynski 7296b704a8
Merge pull request #12756 from vector-im/t3chguy/gemini
Remove remainders of gemini-scrollbar and react-gemini-scrollbar
2020-03-18 14:03:59 +00:00
Jared Smith df9069090f
Update electron to v7.1.14
Update dependency to electron version 7.1.4 to resolve issue where riot-web
has troubles syncing messages, and throws a "**CRASHING**:seccomp-bpf
failure in syscall 0230" error.  

See https://github.com/electron/electron/issues/22291 for more details.
2020-03-17 10:51:39 -04:00
RiotRobot a9fbf2f968 Reset matrix-react-sdk back to develop branch 2020-03-17 14:39:09 +00:00
RiotRobot 25a3449ad2 Reset matrix-js-sdk back to develop branch 2020-03-17 14:38:58 +00:00
RiotRobot b01c6e67fd Merge branch 'master' into develop 2020-03-17 14:37:28 +00:00
RiotRobot c4f3d39d42 v1.5.13 2020-03-17 14:31:49 +00:00
RiotRobot 8002bc66d7 Upgrade matrix-react-sdk to 2.2.3 2020-03-17 14:29:06 +00:00
RiotRobot c3553a2649 Upgrade matrix-js-sdk to 5.1.1 2020-03-17 14:28:23 +00:00
Michael Telatynski 8cef591c57 Remove remainders of gemini-scrollbar and react-gemini-scrollbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:31:46 +00:00
Travis Ralston 798d4dabc0 Supply `--jsx react` to tsc 2020-03-11 18:25:19 -06:00
Travis Ralston f44694ad44 Support TypeScript for React components
Same treatment as https://github.com/matrix-org/matrix-react-sdk/pull/4203
2020-03-11 18:19:03 -06:00
RiotRobot d4a578542f v1.5.13-rc.1 2020-03-11 17:38:21 +00:00
RiotRobot 34817a0044 js-sdk & react-sdk rc.1 2020-03-11 17:36:18 +00:00
RiotRobot 872a7a74fb Reset matrix-react-sdk back to develop branch 2020-03-04 13:07:59 +00:00
RiotRobot 4548831ac5 Reset matrix-js-sdk back to develop branch 2020-03-04 13:07:45 +00:00
RiotRobot d88f9ed2c0 Merge branch 'master' into develop 2020-03-04 13:06:43 +00:00
RiotRobot 6e68c106f7 v1.5.12 2020-03-04 12:58:03 +00:00
RiotRobot c26396d693 Upgrade matrix-react-sdk to 2.2.1 2020-03-04 12:01:31 +00:00
Michael Telatynski 48c8f16a4c
Merge pull request #12590 from vector-im/t3chguy/sso
riot-desktop open SSO in browser so user doesn't have to auth twice
2020-03-03 22:27:46 +00:00
J. Ryan Stinnett adc329c67f Revert "Upgrade to Electron 8.0.2"
This reverts commit 9b9d585af0.
2020-03-03 13:21:49 -07:00
Michael Telatynski bb6afd7c30 backport riot-desktop implementation into riot-web 2020-03-02 20:16:41 +00:00
RiotRobot 94ceb5a46b Reset SDKs back to develop branch 2020-03-02 17:57:08 +00:00
RiotRobot 43b70bf720 v1.5.11 2020-03-02 17:51:01 +00:00
RiotRobot 620414187f Upgrade matrix-react-sdk to 2.2.0 2020-03-02 17:47:53 +00:00
RiotRobot e71dcacd2d Upgrade matrix-js-sdk to 5.1.0 2020-03-02 17:47:32 +00:00
RiotRobot 03f63397ff v1.5.11-rc.1 2020-02-26 14:37:19 +00:00
RiotRobot a4d01a5f04 Upgrade matrix-react-sdk to 2.2.0-rc.1 2020-02-26 14:34:56 +00:00
RiotRobot 4fced076b7 Upgrade matrix-js-sdk to 5.1.0-rc.1 2020-02-26 14:33:57 +00:00
J. Ryan Stinnett 9b9d585af0 Upgrade to Electron 8.0.2 2020-02-26 13:44:07 +00:00
J. Ryan Stinnett de71e36843 Reset matrix-react-sdk back to develop branch 2020-02-20 12:01:58 +00:00
J. Ryan Stinnett 120d36d70b Reset matrix-js-sdk back to develop branch 2020-02-20 12:01:58 +00:00
RiotRobot eb66d62f1a v1.5.10 2020-02-19 16:23:51 +00:00
RiotRobot dafb2f01b1 released react-sdk & js-sdk 2020-02-19 16:20:44 +00:00
David Baker 5ac9902384 Switch back to develop deps 2020-02-17 14:15:21 +00:00
RiotRobot a5d5e2800c v1.5.9 2020-02-17 13:42:37 +00:00
RiotRobot 9b5655c1fa Released js-sdk & react-sdk 2020-02-17 13:39:24 +00:00
RiotRobot 08c149ed66 v1.5.9-rc.1 2020-02-13 17:56:15 +00:00
RiotRobot 35204416bf Upgrade JS SDK to 5.0.0-rc.1 and React SDK to 2.1.0-rc.2 2020-02-13 17:50:29 +00:00
J. Ryan Stinnett 036348cd60 Electron 8.0.0 crashes on macOS, reverting to 7.1.12 2020-02-13 15:24:59 +00:00
J. Ryan Stinnett 2c0968e40e Return to default deb after install script
Upstream electron-builder now contains the SUID sandbox change.

See also https://github.com/electron-userland/electron-builder/pull/4163
2020-02-13 14:52:44 +00:00
J. Ryan Stinnett 3eb5eb1d21 Upgrade electron-builder 2020-02-13 14:50:19 +00:00
J. Ryan Stinnett 4a1b9d8ea4 Upgrade to Electron 8.0.0 2020-02-13 14:45:42 +00:00
Travis Ralston b107da09fa
Merge pull request #12251 from vector-im/jaywink/add-contribute-json
Add contribute.json
2020-02-05 15:21:07 +00:00
Jason Robinson 9534a25270 Fix contribute.json location as per spec
Signed-off-by: Jason Robinson <jasonr@matrix.org>
2020-02-05 16:28:44 +02:00
Michael Telatynski bceca49cdc Update vendored modernizr 2020-02-04 11:00:47 +00:00
Travis Ralston d50b52cdc5 Try to fix Jest 2020-01-28 14:31:09 +00:00
J. Ryan Stinnett 8ca6c2c433 Flip SDKs back to develop 2020-01-27 16:01:12 +00:00
RiotRobot 9782599c69 Merge branch 'master' into develop 2020-01-27 12:02:44 +00:00
RiotRobot 768cabe4bb v1.5.8 2020-01-27 11:57:49 +00:00
RiotRobot dd26d43173 js-sdk 4.0.0 & react-sdk 2.0.0 2020-01-27 11:52:18 +00:00
RiotRobot 902252ad93 v1.5.8-rc.2 2020-01-22 14:24:50 +00:00
David Baker eb5e14661d Actually pull in react-sdk rc.2 2020-01-22 14:20:46 +00:00
RiotRobot ebd3f0e4e1 v1.5.8-rc.1 2020-01-22 13:22:19 +00:00
David Baker 8913eba60d react-sdk rc.2 2020-01-22 13:06:37 +00:00
Travis Ralston 5b575d5627 Force Jest to resolve the js-sdk and react-sdk to src directories 2020-01-20 14:28:29 -07:00
David Baker c3a5e2e5d3 react-sdk & js-sdk rc.1 2020-01-20 14:36:12 +00:00
David Baker ad8bd62ae6 bump electron version 2020-01-20 14:15:40 +00:00
J. Ryan Stinnett 8c6d6b1d09 Fix yarn start concurrent commands 2020-01-16 23:26:13 +00:00
Travis Ralston b965188a5f Run the react-sdk reskindexer for developers
See https://github.com/matrix-org/matrix-react-sdk/pull/3856 for why chokidar was updated.
2020-01-16 15:40:34 -07:00
Travis Ralston 3fb6b1ed63 Remove excessive sleep now that we're not using chrome 2020-01-15 15:31:08 -07:00
Travis Ralston 5cd54e9f6d Use jsdom 14 instead of 13 2020-01-15 15:30:40 -07:00
Travis Ralston c70d21a92e Force Jest to use exactly one copy of React and ReactDOM 2020-01-15 14:42:16 -07:00
Travis Ralston 5c915f3d02 Add canvas package so COLR check passes in tests
This is required for jsdom to do the right thing.

We also have to bump the jsdom version, but to do that we need an alternative test environment because Jest has it pinned lower.
2020-01-15 14:42:00 -07:00
Travis Ralston f0dbc85ca5 Mock out browser-request to fix i18n 2020-01-15 14:06:55 -07:00
Travis Ralston 161a1342b2 Swap over to Jest, breaking everything 2020-01-15 13:24:19 -07:00
Travis Ralston a978a6734f Fix CI tests
There's a bunch of generated files that webpack relies on to work, and Karma works off webpack. To make both happy we've added
a new `build:genfiles` script which takes care of this for us. We also have to install and build our other layers to get the
same effect (like generating the react-sdk's component index, while we still have one).

This commit also fixes all the imports in the tests because they were just wrong. They should have been caught in the ES6ification
earlier, but were missed.
2020-01-13 20:40:00 -07:00
Travis Ralston 3b688aaeb8 Don't run linter on tests for now
We previously ignored this whole directory, and it's a bit of wishful thinking that we'll have these delinted as a result.

Switching to Jest should fix most of the problems anyways, so we can enable the linter when we get there.
2020-01-13 20:37:10 -07:00
Travis Ralston f73d2bae1f Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:22:47 -07:00
RiotRobot 2574841bf4 v1.5.7 2020-01-13 13:14:12 +00:00
RiotRobot 057f78fadc released react-sdk & js-dk 2020-01-13 13:12:29 +00:00
Travis Ralston d877187d5e Remove postinstall script now that it's not needed 2020-01-09 13:43:33 -07:00
Travis Ralston 9bf1c65971 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev 2020-01-09 13:43:25 -07:00
Travis Ralston ec66069e96 Update build scripts for new process
We have to convert *something* to TypeScript so it doesn't complain that there's nothing to compile, so this converts the easiest utility library.

Many of the scripts are copied from the react-sdk.
2020-01-08 16:09:42 -07:00
RiotRobot f7637a0df7 v1.5.7-rc.2 2020-01-08 11:25:06 +00:00
RiotRobot a1b14751e5 bump to matrix-react-sdk rc.2 2020-01-08 11:22:50 +00:00
RiotRobot 5f1ef6dfb8 v1.5.7-rc.1 2020-01-06 16:26:46 +00:00
RiotRobot 1de2fe5e27 Merge remote-tracking branch 'origin/develop' into release-v1.5.7 2020-01-06 16:22:33 +00:00
David Baker 52ca0908e2 Fix the build
Run `yarn install` in the js-sdkc and react-sdk installs. We were
avoiding this before due to using babel dependencies from riot-web
ro build js-sdk, which worked as long as the installed babel versions
and plugins were identical. js-sdk has now been upgraded to babel 7
and so that no longer worked.

This will probably cause react-sdk & js-sdk to be built an
unnecessary number of times.
2020-01-06 14:55:38 +00:00
RiotRobot f7618e3c73 react-sdk & js-sdk rc.1 2020-01-06 14:05:47 +00:00
David Baker 8b3df0d793 Bump electron version 2020-01-06 13:09:10 +00:00
Travis Ralston 1b41dc3291 Make the webpack config work for us
This moves the babel and postcss configs into the webpack config for ease of maintenance (and because we need variations of them). The typescript config is left outside the webpack config for IDEs to pick it up.
2019-12-23 19:51:01 -07:00
Travis Ralston 4479018289
Merge pull request #11660 from vector-im/travis/babel7-reskindex
Remove now-retired package.json property
2019-12-17 08:11:14 -07:00
Michael Telatynski f6db2ed8dd Remove babel-plugin-transform-async-to-bluebird 2019-12-13 13:08:29 +00:00
Travis Ralston c143b9b2d7 Remove now-retired package.json property
For https://github.com/matrix-org/matrix-react-sdk/pull/3723
2019-12-12 19:47:31 -07:00
J. Ryan Stinnett dd9eda8f97 Flip back to develop 2019-12-11 10:37:36 +00:00
J. Ryan Stinnett eb42793ad5 Remove bluebird transform as regular dep 2019-12-11 10:36:24 +00:00
David Baker 26eff8d372
Merge pull request #11631 from vector-im/dbkr/remove_origin_migrator
Remove the code that calls the origin migrator
2019-12-09 15:18:20 +00:00
David Baker bd57ff793f Remove rest of the origin migrator 2019-12-09 14:54:36 +00:00
RiotRobot b7f6d7b102 Merge branch 'master' into develop 2019-12-09 11:43:27 +00:00
RiotRobot cfb3258c36 v1.5.6 2019-12-09 11:39:56 +00:00
RiotRobot 45d51f56f2 Released js-sdk & react-sdk 2019-12-09 11:38:11 +00:00
David Baker e2b1a86a29 Remove draft-js dependency
...which for some reason was still kicking around
2019-12-06 13:33:30 +00:00
J. Ryan Stinnett 1d49544238 Remove bluebird transform as regular dep 2019-12-06 12:39:29 +00:00
J. Ryan Stinnett 70d2adb9e2 Move extract-text-webpack-plugin to dev dep 2019-12-06 12:36:58 +00:00
J. Ryan Stinnett 8ad1bd1501 Move bluebird transform to a dev dependency 2019-12-04 16:02:55 +00:00
David Baker f93b7a1675 Add transform-async-to-bluebird
Add babel plugin until the js-sdk stop using bluebird, since we
force-recompile the js-sdk so we need the plugin installed for that
to work (and it's a devDependency on js-sdk so doesn't otherwise get
installed).
2019-12-04 14:25:21 +00:00
RiotRobot aaf1afaa13 v1.5.6-rc.1 2019-12-04 13:59:44 +00:00
David Baker 577e614fa4 Add transform-async-to-bluebird
Add babel plugin until the js-sdk stop using bluebird, since we
force-recompile the js-sdk so we need the plugin installed for that
to work (and it's a devDependency on js-sdk so doesn't otherwise get
installed).
2019-12-04 13:52:59 +00:00
RiotRobot c99cd9fc58 js-sdk & react-sdk rc.1 2019-12-04 12:05:56 +00:00
David Baker c6afbed3fe electron 7.1.3 2019-12-04 11:47:14 +00:00
J. Ryan Stinnett 31ee75f14f Flip SDKs back to develop 2019-11-27 13:33:27 +00:00
RiotRobot ff452b9d87 Merge branch 'master' into develop 2019-11-27 10:54:58 +00:00
RiotRobot d56b73e220 v1.5.5 2019-11-27 10:48:52 +00:00
RiotRobot 10c5485373 Upgrade to JS SDK 2.4.5 and React SDK 1.7.4 2019-11-27 10:44:15 +00:00
David Baker f09a123a87 Add postcss-easings
So we can use names like easeInSine in CSS transitions rather than
cubic-bezier(0.47, 0, 0.745, 0.715)

Required for https://github.com/matrix-org/matrix-react-sdk/pull/3674
2019-11-26 19:12:28 +00:00
David Baker 070d5fc6e8 Sign all of the Windows executable files
We can actually just supply a custom signing module here to do our
signing rather than manually signing things in the afterSign hook.
This means all 4 executable files get signed (the main exe, the
stub exe, Update.exe and the installer).
2019-11-26 12:08:29 -07:00
David Baker a84de0bae2 Sign all of the Windows executable files
We can actually just supply a custom signing module here to do our
signing rather than manually signing things in the afterSign hook.
This means all 4 executable files get signed (the main exe, the
stub exe, Update.exe and the installer).
2019-11-26 15:24:43 +00:00
RiotRobot acd7e028d5 Merge branch 'master' into develop 2019-11-25 13:43:52 +00:00
RiotRobot bf26ec9d1a v1.5.4 2019-11-25 13:40:05 +00:00
RiotRobot 83591b4567 Released js-sdk & react-sdk 2019-11-25 13:36:37 +00:00
RiotRobot 7b59379d29 v1.5.4-rc.2 2019-11-22 17:30:05 +00:00
RiotRobot 1cebd3dcd1 react-sdk rc.2 2019-11-22 17:27:27 +00:00
Michael Telatynski eac6c46d28 Merge branches 'develop' and 't3chguy/remove_bluebird' of https://github.com/vector-im/riot-web into t3chguy/remove_bluebird 2019-11-22 14:00:02 +00:00
Michael Telatynski 97abce1ca6 Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-20 22:32:12 +00:00
RiotRobot fa5475f1c0 v1.5.4-rc.1 2019-11-20 18:32:56 +00:00
RiotRobot f07e3c3b25 react-sdk & js-sdk rc.1 2019-11-20 18:31:32 +00:00
David Baker 1b0b3e1a44 Bump to Electron 7.1.2
Tested with electron 7 and appears to be fine
2019-11-20 17:33:32 +00:00
RiotRobot 5bc15cf83c v1.5.3 2019-11-06 14:28:59 +00:00
David Baker f522305593 Bump to electron 6.1.4 2019-11-06 14:26:45 +00:00
RiotRobot 15c0561588 released react-sdk 2019-11-06 14:24:59 +00:00
Michael Telatynski 385ad5f9ce Don't transform async at all, all browsers we care about support it 2019-11-05 10:43:05 +00:00
David Baker e006e92255 Upgrade electron-notarize
To include https://github.com/electron/electron-notarize/pull/14
2019-11-04 18:56:41 +00:00
RiotRobot a92e676e28 Merge branch 'release-v1.5.2' 2019-11-04 18:34:12 +00:00
RiotRobot 17027cb515 v1.5.2 2019-11-04 18:30:37 +00:00
Michael Telatynski 7391846eda
Merge pull request #11306 from vector-im/t3chguy/add_eslint-plugin-react-hooks
Add dependency to eslint-plugin-react-hooks as react-sdk did
2019-11-04 16:58:26 +00:00
Michael Telatynski f3656c2792 Add dependency to eslint-plugin-react-hooks as react-sdk did 2019-11-04 16:52:23 +00:00
David Baker 7a7ea8c7f6 I meant 6.1.2. There is no 6.1.12 2019-11-04 15:33:25 +00:00
RiotRobot fb64a0a46c v1.5.1 2019-11-04 15:17:30 +00:00
RiotRobot 6d553d1ecd Released react-sdk & js-sdk 2019-11-04 15:14:59 +00:00
Michael Telatynski 10e1d9093e transform-async-to-promises: get rid of bluebird 2019-11-04 12:46:28 +00:00
RiotRobot 3ba3c1b881 v1.5.1-rc.2 2019-11-01 10:24:29 +00:00
RiotRobot 0c18f944cc react-sdk rc.2 2019-11-01 10:22:09 +00:00
RiotRobot 35d1222cba v1.5.1-rc.1 2019-10-30 16:51:57 +00:00
RiotRobot f7bb2c02fb js-sdk & react-sdk rc.1 2019-10-30 16:50:31 +00:00
David Baker 88339fc782 Bump electron to 6.1.2
7 is available but I'm not feeling that brave just yet
2019-10-30 13:54:05 +00:00
J. Ryan Stinnett 14f59801d7 Change back to develop branch for deps 2019-10-18 16:14:28 +01:00
RiotRobot 36c07a1c3a Merge branch 'master' into develop 2019-10-18 15:01:21 +01:00
RiotRobot 46b75e8c3c v1.5.0 2019-10-18 14:57:44 +01:00
RiotRobot e275441701 Upgrade to JS SDK v2.4.2 and React SDK v1.7.0 2019-10-18 14:54:02 +01:00
J. Ryan Stinnett 77731b5674 Merge 'dbkr/windows_signing' into v1.5.0 2019-10-18 14:24:57 +01:00
David Baker 8e81685a9f
Merge pull request #11126 from vector-im/dbkr/windows_signing
Sign main Windows executable
2019-10-18 12:02:04 +01:00
Michael Telatynski 5e783124e8
Merge pull request #11140 from vverst/dark-title-bar
Add darkModeSupport to allow dark themed title bar.
2019-10-14 18:27:27 +01:00
David Baker 5a7efcd738 Sign the main executable on windows
and automate the signing of the installers
2019-10-11 12:01:50 +01:00
David Baker 0259eb6419 Go back to upstream electron-notarize
It doesn't work as a github dependency because the typescript
doesn't get built.
2019-10-10 18:34:26 +01:00
David Baker a7d1d9880b Use my fork of electron-notarize
if only to test it
2019-10-10 14:56:35 +01:00
David Baker 29f186bc18 add electron-notarize 2019-10-10 11:57:39 +01:00
RiotRobot 561d0c9a4c v1.5.0-rc.1 2019-10-09 17:37:00 +01:00
RiotRobot b18e4f079f js-sdk & react-sdk rc.1 2019-10-09 17:00:22 +01:00
David Baker ff70339aad Working branch for notarisation 2019-10-09 16:29:24 +01:00
David Baker b6d1d0bf5d Bump Olm to 3.1.4 for olm_session_describe 2019-10-09 15:40:25 +01:00
J. Ryan Stinnett fce5b4dd78 Enable Webpack production mode for start:js:prod
The (rarely used) `start:js:prod` script for running production mode locally
failed to set Webpack into production mode, so things like minification would be
skipped.
2019-10-09 10:59:44 +01:00
vverst 2e5b0fb72d
Add darkModeSupport 2019-10-09 09:04:45 +02:00
David Baker af57c9e321 js-sdk & react-sdk develop 2019-10-04 11:08:08 +01:00
RiotRobot 685d913171 v1.4.2 2019-10-04 10:41:06 +01:00
RiotRobot b333058b57 released react-sdk 2019-10-04 10:39:53 +01:00
David Baker 7df140c164 electron version bump 2019-10-04 10:21:27 +01:00
RiotRobot 1ba2731391 v1.4.2-rc.1 2019-10-02 10:33:37 +01:00
David Baker d83c942fe5 released js-sdk & react-sdk 2019-10-02 10:30:13 +01:00
J. Ryan Stinnett f7a08e8d27 Change back to develop branch for deps 2019-10-01 13:32:36 +01:00
RiotRobot be0b4e9072 v1.4.1 2019-10-01 11:52:23 +01:00
RiotRobot 55fe24e72c Upgrade to React SDK 1.6.1 and JS SDK 2.4.1 2019-10-01 11:47:44 +01:00
J. Ryan Stinnett 6094b8be9a Change back to develop branch for deps 2019-09-27 14:46:05 +01:00
RiotRobot 97a2a6a168 v1.4.0 2019-09-27 12:36:45 +01:00
RiotRobot d76ed50625 Upgrade to React SDK 1.6.0 and JS SDK 2.4.0 2019-09-27 12:09:11 +01:00
RiotRobot 845590ed68 v1.4.0-rc.2 2019-09-26 12:21:17 +01:00
RiotRobot 0e6b3eab11 Upgrade to React SDK 1.6.0-rc.2 2019-09-26 12:15:43 +01:00
RiotRobot 1713f49e07 v1.4.0-rc.1 2019-09-25 17:49:29 +01:00
RiotRobot 6db826005c Upgrade to React SDK 1.6.0-rc.1 and JS SDK 2.4.0-rc.1 2019-09-25 17:42:57 +01:00
J. Ryan Stinnett 3ee8098eb2 Upgrade to latest Electron 6.x 2019-09-25 17:07:52 +01:00
RiotRobot 6bd089c350 Merge branch 'master' into develop 2019-09-19 17:54:39 +01:00
RiotRobot ab3f1f829a v1.3.6 2019-09-19 17:51:56 +01:00
Travis Ralston 43d85521c4 Upgrade to develop dependencies 2019-09-17 11:05:05 -06:00
Travis Ralston e88c5a0da7 Use the same gemini-scrollbar version as the react-sdk
Might fix an issue?
2019-09-17 09:35:14 -06:00
RiotRobot b0934c9121 Merge branch 'master' into develop 2019-09-16 17:59:09 +01:00