5303 Commits

Author SHA1 Message Date
RiotRobot 6cab9dd1d5 v1.2.0-rc.1 2019-05-23 17:16:19 +01:00
RiotRobot bba4029165 Upgrade JS SDK to 1.2.0-rc.1 2019-05-23 16:52:45 +01:00
David Baker 001b7fb799 electron 4.2.2 2019-05-22 12:51:41 +01:00
Matthew Hodgson 4cbe6c1000 remove emojione 2019-05-19 21:26:11 +01:00
Matthew Hodgson a8297a7698 fix build 2019-05-19 16:11:12 +01:00
Matthew Hodgson dc72641264 replace emojione with twemoji. completely untested & debugged & unoptimised 2019-05-19 15:23:43 +01:00
David Baker 05a2cb1020 Merge branch 'master' into develop 2019-05-15 14:40:16 +01:00
David Baker 5aa88abacc v1.1.2 2019-05-15 14:36:52 +01:00
David Baker d0def4a80f react-sdk 1.1.2 2019-05-15 14:34:13 +01:00
David Baker 39b8d8957d Merge branch 'master' into develop 2019-05-15 14:31:30 +01:00
David Baker 4e3c39cd60 v1.1.2 2019-05-15 14:30:21 +01:00
David Baker da9cde6d18 Merge branch 'master' into develop 2019-05-14 14:04:34 +01:00
David Baker 5aa8326dfc v1.1.1 2019-05-14 14:01:01 +01:00
David Baker 8ed44e6b64 matrix-react-sdk v1.1.1 2019-05-14 13:52:05 +01:00
David Baker 0f13bb2738 Merge branch 'master' into develop 2019-05-14 13:49:44 +01:00
David Baker 851d207611 v1.1.1 2019-05-14 13:48:47 +01:00
David Baker 814b5297ad Merge branch 'master' into develop 2019-05-07 16:05:58 +01:00
David Baker 2ab8db3c0c v1.1.0 2019-05-07 15:55:56 +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 3b03e23ace v1.1.0 2019-05-07 15:36:10 +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 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 e4f997113d v1.1.0-rc.1 2019-04-30 12:49:40 +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 57322f82be v1.1.0-rc.1 2019-04-30 12:02:19 +01:00
David Baker 5b92693cb3 js-sdk rc.1 2019-04-30 11:53:10 +01:00
Hubert Chathi 9519ad46a1 use the release version of olm 3.1.0 2019-04-23 18:08:07 -04: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
David Baker f400cea437 Merge branch 'master' into develop 2019-04-16 01:26:24 +01:00
David Baker dcbe75ec2c v1.0.8 2019-04-16 01:22:59 +01:00
Andrew Morgan 96be8ad072 Remove 32-bit builds for MacOS and Linux 2019-04-09 18:24:30 +01: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
Andrew Morgan 38b661e2cb Switch to yarn 2019-04-09 17:03:58 +01:00
Andrew Morgan 657397b177 Add separate platform electron build commands
Add commands for building separate electron builds for each platform
2019-04-09 17:01:19 +01: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 15ba24f7fb Merge branch 'develop' into matthew/retina 2019-04-09 10:55:05 +02:00
Bruno Windels a41a14b975 Merge branch 'master' into develop 2019-04-08 16:21:13 +02:00
Bruno Windels f76b30af15 v1.0.7 2019-04-08 16:18:22 +02:00
Bruno Windels b6da314692 bump js-sdk to 1.0.4 and react-sdk to 1.0.7 2019-04-08 16:15:05 +02:00
Bruno Windels 381c2f613d Merge branch 'master' into develop 2019-04-08 16:13:48 +02:00
Bruno Windels 21de0235b0 v1.0.7 2019-04-08 16:13:03 +02:00
Bruno Windels ab02c80ede bump js-sdk to 1.0.4 2019-04-08 16:08:46 +02:00
Hubert Chathi ec08cd99aa bump olm version 2019-04-05 16:22:06 -04:00
Bruno Windels f1b00dff35 Merge branch 'develop' into matthew/retina 2019-04-05 13:35:54 +02: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 164a0e0160 v1.0.6 2019-04-01 13:55:12 +01:00
David Baker 51f6d02cf1 Released js-sdk & react-sdk, and bump electron version 2019-04-01 13:52:11 +01:00