Commit Graph

272 Commits (886f060f68d8789fbdd214ab80447fb9eb28d616)

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