Commit Graph

3293 Commits

Author SHA1 Message Date
Matthew Hodgson
a8297a7698 fix build 2019-05-19 16:11:12 +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
09a9b2e15e Merge branch 'master' into develop 2019-05-07 15:50:14 +01:00
David Baker
aec1e98086 Released js-sdk 2019-05-07 15:30:21 +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
4b9be2aec4 Remove the karma junit reporter
We may have used it in our jenkins tests at some point but we don't
have those anymore. It weas pulling in ancient dependencies because
we were using version 2.0.0 which is fact much older than the
current version (1.2.0). We have little use for junit output anymore
so just remove it.
2019-05-03 10:39:13 +01:00
David Baker
4e57993094 yarn upgrade 2019-05-03 10:22:10 +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
David Baker
5b92693cb3 js-sdk rc.1 2019-04-30 11:53:10 +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
Bruno Windels
0592a1711a
Merge pull request #2439 from matrix-org/matthew/retina
Fix for retina thumbnails being massive
2019-04-09 16:14:25 +00:00
David Baker
7b87229e29 Add stylelint
Not added to the CI / default linting phases yet as, predictably
enough, it's very unhappy with our CSS. Just added one rule which is
that our CSS is indented with 4 spaces (the default being 2).
2019-04-09 14:05:53 +01:00
Bruno Windels
d400ebde65 add new dependencies to lock file 2019-04-08 15:34:51 +02:00
Hubert Chathi
ec08cd99aa bump olm version 2019-04-05 16:22:06 -04:00
J. Ryan Stinnett
ba7caaa115 Update yarn.lock 2019-04-03 11:50:39 +01:00
J. Ryan Stinnett
57d72b4deb
Merge pull request #2841 from jryans/storage-eviction-modal
Notify user when crypto data is missing
2019-04-01 17:31:39 +01:00
David Baker
51f6d02cf1 Released js-sdk & react-sdk, and bump electron version 2019-04-01 13:52:11 +01:00
David Baker
6cde0eb1b2 released js-sdk 2019-04-01 13:38:06 +01:00
J. Ryan Stinnett
328f0cd6bf Notify user when crypto data is missing
If we have account data in local storage but nothing in the crypto store, it
generally means the browser has evicted IndexedDB out from under us. This adds a
modal to explain the situation and offer to completely clear storage to get
things back to normal.

Fixes https://github.com/vector-im/riot-web/issues/9109
2019-03-29 16:06:08 +00:00
David Baker
d747896354 react-sdk & js-sdk rc.1 2019-03-27 17:44:30 +00:00
David Baker
fef36d3e1d react-sdk rc.1 2019-03-27 17:35:36 +00:00
J. Ryan Stinnett
a8e4949616 Update matrix-mock-request 2019-03-27 15:09:34 +00:00
J. Ryan Stinnett
86cf83e178 Update matrix-mock-request 2019-03-27 15:07:14 +00:00
Bruno Windels
7fb4b32e8f update react-sdk version in yarn lockfile 2019-03-21 13:55:46 +01:00
David Baker
1a8fe4dd43 Go back to using mainine velocity
We moved off to our own fork of velocity many moons ago to fix
a memory leak bug when velocity was being barely maintained. They
have now merged the bugfix, so go back to mainline.
2019-03-20 10:54:06 +00: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
David Baker
bb111dc6c5 Update yarn.lock
Which wasn't updated at release time
2019-03-18 16:25:52 +00:00
Travis Ralston
bdc94f3847 Fix Chrome for Karma 2019-03-13 22:11:45 -06: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
J. Ryan Stinnett
db5b76b225 Add yarn lock file
For the React SDK, we did not commit npm lock files, so there is no correct copy
to import from. For this repo, I created a fresh yarn lock file using yarn
install.
2019-03-11 13:53:34 +00:00