Commit Graph

172 Commits

Author SHA1 Message Date
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
J. Ryan Stinnett c212b525d2 Update yarn.lock 2019-09-17 14:05:41 +01:00
RiotRobot b0934c9121 Merge branch 'master' into develop 2019-09-16 17:59:09 +01:00
RiotRobot 9bb007f4b5 released js-sdk & react-sdk 2019-09-16 17:51:52 +01:00
J. Ryan Stinnett 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
RiotRobot dbd5d891db js-sdk rc.1 (and updated react sdk) for report api 2019-09-13 16:23:39 +01:00
RiotRobot 09492b15e8 react-sdk rc.2 2019-09-13 14:48:23 +01:00
RiotRobot 0d53eb5386 react-sdk rc.1 2019-09-12 18:42:53 +01:00
RiotRobot eaf3bdbf34 Merge branch 'master' into develop 2019-09-12 13:26:17 +01:00
RiotRobot 5a6e889bd4 Released js-sdk & react-sdk 2019-09-12 13:16:26 +01:00
RiotRobot 03b5b622d0 js-sdk & react-sdk rc.1 2019-09-11 18:48:59 +01:00
Travis Ralston 0b6c29d274
Merge pull request #10480 from vector-im/t3chguy/react16
Switch to React 16
2019-09-11 10:42:24 -06:00
dependabot[bot] 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
Michael Telatynski 33c17a6f2e Switch to React 16.9
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-28 11:07:46 +01:00
Michael Telatynski 7eefc9d856 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/react16 2019-08-24 11:42:03 +01:00
J. Ryan Stinnett 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
Michael Telatynski 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
Michael Telatynski 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
Travis Ralston feb62793d2 Revert "Upgrade to babel@7 and support TypeScript"
This reverts commit 7b89893645.
2019-08-08 13:30:33 -06:00
Travis Ralston 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
RiotRobot c7b691e2d7 Merge branch 'master' into develop 2019-08-05 12:13:51 +01:00
RiotRobot 90b26a98d3 Released js-sdk & react-sdk 2019-08-05 12:04:57 +01:00
Michael Telatynski 06e7a48aaf Switch to React 16.8
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-01 15:31:33 +01:00
J. Ryan Stinnett 67e31e0e30 Upgrade dependencies 2019-07-31 17:46:02 +01:00
RiotRobot 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
RiotRobot 72f3f1afee Upgrade to JS SDK 2.2.0 and React SDK 1.4.0 2019-07-18 15:53:25 +01:00
RiotRobot fab0d70f21 react-sdk rc.3 2019-07-15 17:31:13 +01:00
RiotRobot 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
RiotRobot 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
J. Ryan Stinnett 1199554be7 Upgrade dependencies 2019-07-11 11:49:12 +01:00
RiotRobot d3a3115298 Merge branch 'master' into develop 2019-07-11 11:31:48 +01:00
J. Ryan Stinnett ff1a5e0539 Upgrade lodash 2019-07-11 11:13:37 +01:00
J. Ryan Stinnett 6ccf88f808 Upgrade to JS SDK 2.1.1 and React SDK 1.3.1 2019-07-11 11:09:56 +01:00
RiotRobot 5f1d6f333c Merge branch 'master' into develop 2019-07-08 11:14:40 +01:00
RiotRobot 090b2dbd30 Upgrade to JS SDK 2.1.0 and React SDK 1.3.0 2019-07-08 10:58:13 +01:00
J. Ryan Stinnett 7424c776e5 Upgrade dependencies 2019-07-04 15:14:44 +01:00
RiotRobot 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
J. Ryan Stinnett ba5cae554c Upgrade electron-builder, electron-builder-squirrel-windows to latest 2019-07-03 16:06:12 +01:00
RiotRobot 48b6f8c954 Released js-sdk & react-sdk 2019-06-19 15:55:02 +01:00
RiotRobot 589aa19246 js-sdk & react-sdk rc.2 2019-06-18 15:57:30 +01:00
RiotRobot 974da9947c js-sdk & react-sdk rc.1 2019-06-12 12:10:37 +01:00
RiotRobot ada47d476c Merge branch 'master' into develop 2019-05-31 12:02:00 +01:00
RiotRobot 7c03bd128b Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1 2019-05-31 11:52:42 +01:00
RiotRobot fcf8e246cf Merge branch 'master' into develop 2019-05-29 16:27:46 +01:00
RiotRobot f4b1e3307d Upgrade SDKs to 1.2.0 2019-05-29 16:14:25 +01:00
J. Ryan Stinnett e129db4978 Upgrade electron-builder 2019-05-24 11:29:02 +01:00
RiotRobot 59fa374491 Upgrade SDKs to 1.2.0-rc.1 2019-05-23 17:39:03 +01:00
J. Ryan Stinnett 913bc6da93 Update yarn.lock 2019-05-21 13:27:02 +01:00
David Baker 05a2cb1020 Merge branch 'master' into develop 2019-05-15 14:40:16 +01:00
David Baker d0def4a80f react-sdk 1.1.2 2019-05-15 14:34:13 +01:00
David Baker da9cde6d18 Merge branch 'master' into develop 2019-05-14 14:04:34 +01:00
David Baker 8ed44e6b64 matrix-react-sdk v1.1.1 2019-05-14 13:52:05 +01:00
David Baker 814b5297ad Merge branch 'master' into develop 2019-05-07 16:05:58 +01:00
David Baker c81b9bab79 Released react-sdk and js-sdk 2019-05-07 15:52:50 +01:00
David Baker 1a1f2254e5 Remove karma junit output
See https://github.com/matrix-org/matrix-react-sdk/pull/2944
2019-05-03 11:40:53 +01:00
David Baker 908a72e00e yarn upgrade
ALL THE UPDATES!

(so many updates)
2019-05-03 11:13:04 +01:00
David Baker 846797be76 add new babel plugins to deps 2019-04-30 12:48:18 +01:00
David Baker cc8eaea5a7 js-sdk & react-sdk rc.1, electron 4.1.5 2019-04-30 12:10:06 +01:00
Hubert Chathi 2c64a4f3a1 update yarn.lock with olm release 2019-04-24 12:02:41 -04:00
Travis Ralston 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
J. Ryan Stinnett bb5dedeeb9 Update yarn.lock 2019-04-16 13:31:58 +01:00
Travis Ralston 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
Hubert Chathi ec08cd99aa bump olm version 2019-04-05 16:22:06 -04:00
David Baker 51f6d02cf1 Released js-sdk & react-sdk, and bump electron version 2019-04-01 13:52:11 +01:00
David Baker d747896354 react-sdk & js-sdk rc.1 2019-03-27 17:44:30 +00:00
J. Ryan Stinnett a8e4949616 Update matrix-mock-request 2019-03-27 15:09:34 +00:00
Bruno Windels 7fb4b32e8f update react-sdk version in yarn lockfile 2019-03-21 13:55:46 +01:00
David Baker 9735c332ff Merge branch 'master' into develop 2019-03-18 16:27:39 +00:00
David Baker 2de1f375fa Update yarn.lock
which wasn't updated at release time
2019-03-18 16:27:01 +00:00
Travis Ralston 1fb8b23d4c Set up BuildKite for Chrome 2019-03-13 22:03:37 -06:00
J. Ryan Stinnett 75a7e7ce82 Update webpack-dev-server 2019-03-13 15:07:50 +00:00
J. Ryan Stinnett 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