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
6e68c106f7
v1.5.12
2020-03-04 12:58:03 +00:00
c26396d693
Upgrade matrix-react-sdk to 2.2.1
2020-03-04 12:01:31 +00:00
48c8f16a4c
Merge pull request #12590 from vector-im/t3chguy/sso
...
riot-desktop open SSO in browser so user doesn't have to auth twice
2020-03-03 22:27:46 +00:00
adc329c67f
Revert "Upgrade to Electron 8.0.2"
...
This reverts commit 9b9d585af0
2020-03-03 13:21:49 -07:00
bb6afd7c30
backport riot-desktop implementation into riot-web
2020-03-02 20:16:41 +00:00
94ceb5a46b
Reset SDKs back to develop branch
2020-03-02 17:57:08 +00:00
43b70bf720
v1.5.11
2020-03-02 17:51:01 +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
03f63397ff
v1.5.11-rc.1
2020-02-26 14:37:19 +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
9b9d585af0
Upgrade to Electron 8.0.2
2020-02-26 13:44:07 +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
eb66d62f1a
v1.5.10
2020-02-19 16:23:51 +00:00
dafb2f01b1
released react-sdk & js-sdk
2020-02-19 16:20:44 +00:00
5ac9902384
Switch back to develop deps
2020-02-17 14:15:21 +00:00
a5d5e2800c
v1.5.9
2020-02-17 13:42:37 +00:00
9b5655c1fa
Released js-sdk & react-sdk
2020-02-17 13:39:24 +00:00
08c149ed66
v1.5.9-rc.1
2020-02-13 17:56:15 +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
036348cd60
Electron 8.0.0 crashes on macOS, reverting to 7.1.12
2020-02-13 15:24:59 +00:00
2c0968e40e
Return to default deb after install script
...
Upstream electron-builder now contains the SUID sandbox change.
See also https://github.com/electron-userland/electron-builder/pull/4163
2020-02-13 14:52:44 +00:00
3eb5eb1d21
Upgrade electron-builder
2020-02-13 14:50:19 +00:00
4a1b9d8ea4
Upgrade to Electron 8.0.0
2020-02-13 14:45:42 +00:00
b107da09fa
Merge pull request #12251 from vector-im/jaywink/add-contribute-json
...
Add contribute.json
2020-02-05 15:21:07 +00:00
9534a25270
Fix contribute.json location as per spec
...
Signed-off-by: Jason Robinson <jasonr@matrix.org>
2020-02-05 16:28:44 +02:00
bceca49cdc
Update vendored modernizr
2020-02-04 11:00:47 +00:00
d50b52cdc5
Try to fix Jest
2020-01-28 14:31:09 +00:00
8ca6c2c433
Flip SDKs back to develop
2020-01-27 16:01:12 +00:00
9782599c69
Merge branch 'master' into develop
2020-01-27 12:02:44 +00:00
768cabe4bb
v1.5.8
2020-01-27 11:57:49 +00:00
dd26d43173
js-sdk 4.0.0 & react-sdk 2.0.0
2020-01-27 11:52:18 +00:00
902252ad93
v1.5.8-rc.2
2020-01-22 14:24:50 +00:00
eb5e14661d
Actually pull in react-sdk rc.2
2020-01-22 14:20:46 +00:00
ebd3f0e4e1
v1.5.8-rc.1
2020-01-22 13:22:19 +00:00
8913eba60d
react-sdk rc.2
2020-01-22 13:06:37 +00:00
5b575d5627
Force Jest to resolve the js-sdk and react-sdk to src directories
2020-01-20 14:28:29 -07:00
c3a5e2e5d3
react-sdk & js-sdk rc.1
2020-01-20 14:36:12 +00:00
ad8bd62ae6
bump electron version
2020-01-20 14:15:40 +00:00
8c6d6b1d09
Fix yarn start concurrent commands
2020-01-16 23:26:13 +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
3fb6b1ed63
Remove excessive sleep now that we're not using chrome
2020-01-15 15:31:08 -07:00
5cd54e9f6d
Use jsdom 14 instead of 13
2020-01-15 15:30:40 -07:00
c70d21a92e
Force Jest to use exactly one copy of React and ReactDOM
2020-01-15 14:42:16 -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
f0dbc85ca5
Mock out browser-request to fix i18n
2020-01-15 14:06:55 -07:00
RiotRobot