mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
20349 commits 203 branches 553 tags 406 MiB
Commit graph

774 commits

Author SHA1 Message Date
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
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
33f2401e63 v1.0.6 2019-04-01 13:43:49 +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
45e4948d9a v1.0.6-rc.1 2019-03-27 17:40:05 +00:00
David Baker
fef36d3e1d react-sdk rc.1 2019-03-27 17:35:36 +00:00
J. Ryan Stinnett
86cf83e178 Update matrix-mock-request 2019-03-27 15:07:14 +00:00
Bruno Windels
44f3cac5eb Merge branch 'master' into develop 2019-03-21 11:28:35 +01:00
Bruno Windels
a483352798 v1.0.5 2019-03-21 11:27:29 +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
554da0fec3 Merge branch 'master' into develop 2019-03-18 13:57:50 +00:00
David Baker
fc7db55585 v1.0.4 2019-03-18 13:56:55 +00:00
David Baker
88cc9b0504 Released js-sdk 2019-03-18 13:51:59 +00:00
Travis Ralston
bdc94f3847 Fix Chrome for Karma 2019-03-13 22:11:45 -06:00
David Baker
77b0dc613f v1.0.4-rc.1 2019-03-13 14:54:17 +00:00
David Baker
638d93f4f9 js-sdk rc.1 2019-03-13 14:49:06 +00:00
J. Ryan Stinnett
f6466802b0 Convert prepublish script to prepare 
This avoids the deprecation warning about `prepublish` scripts. It should not
change when the script is run.
 2019-03-11 16:06:05 +00:00
J. Ryan Stinnett
7c947d87ab Update scripts and docs to use yarn where appropriate 
Most `npm` operations are replaced with `yarn`, which generally has better
behavior. However, steps like publish that write to the NPM registry are left to
`npm`, which currently handles these tasks best.
 2019-03-11 14:22:02 +00:00
David Baker
75f809bf06 Merge branch 'master' into develop 2019-03-06 15:47:48 +00:00
David Baker
d46b9dab87 v1.0.3 2019-03-06 15:46:47 +00:00
David Baker
fb3163a8d2 npnm audit --fix --force 
Doesn't appear to break anything...
 2019-03-06 14:07:26 +00:00
David Baker
1e7af106b0 Merge branch 'master' into develop 2019-03-06 11:28:54 +00:00
David Baker
ce1a985233 v1.0.2 2019-03-06 11:26:42 +00:00
David Baker
d83bce15a6 releaseed js-sdk 2019-03-06 11:19:06 +00:00
Hubert Chathi
390138326a add dependency on qs, which is used by utils/HostingLink.js 2019-03-05 16:47:21 -05:00
David Baker
a9402beb8f v1.0.2-rc.4 2019-03-05 19:17:52 +00:00
David Baker
647260b1ab js-sdk rc.2 2019-03-05 19:07:22 +00:00
David Baker
133dfe0807 v1.0.2-rc.3 2019-03-01 17:36:10 +00:00
David Baker
9d2ef8a3cd v1.0.2-rc.2 2019-03-01 12:17:26 +00:00
David Baker
52a2fe1c9c v1.0.2-rc.1 2019-02-28 14:43:36 +00:00
David Baker
95675461c8 js-sdk rc.1 2019-02-28 14:37:43 +00:00
J. Ryan Stinnett
ca1cbd9d67 Nudge karma to 3.1.2 
This includes a fix for detecting the version of Chrome used to run tests.
 2019-02-28 13:56:23 +00:00
Bruno Windels
37f54a929b pin highlight.js as they seem to have broken something in 9.15.2 2019-02-25 18:24:59 +01:00
Bruno Windels
c8fa30d8ee v1.0.1 2019-02-15 13:52:48 +01:00
J. Ryan Stinnett
321dd49db4 v1.0.0 2019-02-14 16:55:19 +00:00
J. Ryan Stinnett
5dd10a4a5c Update dependencies 2019-02-14 16:52:59 +00:00
J. Ryan Stinnett
5c5593d030 v1.0.0-rc.2 2019-02-14 11:15:37 +00:00
J. Ryan Stinnett
3cd605c443 Update dependencies 2019-02-14 11:11:09 +00:00
David Baker
e98bcf95d0 v1.0.0-rc.1 2019-02-08 18:44:00 +00:00
David Baker
66b69dfc26 Released js-sdk 2019-02-08 18:39:52 +00:00
Bruno Windels
3e7c3bfff8
Merge pull request #2535 from matrix-org/experimental 
Merge redesign into develop
 2019-01-30 12:49:27 +00:00
J. Ryan Stinnett
319369d1be Fix remaining warnings for enabled files 2019-01-23 18:38:49 -06:00
David Baker
17e9a442e4 v0.14.8 2019-01-22 11:26:29 +00:00
David Baker
5cdc8486d3 Released js-sdk 2019-01-22 11:14:00 +00:00
J. Ryan Stinnett
728830e2fd Add rethemendex as script for easier access 2019-01-19 22:33:51 -06:00
J. Ryan Stinnett
8b05cca7d2 Add file-loader to Karma so assets will resolve in tests 2019-01-18 10:55:00 -06:00
J. Ryan Stinnett
989227d435 Fix line length lint warnings 
I am about to run some code replacements that might make lines too long, so with
this change I know we're starting from 0 line length warnings.
 2019-01-17 22:06:49 -06:00
David Baker
fcd234f286 v0.14.8-rc.1 2019-01-17 10:54:53 +00:00
David Baker
0eac643ac6 js-sdk rc.1 2019-01-17 10:50:07 +00:00
Matthew Hodgson
577c411a39 experimental fix for https://github.com/vector-im/riot-web/issues/2985 
needs server to support 1600x1200 thumbnails for retina large ones.
ideally need to cap maximum thumbnail size to 800x600 rather than expand to arbitrary widths.
need to check that luke's funky timeline code doesn't get confused between naturalWidth and infoWidth etc.
also need to consider whether to encode a resolution metric in the event rather than lying about resolution.
 2019-01-14 17:10:22 +00:00
David Baker
fea1980581 Only 18 warnings now 2019-01-10 10:23:49 +00:00
David Baker
f269b5fbbc Fix spaceless async in ignored files too 2019-01-09 19:14:30 +00:00
David Baker
8e4d8ccca7 Add spaces back to async arrow functions 
As per https://github.com/matrix-org/matrix-js-sdk/pull/821

Requires https://github.com/matrix-org/matrix-js-sdk/pull/821
 2019-01-09 18:10:35 +00:00
David Baker
8fbb0607ff Re-write as full class component 
So we can re-use the functions we pass to props
 2019-01-07 12:09:19 +00:00
Stephen Solka
0bb35944f9 replace expect.createSpy() with jest.fn() 
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
 2019-01-02 16:59:48 -06:00
Stephen Solka
22167f8538 upgrade expect to 23.6.0 
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
 2019-01-02 16:59:48 -06:00
David Baker
f578bc6f87 Merge branch 'master' into develop 2018-12-10 13:44:52 +00:00
David Baker
37c984e195 v0.14.7 2018-12-10 13:43:59 +00:00
David Baker
5444a61e6f Released js-sdk 2018-12-10 13:39:35 +00:00
David Baker
a82b54f25a v0.14.7-rc.2 2018-12-06 12:39:24 +00:00
David Baker
77c51aff2d Ship the babelrc file to npm 
We ship the source files, so it probably makes sense to ship the
babelrc that tells you how to compile them.
 2018-12-06 11:44:00 +00:00
David Baker
58ab9a0995 v0.14.7-rc.1 2018-12-06 11:18:37 +00:00
David Baker
870825b180 js-sdk rc.1 2018-12-06 11:15:36 +00:00
Travis Ralston
f08a54ed1e Don't consider ACL'd servers as permalink candidates 
and fix the bug where it was picking 4 servers instead of 3. This was due to `<=` instead of `<` in the `MAX_SERVER_CANDIDATES` loop. Added tests for all the things.

Fixes https://github.com/vector-im/riot-web/issues/7752
Fixes https://github.com/vector-im/riot-web/issues/7682
 2018-12-05 18:00:09 -07:00
David Baker
075c13a5bd Add password strength meter to backup creation UI 
https://github.com/vector-im/riot-meta/issues/227
 2018-11-23 15:50:23 +00:00
David Baker
43013c65f6 Merge branch 'master' into develop 2018-11-22 16:55:46 +00:00
David Baker
60e22b7e0f v0.14.6 2018-11-22 16:54:53 +00:00
David Baker
a25ae924b1 js-sdk v0.14.1 2018-11-22 16:49:20 +00:00
David Baker
985966f8be Update async dialog interface to use promises 
Hopefully makes the syntax a bit nicer. Also uses ES6 async import
rather than require.ensure which is now deprecated. Also also
displays an error if the component fails to load rather than falling
over in a heap, which is nice.
 2018-11-21 16:56:44 +00:00
David Baker
0165a33f9f v0.14.5 2018-11-19 15:19:17 +00:00
David Baker
179b64d185 released js-sdk 2018-11-19 15:16:18 +00:00
David Baker
8841108b6b v0.14.5-rc.2 2018-11-15 15:29:24 +00:00
David Baker
96ed7b123b js-sdk rc.1 2018-11-15 15:19:59 +00:00
David Baker
fcf3172b18 v0.14.5-rc.1 2018-11-15 12:18:53 +00:00
David Baker
5dd155779f released js-sdk 2018-11-15 12:01:00 +00:00
David Baker
7dd906620e Merge branch 'master' into develop 2018-11-13 18:50:20 +00:00
David Baker
09006a842a v0.14.4 2018-11-13 18:49:24 +00:00
David Baker
208589d8ae Merge branch 'master' into develop 2018-11-13 17:58:18 +00:00
David Baker
3f8a3f761d v0.14.3 2018-11-13 17:57:26 +00:00
Travis Ralston
873133458a Remove the request-only stuff we don't need anymore 
This was introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2250 but can be pulled out due to https://github.com/matrix-org/matrix-js-sdk/pull/770. See https://github.com/vector-im/riot-web/issues/7634 for more information about the future.
 2018-10-31 13:06:57 -06:00
David Baker
507bfb4b69 Merge branch 'master' into develop 2018-10-29 14:10:28 +00:00
David Baker
c5004ffbe3 v0.14.2 2018-10-29 14:07:03 +00:00
David Baker
eb22b9141a released js-sdk 2018-10-29 14:03:19 +00:00
Aaron Raimist
952bdba979
Update more eslint related packages 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:48:18 -05:00
Aaron Raimist
790ecbcbb0
Update babel-eslint to 8.1.1 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:07:30 -05:00
Travis Ralston
a8782120fe Install memfs because webpack is made of fail 2018-10-24 16:57:16 -06:00
David Baker
43702a4887 v0.14.2-rc.1 2018-10-24 11:23:57 +01:00
David Baker
819fab3198 js-sdk rc.1 2018-10-24 11:20:39 +01:00
Bruno Windels
2ec9745939 Merge branch 'master' into develop 2018-10-19 16:39:59 +02:00
Bruno Windels
167746f41d v0.14.1 2018-10-19 16:39:08 +02:00
David Baker
8015bdfed7 Update deps 
or, apparently, mostly just add 'github' prefixes
 2018-10-16 10:57:32 +01:00
David Baker
cbb117552f v0.14.0 2018-10-16 10:54:19 +01:00
David Baker
cbe642f569 released js-sdk 2018-10-16 10:50:02 +01:00
David Baker
15f3d996de v0.14.0-rc.1 2018-10-11 15:39:56 +01:00
David Baker
c5ff0b1d6b js-sdk rc.1 2018-10-11 15:34:40 +01:00
David Baker
97ed4ed0bb
Merge pull request #2202 from matrix-org/dbkr/update_slate 
Update to new version of slate
 2018-10-10 11:10:20 +01:00
Marcel
b143060b8c
Remove json-loader 
json-loader is now included in webpack4
 2018-10-09 17:44:00 +02:00
Marcel
20ef16ad00
Update webpack dependencies used for karma 2018-10-09 17:28:24 +02:00
David Baker
c1f51a76dd Update to new version of slate 
Lots of fixes here as a lot of the API has changed (eg. anchorKey /
offsetKey are now anchor.key and offset.key, and collapseFocusToThing
is moveFocusToThing).

Also changes the ref to a function (sorry for lumping this into the
same PR).

Hopefully will fix https://github.com/vector-im/riot-web/issues/7105
 2018-10-09 10:55:55 +01:00
Bruno Windels
864c80c6ca Merge branch 'master' into develop 2018-10-08 17:09:59 +02:00
Bruno Windels
ae288bb9c9 v0.13.6 2018-10-08 17:07:54 +02:00
Bruno Windels
862d67c0f7 Merge branch 'master' into develop 2018-10-01 16:10:13 +02:00
Bruno Windels
c4d39eebe7 v0.13.5 2018-10-01 16:07:31 +02:00
Bruno Windels
f8ffb15577 update matrix-js-sdk version to latest release 2018-10-01 15:49:01 +02:00
Bruno Windels
1b224c2205 v0.13.5-rc.1 2018-09-27 13:51:12 +01:00
Bruno Windels
99a5989c03 bump matrix-js-sdk 2018-09-27 13:48:36 +01:00
David Baker
8febf24d6b Update karma 
To fix a bunch of vulns in the many packages it depends on
 2018-09-26 11:54:30 +01:00
Travis Ralston
c5a2e0b988 Split npm start into an init and watch script 
This is to better support riot-web's build process without losing the functionality supplied by `npm start`. The watch script no longer performs an initial build and thus `start:init` has been created for this purpose.
 2018-09-25 11:07:46 -06:00
Matthew Hodgson
dc7212ec2b switch back to simple TextForEvent 
I haven't found anyone who can justify to me why we need
more complicated plurals for i18n (even in Polish) for
%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.
 2018-09-17 18:20:12 +01:00
David Baker
60e55594dd Merge branch 'release-v0.13.4' 2018-09-10 11:39:50 +01:00
David Baker
405f0bcf98 v0.13.4 2018-09-10 11:38:53 +01:00
David Baker
f99aef8ede js-sdk v0.11.0 2018-09-10 11:36:06 +01:00
David Baker
830edeb9ca v0.13.4-rc.1 2018-09-07 14:35:44 +01:00
David Baker
2380f2cb1f js-sdk rc.1 2018-09-07 14:31:45 +01:00
Matthew Hodgson
dc66c43fa1 downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57 2018-09-04 20:33:04 +01:00
David Baker
4b45c17f59 v0.13.3 2018-09-03 14:26:00 +01:00
David Baker
3e227bb40f released matrix-js-sdk 2018-09-03 14:14:24 +01:00
David Baker
e83dca4150 v0.13.3-rc.2 2018-08-31 13:48:28 +01:00
David Baker
77316dddf2 js-sdk rc.2 2018-08-31 13:43:55 +01:00
David Baker
5688f98d22 v0.13.3-rc.1 2018-08-30 14:28:58 +01:00
David Baker
47fcc0d264 js-sdk rc.1 2018-08-30 14:21:11 +01:00
David Baker
04d1ba2637 v0.13.2 2018-08-23 15:25:33 +01:00
David Baker
aecddd58cc v0.13.1 2018-08-20 13:56:10 +01:00
David Baker
51d9c48230 Released js-sdk 2018-08-20 13:52:09 +01:00
David Baker
0ab2589622 v0.13.1-rc.1 2018-08-16 15:26:32 +01:00
David Baker
48bbc200e3 js-sdk rc.1 2018-08-16 15:23:59 +01:00
David Baker
d25ed88b0d Unpin sanitize-html 
1.18.4 is now out which makes it work with webpack again
 2018-08-02 16:20:55 +01:00
David Baker
4575710c84 Pin sanitize-html to 0.18.2 
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
 / https://github.com/punkave/sanitize-html/issues/242
 2018-08-02 10:59:26 +01:00
David Baker
3c8fc5a8af v0.13.0 2018-07-30 11:57:53 +01:00
David Baker
2df3580c60 Released js-sdk 2018-07-30 11:46:28 +01:00
David Baker
c6ad30ff85 v0.13.0-rc.2 2018-07-24 19:34:37 +01:00
David Baker
15c3d4ed16 v0.13.0-rc.1 2018-07-24 18:31:28 +01:00
David Baker
7891681920 js-sdk rc.1 2018-07-24 18:27:30 +01:00
Michael Telatynski
6a0182a653
update Slate as fixes have now landed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 15:53:48 +01:00
David Baker
a79caed0c9 Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms 2018-07-16 17:21:51 +01:00
David Baker
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate 
Replace Draft with Slate
 2018-07-16 14:16:25 +01:00
David Baker
e56feea9ec Put always-on-screen widgets in top left 
always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.

Fixes https://github.com/vector-im/riot-web/issues/7007
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053
 2018-07-12 18:43:49 +01:00
Matthew Hodgson
8665f10f27
pin slate to 0.33.4 to avoid https://github.com/ianstormtaylor/slate/pull/1958 
(cherry picked from commit 445faca)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:53:47 +01:00
Matthew Hodgson
efdc5430d7 merge develop 2018-07-09 17:50:07 +01:00
David Baker
487e3cb988 v0.12.9 2018-07-09 13:11:02 +01:00
David Baker
6245d78584 Released js-sdk 2018-07-09 13:08:28 +01:00
David Baker
64542da7cb v0.12.9-rc.2 2018-07-06 15:52:10 +01:00
David Baker
467423e0b4 js-sdk rc.1 2018-07-06 15:48:49 +01:00
David Baker
6e92cc3ea3 v0.12.9-rc.1 2018-07-04 11:23:21 +01:00
David Baker
41dee71d38 Merge branch 'master' into develop 2018-06-29 11:52:20 +01:00
David Baker
2dc94ac277 v0.12.8 2018-06-29 11:40:18 +01:00
David Baker
30ddc9610a Released js-sdk 2018-06-29 11:34:56 +01:00
Luke Barnard
4594b045d2
Merge pull request #1917 from akihikodaki/lolex 
Update lolex to 2.7.0
 2018-06-25 13:37:59 +01:00
Michael Telatynski
7b1ac9b754
upgrade minimum version of linkifyjs for more TLD support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 19:28:42 +01:00
David Baker
64fc7d3840 v0.12.8-rc.2 2018-06-22 18:08:57 +01:00
David Baker
2b8bc8a800 v0.12.8-rc.1 2018-06-21 10:06:53 +01:00
David Baker
b18c95cdb5 js-sdk rc.1 2018-06-21 10:03:35 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group 
Share Dialog
 2018-06-15 10:52:27 +01:00
Akihiko Odaki
e98112254d Update lolex to 2.7.0 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-06-13 19:08:07 +09:00
David Baker
e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker
ef1f580abb v0.12.7 2018-06-12 14:21:30 +01:00
David Baker
334dccbdc7 Released js-sdk 2018-06-12 14:14:14 +01:00
Michael Telatynski
074051297a
add a ShareDialog for sharing users,groups and rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:21:55 +01:00
David Baker
3983535536
Merge pull request #1916 from akihikodaki/sinon 
Update sinon to 5.0.7
 2018-06-08 16:41:11 +01:00
David Baker
4834816a06 v0.12.7-rc.1 2018-06-06 16:06:45 +01:00
David Baker
881e9a8070 js-sdk rc.1 2018-06-06 16:00:16 +01:00
Matthew Hodgson
ab41212258 fix double-nested code blocks & bump md-serializer 2018-05-26 00:37:21 +01:00
David Baker
bbdc27019a v0.12.6 2018-05-25 15:16:01 +01:00
David Baker
8a3ae1ed63 released js-sdk 2018-05-25 15:12:48 +01:00
David Baker
02377b57c0 v0.12.6-rc.1 2018-05-24 18:22:56 +01:00
David Baker
3851fa80ff js-sdk RC 2018-05-24 18:19:11 +01:00
Matthew Hodgson
864a33f978 switch to using 'code' for both blocks & marks to match md-serializer 2018-05-23 20:12:13 +01:00
Matthew Hodgson
87c3e92014 bump dep 2018-05-23 13:32:48 +01:00
Matthew Hodgson
5b4a036e8c bump dep 2018-05-23 03:53:05 +01:00
Matthew Hodgson
95bfface99 comment out broken logic for stripping p tags & bump dep 2018-05-23 03:43:40 +01:00
Matthew Hodgson
079b1238a1 bump right dep 2018-05-23 03:20:59 +01:00
Matthew Hodgson
a822a1c9a0 bump dep 2018-05-23 03:19:33 +01:00
Matthew Hodgson
6f3634c33f bump slate-md-serializer 2018-05-23 03:08:55 +01:00
Matthew Hodgson
edc8264cff shift to custom slate-md-serializer 2018-05-23 02:48:57 +01:00
Matthew Hodgson
fc1c4996fc slate-md-serializer 3.1.0 now escapes correctly 2018-05-23 02:15:34 +01:00
Akihiko Odaki
35ab573bc5 Update sinon to 5.0.7 2018-05-21 18:44:00 +09:00
Matthew Hodgson
4972a234c4 Merge branch 'develop' into matthew/slate 2018-05-19 12:58:43 +01:00
David Baker
fa7f6c2c4c v0.12.5 2018-05-17 17:04:39 +01:00
David Baker
bf0ec249b6 v0.12.4 2018-05-16 11:49:06 +01:00
David Baker
a0b6bd183c v0.12.4-rc.6 2018-05-15 18:03:40 +01:00
Luke Barnard
db092c81d3 v0.12.4-rc.5 2018-05-15 15:54:15 +01:00
Matthew Hodgson
b60ccad29b Merge branch 'develop' into matthew/slate 2018-05-15 01:00:07 +01:00
Luke Barnard
7bfc50bf42 v0.12.4-rc.4 2018-05-14 18:23:14 +01:00
Matthew Hodgson
721410b710 Merge branch 'develop' into matthew/slate 2018-05-13 19:50:55 +01:00
Luke Barnard
d90292c6f1 v0.12.4-rc.3 2018-05-11 18:26:35 +01:00
Luke Barnard
6a0bff6685 v0.12.4-rc.2 2018-05-09 17:34:54 +01:00
Luke Barnard
ddf98705f2 v0.12.4-rc.1 2018-05-09 13:44:42 +01:00
Luke Barnard
76a8b61772 Merge branch 'master' into develop 2018-05-09 13:31:42 +01:00
Luke Barnard
3d20bd00a2 Pin lolex at 2.3.2 to avoid bug causing tests to fail 
See https://github.com/sinonjs/lolex/issues/170
 2018-05-09 11:43:02 +01:00
Matthew Hodgson
02947063d3 Merge branch 'develop' into matthew/slate 2018-05-05 22:45:44 +01:00
Matthew Hodgson
ccd99f4a49 increase max-warnings temporarily 2018-05-05 22:27:54 +01:00
Luke Barnard
aa370b3b67
Merge pull request #1877 from matrix-org/luke/test-room-list 
Add tests for RoomList
 2018-05-04 13:57:57 +01:00
Luke Barnard
8fcb530e6f Install lolex for clock mocking in tests 2018-05-03 15:25:14 +01:00
David Baker
2475295a24 Up the max warning count :( 2018-05-02 17:42:23 +01:00
David Baker
bf8612f864 Update eslint-plugin-react 
Enables jsx-no-bind checking (although we may have to stop erroring
on this as we currently break this rule in a few places)
 2018-05-02 17:30:37 +01:00
David Baker
dded89383a v0.12.3 2018-04-30 13:37:57 +01:00