4548831ac5
Reset matrix-js-sdk back to develop branch
2020-03-04 13:07:45 +00:00
d88f9ed2c0
Merge branch 'master' into develop
2020-03-04 13:06:43 +00:00
6e68c106f7
v1.5.12
2020-03-04 12:58:03 +00:00
c26396d693
Upgrade matrix-react-sdk to 2.2.1
2020-03-04 12:01:31 +00:00
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
adc329c67f
Revert "Upgrade to Electron 8.0.2"
...
This reverts commit 9b9d585af0
2020-03-03 13:21:49 -07:00
bb6afd7c30
backport riot-desktop implementation into riot-web
2020-03-02 20:16:41 +00:00
94ceb5a46b
Reset SDKs back to develop branch
2020-03-02 17:57:08 +00:00
43b70bf720
v1.5.11
2020-03-02 17:51:01 +00:00
620414187f
Upgrade matrix-react-sdk to 2.2.0
2020-03-02 17:47:53 +00:00
e71dcacd2d
Upgrade matrix-js-sdk to 5.1.0
2020-03-02 17:47:32 +00:00
03f63397ff
v1.5.11-rc.1
2020-02-26 14:37:19 +00:00
a4d01a5f04
Upgrade matrix-react-sdk to 2.2.0-rc.1
2020-02-26 14:34:56 +00:00
4fced076b7
Upgrade matrix-js-sdk to 5.1.0-rc.1
2020-02-26 14:33:57 +00:00
9b9d585af0
Upgrade to Electron 8.0.2
2020-02-26 13:44:07 +00:00
de71e36843
Reset matrix-react-sdk back to develop branch
2020-02-20 12:01:58 +00:00
120d36d70b
Reset matrix-js-sdk back to develop branch
2020-02-20 12:01:58 +00:00
eb66d62f1a
v1.5.10
2020-02-19 16:23:51 +00:00
dafb2f01b1
released react-sdk & js-sdk
2020-02-19 16:20:44 +00:00
5ac9902384
Switch back to develop deps
2020-02-17 14:15:21 +00:00
a5d5e2800c
v1.5.9
2020-02-17 13:42:37 +00:00
9b5655c1fa
Released js-sdk & react-sdk
2020-02-17 13:39:24 +00:00
08c149ed66
v1.5.9-rc.1
2020-02-13 17:56:15 +00:00
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
036348cd60
Electron 8.0.0 crashes on macOS, reverting to 7.1.12
2020-02-13 15:24:59 +00:00
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
3eb5eb1d21
Upgrade electron-builder
2020-02-13 14:50:19 +00:00
4a1b9d8ea4
Upgrade to Electron 8.0.0
2020-02-13 14:45:42 +00:00
b107da09fa
Merge pull request #12251 from vector-im/jaywink/add-contribute-json
...
Add contribute.json
2020-02-05 15:21:07 +00:00
9534a25270
Fix contribute.json location as per spec
...
Signed-off-by: Jason Robinson <jasonr@matrix.org>
2020-02-05 16:28:44 +02:00
bceca49cdc
Update vendored modernizr
2020-02-04 11:00:47 +00:00
d50b52cdc5
Try to fix Jest
2020-01-28 14:31:09 +00:00
8ca6c2c433
Flip SDKs back to develop
2020-01-27 16:01:12 +00:00
9782599c69
Merge branch 'master' into develop
2020-01-27 12:02:44 +00:00
768cabe4bb
v1.5.8
2020-01-27 11:57:49 +00:00
dd26d43173
js-sdk 4.0.0 & react-sdk 2.0.0
2020-01-27 11:52:18 +00:00
902252ad93
v1.5.8-rc.2
2020-01-22 14:24:50 +00:00
eb5e14661d
Actually pull in react-sdk rc.2
2020-01-22 14:20:46 +00:00
ebd3f0e4e1
v1.5.8-rc.1
2020-01-22 13:22:19 +00:00
8913eba60d
react-sdk rc.2
2020-01-22 13:06:37 +00:00
5b575d5627
Force Jest to resolve the js-sdk and react-sdk to src directories
2020-01-20 14:28:29 -07:00
c3a5e2e5d3
react-sdk & js-sdk rc.1
2020-01-20 14:36:12 +00:00
ad8bd62ae6
bump electron version
2020-01-20 14:15:40 +00:00
8c6d6b1d09
Fix yarn start concurrent commands
2020-01-16 23:26:13 +00:00
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
3fb6b1ed63
Remove excessive sleep now that we're not using chrome
2020-01-15 15:31:08 -07:00
5cd54e9f6d
Use jsdom 14 instead of 13
2020-01-15 15:30:40 -07:00
c70d21a92e
Force Jest to use exactly one copy of React and ReactDOM
2020-01-15 14:42:16 -07:00
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
f0dbc85ca5
Mock out browser-request to fix i18n
2020-01-15 14:06:55 -07:00
161a1342b2
Swap over to Jest, breaking everything
2020-01-15 13:24:19 -07:00
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
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
f73d2bae1f
Merge branch 'develop' into travis/sourcemaps
2020-01-13 11:22:47 -07:00
2574841bf4
v1.5.7
2020-01-13 13:14:12 +00:00
057f78fadc
released react-sdk & js-dk
2020-01-13 13:12:29 +00:00
d877187d5e
Remove postinstall script now that it's not needed
2020-01-09 13:43:33 -07:00
9bf1c65971
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev
2020-01-09 13:43:25 -07:00
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
f7637a0df7
v1.5.7-rc.2
2020-01-08 11:25:06 +00:00
a1b14751e5
bump to matrix-react-sdk rc.2
2020-01-08 11:22:50 +00:00
5f1ef6dfb8
v1.5.7-rc.1
2020-01-06 16:26:46 +00:00
1de2fe5e27
Merge remote-tracking branch 'origin/develop' into release-v1.5.7
2020-01-06 16:22:33 +00:00
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
f7618e3c73
react-sdk & js-sdk rc.1
2020-01-06 14:05:47 +00:00
8b3df0d793
Bump electron version
2020-01-06 13:09:10 +00:00
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
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
f6db2ed8dd
Remove babel-plugin-transform-async-to-bluebird
2019-12-13 13:08:29 +00:00
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
dd9eda8f97
Flip back to develop
2019-12-11 10:37:36 +00:00
eb42793ad5
Remove bluebird transform as regular dep
2019-12-11 10:36:24 +00:00
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
bd57ff793f
Remove rest of the origin migrator
2019-12-09 14:54:36 +00:00
b7f6d7b102
Merge branch 'master' into develop
2019-12-09 11:43:27 +00:00
cfb3258c36
v1.5.6
2019-12-09 11:39:56 +00:00
45d51f56f2
Released js-sdk & react-sdk
2019-12-09 11:38:11 +00:00
e2b1a86a29
Remove draft-js dependency
...
...which for some reason was still kicking around
2019-12-06 13:33:30 +00:00
1d49544238
Remove bluebird transform as regular dep
2019-12-06 12:39:29 +00:00
70d2adb9e2
Move extract-text-webpack-plugin to dev dep
2019-12-06 12:36:58 +00:00
8ad1bd1501
Move bluebird transform to a dev dependency
2019-12-04 16:02:55 +00:00
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
aaf1afaa13
v1.5.6-rc.1
2019-12-04 13:59:44 +00:00
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
c99cd9fc58
js-sdk & react-sdk rc.1
2019-12-04 12:05:56 +00:00
c6afbed3fe
electron 7.1.3
2019-12-04 11:47:14 +00:00
31ee75f14f
Flip SDKs back to develop
2019-11-27 13:33:27 +00:00
ff452b9d87
Merge branch 'master' into develop
2019-11-27 10:54:58 +00:00
d56b73e220
v1.5.5
2019-11-27 10:48:52 +00:00
10c5485373
Upgrade to JS SDK 2.4.5 and React SDK 1.7.4
2019-11-27 10:44:15 +00:00
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
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
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
acd7e028d5
Merge branch 'master' into develop
2019-11-25 13:43:52 +00:00
bf26ec9d1a
v1.5.4
2019-11-25 13:40:05 +00:00
83591b4567
Released js-sdk & react-sdk
2019-11-25 13:36:37 +00:00
7b59379d29
v1.5.4-rc.2
2019-11-22 17:30:05 +00:00
1cebd3dcd1
react-sdk rc.2
2019-11-22 17:27:27 +00:00
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
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