cb8319ea2d
Reset matrix-react-sdk back to develop branch
2020-04-01 15:35:13 +01:00
af35696db9
Reset matrix-js-sdk back to develop branch
2020-04-01 15:35:02 +01:00
ccd998d709
Merge branch 'master' into develop
2020-04-01 15:34:02 +01:00
5f5d46eb11
Upgrade matrix-react-sdk to 2.3.1
2020-04-01 15:08:57 +01:00
d4f75e4e1b
Reset matrix-react-sdk back to develop branch
2020-03-30 13:54:09 +01:00
4a4df94339
Reset matrix-js-sdk back to develop branch
2020-03-30 13:53:58 +01:00
51f4327ce1
Upgrade matrix-react-sdk to 2.3.0
2020-03-30 13:45:21 +01:00
37cebf38cc
Upgrade matrix-js-sdk to 5.2.0
2020-03-30 13:44:42 +01:00
5b35d6e570
Upgrade matrix-react-sdk to 2.3.0-rc.1
2020-03-26 13:28:04 +00:00
9269d9b669
Upgrade matrix-js-sdk to 5.2.0-rc.1
2020-03-26 13:27:40 +00:00
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
a9fbf2f968
Reset matrix-react-sdk back to develop branch
2020-03-17 14:39:09 +00:00
25a3449ad2
Reset matrix-js-sdk back to develop branch
2020-03-17 14:38:58 +00:00
b01c6e67fd
Merge branch 'master' into develop
2020-03-17 14:37:28 +00:00
8002bc66d7
Upgrade matrix-react-sdk to 2.2.3
2020-03-17 14:29:06 +00:00
c3553a2649
Upgrade matrix-js-sdk to 5.1.1
2020-03-17 14:28:23 +00:00
368d26af34
update yarn lock a little more forcibly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:36:26 +00:00
e110c8ed9b
Remove stuff that yarn install doesn't think we need
2020-03-12 10:47:34 -06:00
ce9a964956
Merge pull request #12691 from vector-im/dbkr/yarn_upgrade_20200311
...
yarn upgrade
2020-03-12 09:45:45 +00:00
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
34817a0044
js-sdk & react-sdk rc.1
2020-03-11 17:36:18 +00:00
e18157d5a0
yarn upgrade
2020-03-11 14:56:13 +00:00
872a7a74fb
Reset matrix-react-sdk back to develop branch
2020-03-04 13:07:59 +00:00
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
c26396d693
Upgrade matrix-react-sdk to 2.2.1
2020-03-04 12:01:31 +00:00
94ceb5a46b
Reset SDKs back to develop branch
2020-03-02 17:57:08 +00:00
d077165858
Merge branch 'master' into develop
2020-03-02 17:55:04 +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
bb5aa94707
Upgrade deps
2020-02-26 15:04:38 +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
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
dafb2f01b1
released react-sdk & js-sdk
2020-02-19 16:20:44 +00:00
9b5655c1fa
Released js-sdk & react-sdk
2020-02-17 13:39:24 +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
3eb5eb1d21
Upgrade electron-builder
2020-02-13 14:50:19 +00:00
8ca6c2c433
Flip SDKs back to develop
2020-01-27 16:01:12 +00:00
dd26d43173
js-sdk 4.0.0 & react-sdk 2.0.0
2020-01-27 11:52:18 +00:00
eb5e14661d
Actually pull in react-sdk rc.2
2020-01-22 14:20:46 +00:00
8913eba60d
react-sdk rc.2
2020-01-22 13:06:37 +00:00
c3a5e2e5d3
react-sdk & js-sdk rc.1
2020-01-20 14:36:12 +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
5cd54e9f6d
Use jsdom 14 instead of 13
2020-01-15 15:30:40 -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
161a1342b2
Swap over to Jest, breaking everything
2020-01-15 13:24:19 -07:00
f73d2bae1f
Merge branch 'develop' into travis/sourcemaps
2020-01-13 11:22:47 -07:00
057f78fadc
released react-sdk & js-dk
2020-01-13 13:12:29 +00: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
a1b14751e5
bump to matrix-react-sdk rc.2
2020-01-08 11:22:50 +00:00
f7618e3c73
react-sdk & js-sdk rc.1
2020-01-06 14:05:47 +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
6f06716954
Regenerate yarn.lock
2019-12-13 13:10:30 +00:00
0930424406
Further attempt to flip to develop
2019-12-11 15:56:59 +00:00
dd9eda8f97
Flip back to develop
2019-12-11 10:37:36 +00:00
b7f6d7b102
Merge branch 'master' into develop
2019-12-09 11:43:27 +00:00
45d51f56f2
Released js-sdk & react-sdk
2019-12-09 11:38:11 +00:00
60467ffd02
yarn upgrade
...
attempt 2
2019-12-06 15:58:44 +00:00
e2b1a86a29
Remove draft-js dependency
...
...which for some reason was still kicking around
2019-12-06 13:33:30 +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
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
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
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
acd7e028d5
Merge branch 'master' into develop
2019-11-25 13:43:52 +00:00
83591b4567
Released js-sdk & react-sdk
2019-11-25 13:36:37 +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
f07e3c3b25
react-sdk & js-sdk rc.1
2019-11-20 18:31:32 +00:00
15c0561588
released react-sdk
2019-11-06 14:24:59 +00:00
385ad5f9ce
Don't transform async at all, all browsers we care about support it
2019-11-05 10:43:05 +00:00
e006e92255
Upgrade electron-notarize
...
To include https://github.com/electron/electron-notarize/pull/14
2019-11-04 18:56:41 +00:00
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
f3656c2792
Add dependency to eslint-plugin-react-hooks as react-sdk did
2019-11-04 16:52:23 +00:00
6d553d1ecd
Released react-sdk & js-sdk
2019-11-04 15:14:59 +00:00
10e1d9093e
transform-async-to-promises: get rid of bluebird
2019-11-04 12:46:28 +00:00
0c18f944cc
react-sdk rc.2
2019-11-01 10:22:09 +00:00
f7bb2c02fb
js-sdk & react-sdk rc.1
2019-10-30 16:50:31 +00:00
14f59801d7
Change back to develop branch for deps
2019-10-18 16:14:28 +01:00
e275441701
Upgrade to JS SDK v2.4.2 and React SDK v1.7.0
2019-10-18 14:54:02 +01:00
77731b5674
Merge 'dbkr/windows_signing' into v1.5.0
2019-10-18 14:24:57 +01:00
5a7efcd738
Sign the main executable on windows
...
and automate the signing of the installers
2019-10-11 12:01:50 +01:00
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
a7d1d9880b
Use my fork of electron-notarize
...
if only to test it
2019-10-10 14:56:35 +01:00
29f186bc18
add electron-notarize
2019-10-10 11:57:39 +01:00
b18e4f079f
js-sdk & react-sdk rc.1
2019-10-09 17:00:22 +01:00
b6d1d0bf5d
Bump Olm to 3.1.4 for olm_session_describe
2019-10-09 15:40:25 +01:00
b99bdbcd4e
Revert "Run yarn upgrade"
2019-10-04 16:19:29 +01:00
64a961ec00
Run yarn upgrade
2019-10-04 11:13:03 +01:00
af57c9e321
js-sdk & react-sdk develop
2019-10-04 11:08:08 +01:00
b333058b57
released react-sdk
2019-10-04 10:39:53 +01:00
d83c942fe5
released js-sdk & react-sdk
2019-10-02 10:30:13 +01:00
f7a08e8d27
Change back to develop branch for deps
2019-10-01 13:32:36 +01:00
55fe24e72c
Upgrade to React SDK 1.6.1 and JS SDK 2.4.1
2019-10-01 11:47:44 +01:00
ee827c917e
Upgrade deps
2019-09-27 15:18:47 +01:00
6094b8be9a
Change back to develop branch for deps
2019-09-27 14:46:05 +01:00
d76ed50625
Upgrade to React SDK 1.6.0 and JS SDK 2.4.0
2019-09-27 12:09:11 +01:00
0e6b3eab11
Upgrade to React SDK 1.6.0-rc.2
2019-09-26 12:15:43 +01:00
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
43d85521c4
Upgrade to develop dependencies
2019-09-17 11:05:05 -06:00
e88c5a0da7
Use the same gemini-scrollbar version as the react-sdk
...
Might fix an issue?
2019-09-17 09:35:14 -06:00
c212b525d2
Update yarn.lock
2019-09-17 14:05:41 +01:00
b0934c9121
Merge branch 'master' into develop
2019-09-16 17:59:09 +01:00
9bb007f4b5
released js-sdk & react-sdk
2019-09-16 17:51:52 +01:00
8ad667c43e
Tweak lock file to pull in only one React version
...
Yarn deps can be a bit fiddly when targeting specific versions. This tweaks the
lock file to only pull in a single React version.
For others who may need to do something like this again, I recommend deleting
specific package entries from `yarn.lock` and re-running `yarn install`. That
should make it pick the right thing while also leaving other packages as they
were.
2019-09-16 14:37:52 +01:00
dbd5d891db
js-sdk rc.1 (and updated react sdk) for report api
2019-09-13 16:23:39 +01:00
09492b15e8
react-sdk rc.2
2019-09-13 14:48:23 +01:00
0d53eb5386
react-sdk rc.1
2019-09-12 18:42:53 +01:00
eaf3bdbf34
Merge branch 'master' into develop
2019-09-12 13:26:17 +01:00
5a6e889bd4
Released js-sdk & react-sdk
2019-09-12 13:16:26 +01:00
03b5b622d0
js-sdk & react-sdk rc.1
2019-09-11 18:48:59 +01:00
0b6c29d274
Merge pull request #10480 from vector-im/t3chguy/react16
...
Switch to React 16
2019-09-11 10:42:24 -06:00
f0884b8e47
Bump eslint-utils from 1.4.0 to 1.4.2
...
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils ) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases )
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
2019-08-29 14:47:34 +00:00
33c17a6f2e
Switch to React 16.9
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-28 11:07:46 +01:00
7eefc9d856
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/react16
2019-08-24 11:42:03 +01:00
24e59ccedd
Upgrade electron-builder to 21.2.0
...
This is meant to help with:
* macOS packaging for Electron 6 (https://github.com/vector-im/riot-web/issues/10473 )
* Linux desktop file should not have quotes (https://github.com/vector-im/riot-web/issues/6421 )
It did not help with:
* Linux sandbox for Electron 5 (https://github.com/vector-im/riot-web/issues/10509 )
Fixes https://github.com/vector-im/riot-web/issues/6421
Part of https://github.com/vector-im/riot-web/issues/10473
2019-08-16 12:57:03 +01:00
773dd0805b
Bump matrix-react-test-utils for React 16 compatibility
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 17:41:51 +01:00
d347ab08e7
Merge branches 'develop' and 't3chguy/react16' of github.com:vector-im/riot-web into t3chguy/react16
2019-08-10 00:20:30 +01:00
feb62793d2
Revert "Upgrade to babel@7 and support TypeScript"
...
This reverts commit 7b89893645
2019-08-08 13:30:33 -06:00
7b89893645
Upgrade to babel@7 and support TypeScript
...
See https://github.com/matrix-org/matrix-react-sdk/pull/3292
Like react-sdk#3292, this fixes the couple source files which mix imports and module exports (they can't be mixed anymore).
2019-08-08 13:30:11 -06:00
c7b691e2d7
Merge branch 'master' into develop
2019-08-05 12:13:51 +01:00
90b26a98d3
Released js-sdk & react-sdk
2019-08-05 12:04:57 +01:00
06e7a48aaf
Switch to React 16.8
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-01 15:31:33 +01:00
67e31e0e30
Upgrade dependencies
2019-07-31 17:46:02 +01:00
61228d112e
Upgrade to JS SDK 2.3.0-rc.1 and React SDK 1.5.0-rc.1
2019-07-31 16:52:52 +01:00
72f3f1afee
Upgrade to JS SDK 2.2.0 and React SDK 1.4.0
2019-07-18 15:53:25 +01:00
fab0d70f21
react-sdk rc.3
2019-07-15 17:31:13 +01:00
be601d4654
Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2
2019-07-12 17:37:01 +01:00
f771f607d6
Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1
2019-07-12 11:39:07 +01:00
1199554be7
Upgrade dependencies
2019-07-11 11:49:12 +01:00
d3a3115298
Merge branch 'master' into develop
2019-07-11 11:31:48 +01:00
ff1a5e0539
Upgrade lodash
2019-07-11 11:13:37 +01:00
6ccf88f808
Upgrade to JS SDK 2.1.1 and React SDK 1.3.1
2019-07-11 11:09:56 +01:00
5f1d6f333c
Merge branch 'master' into develop
2019-07-08 11:14:40 +01:00
090b2dbd30
Upgrade to JS SDK 2.1.0 and React SDK 1.3.0
2019-07-08 10:58:13 +01:00
7424c776e5
Upgrade dependencies
2019-07-04 15:14:44 +01:00
751316f388
Upgrade to JS SDK 2.1.0-rc.1 and React SDK 1.3.0-rc.1
2019-07-03 17:25:05 +01:00
ba5cae554c
Upgrade electron-builder, electron-builder-squirrel-windows to latest
2019-07-03 16:06:12 +01:00
48b6f8c954
Released js-sdk & react-sdk
2019-06-19 15:55:02 +01:00
589aa19246
js-sdk & react-sdk rc.2
2019-06-18 15:57:30 +01:00
974da9947c
js-sdk & react-sdk rc.1
2019-06-12 12:10:37 +01:00
ada47d476c
Merge branch 'master' into develop
2019-05-31 12:02:00 +01:00
7c03bd128b
Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1
2019-05-31 11:52:42 +01:00
fcf8e246cf
Merge branch 'master' into develop
2019-05-29 16:27:46 +01:00
f4b1e3307d
Upgrade SDKs to 1.2.0
2019-05-29 16:14:25 +01:00
e129db4978
Upgrade electron-builder
2019-05-24 11:29:02 +01:00
59fa374491
Upgrade SDKs to 1.2.0-rc.1
2019-05-23 17:39:03 +01:00
913bc6da93
Update yarn.lock
2019-05-21 13:27:02 +01:00
05a2cb1020
Merge branch 'master' into develop
2019-05-15 14:40:16 +01:00
d0def4a80f
react-sdk 1.1.2
2019-05-15 14:34:13 +01:00
da9cde6d18
Merge branch 'master' into develop
2019-05-14 14:04:34 +01:00
8ed44e6b64
matrix-react-sdk v1.1.1
2019-05-14 13:52:05 +01:00
814b5297ad
Merge branch 'master' into develop
2019-05-07 16:05:58 +01:00
c81b9bab79
Released react-sdk and js-sdk
2019-05-07 15:52:50 +01:00
1a1f2254e5
Remove karma junit output
...
See https://github.com/matrix-org/matrix-react-sdk/pull/2944
2019-05-03 11:40:53 +01:00
908a72e00e
yarn upgrade
...
ALL THE UPDATES!
(so many updates)
2019-05-03 11:13:04 +01:00
846797be76
add new babel plugins to deps
2019-04-30 12:48:18 +01:00
cc8eaea5a7
js-sdk & react-sdk rc.1, electron 4.1.5
2019-04-30 12:10:06 +01:00
2c64a4f3a1
update yarn.lock with olm release
2019-04-24 12:02:41 -04:00
86bbe156db
Merge pull request #9498 from vector-im/travis/packages.matrix.org
...
Use packages.matrix.org for Olm
2019-04-16 08:28:38 -06:00
bb5dedeeb9
Update yarn.lock
2019-04-16 13:31:58 +01:00
cbaa7a81bf
Use packages.matrix.org for Olm
...
Fixes https://github.com/vector-im/riot-web/issues/9497
2019-04-15 19:18:33 -06:00
ec08cd99aa
bump olm version
2019-04-05 16:22:06 -04:00
51f6d02cf1
Released js-sdk & react-sdk, and bump electron version
2019-04-01 13:52:11 +01:00
d747896354
react-sdk & js-sdk rc.1
2019-03-27 17:44:30 +00:00
a8e4949616
Update matrix-mock-request
2019-03-27 15:09:34 +00:00
7fb4b32e8f
update react-sdk version in yarn lockfile
2019-03-21 13:55:46 +01:00
9735c332ff
Merge branch 'master' into develop
2019-03-18 16:27:39 +00:00
2de1f375fa
Update yarn.lock
...
which wasn't updated at release time
2019-03-18 16:27:01 +00:00
1fb8b23d4c
Set up BuildKite for Chrome
2019-03-13 22:03:37 -06:00
75a7e7ce82
Update webpack-dev-server
2019-03-13 15:07:50 +00:00
a5b8d6381f
Convert from npm to yarn lock file
...
The npm lock file was imported into yarn. A yarn install pass was then run to
double-check the lock file for sanity.
2019-03-11 14:35:03 +00:00
RiotRobot