Commit Graph

1032 Commits (3bbd3e246a294bcd1454a25f6b5cf4b07d84bca8)

Author SHA1 Message Date
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