Commit graph

557 commits

Author SHA1 Message Date
David Baker
f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
This reverts commit ad47144355.
2019-01-03 15:37:03 -07:00
David Baker
7d161de35b Partial merge of develop to experimental
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +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