Commit Graph

511 Commits (0727e0f8d3c0a6751c2092c2479682a54135f7d4)

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