Commit Graph

570 Commits (91c0d8bae3bef515ada3a142c6325dd702704c21)

Author SHA1 Message Date
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
David Baker 68ca2a9461 Bump js-sdk version 2018-04-30 13:33:57 +01:00
Luke Barnard a1c4424224 Add tests for GroupView 2018-04-27 14:28:24 +01:00
David Baker dafa65823c v0.12.3-rc.3 2018-04-26 11:19:48 +01:00
David Baker 78d836e607 v0.12.3-rc.2 2018-04-25 16:33:06 +01:00