285 commits

Author	SHA1	Message	Date
Luke Barnard	53ea41e8a5	Merge branch 'develop' into new-guest-access	2017-06-07 12:08:37 +01:00
David Baker	31f1e421f2	v0.9.2	2017-06-06 17:40:30 +01:00
Luke Barnard	619830617a	Merge branch 'develop' into luke/ilag-i18n ... In order to get ILAG internationalised Conflicts: src/components/structures/LoggedInView.js src/components/structures/MatrixChat.js src/components/views/dialogs/ChatCreateOrReuseDialog.js src/components/views/dialogs/SetDisplayNameDialog.js src/createRoom.js src/i18n/strings/en_EN.json	2017-06-05 16:08:03 +01:00
Matthew Hodgson	0d5ad06ac1	v0.9.1	2017-06-02 22:39:32 +01:00
David Baker	9e0aca534c	v0.9.0	2017-06-02 14:23:30 +01:00
Matthew Hodgson	8add074dbf	v0.9.0-rc.2	2017-06-02 01:14:13 +01:00
Matthew Hodgson	7e097d8d74	Merge branch 'release-v0.9.0-rc.1' into develop	2017-06-02 01:07:08 +01:00
Matthew Hodgson	73f97b4661	bump js-sdk for webrtc	2017-06-02 01:05:09 +01:00
Matthew Hodgson	bceef2db91	v0.9.0-rc.1	2017-06-01 02:15:49 +01:00
Matthew Hodgson	b1475cb309	bump js-sdk	2017-06-01 02:04:46 +01:00
Matthew Hodgson	5c885922d9	Merge branch 'develop' into new-guest-access	2017-05-28 22:58:18 +01:00
Matthew Hodgson	32207bd058	use develop js-sdk	2017-05-26 19:51:47 +01:00
David Baker	99efbbee5e	Depend on prop-types module ... So we can start writing code compatible with new React	2017-05-25 12:04:53 +01:00
David Baker	ec146c7f45	Switch to stock counterpart ... We no longer need the custom counterpart. The things that were changed in it and reasosn we no lomger need them are: 1. set separator - this can be done with standard counterpart 2. ES6 port: this was done to allow importing as _t, but is unnecessary with the _t wrapper function in react-sdk (although also seems to work fine with `import _t from 'counterpart';`) 3. Fallback to key name: unnecessary with `setMissingEntryGenerator` in 0.18, but we've changed to just using a fallback locale anyway since No code missing en translations should ever make it to the devbelop branch. 4. Logging on missing translations. Unnecessary with `onTranslationNotFound`, but now not used anyway because we let missing translations show up in the UI as 'missing translation' Bulk changes to imports coming in separate commit for easy reading.	2017-05-25 11:24:17 +01:00
David Baker	d419c42a4f	Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801	2017-05-23 15:16:31 +01:00
David Baker	eadd6192e8	v0.8.9	2017-05-22 11:36:56 +01:00
David Baker	3a0ee385b8	Released js-sdk	2017-05-22 11:35:02 +01:00
David Baker	1addd6e304	v0.8.9-rc.1	2017-05-19 10:39:14 +01:00
David Baker	f615bc129f	Released js-sdk	2017-05-19 10:37:33 +01:00
David Baker	ebfafb3639	Revert "Merge pull request #807 from matrix-org/matthew/quick-search" ... This reverts commit 0ad1d8caf3, reversing changes made to 1189368aab.	2017-05-16 16:11:01 +01:00
David Baker	387529d130	Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" ... This reverts commit 3366d3bbae, reversing changes made to ceb71a4ef6.	2017-05-16 14:49:55 +01:00
Michael Telatynski	fdf48def00	make reskindex windows friendly ... makes #871 windows friendly	2017-05-09 17:13:27 +01:00
Luke Barnard	574c836941	Move chokidar to devDeps	2017-05-08 16:24:13 +01:00
Luke Barnard	7d1940620d	Add (watching) reskindex to npm start ... also add reskindex in non-watching mode to `npm run build`	2017-05-08 15:07:58 +01:00
Luke Barnard	2eaaa97451	Give reskindex.js a watch mode (-w) ... `scripts/reskindex.js -w` will run reskindex in watch mode whereby FS events will cause a reskindex to occur. This depends on `chokidar`	2017-05-08 15:07:05 +01:00
David Baker	3366d3bbae	Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2 ... Make left panel better for new users (mk II)	2017-05-08 10:37:55 +01:00
Matthew Hodgson	f056360f70	merge master post release	2017-05-07 20:01:11 +01:00
David Baker	396b38512c	Remove babelcheck ... Nobody is likley to be upgrading from babel 5 any more, so this can go away now.	2017-05-04 16:50:47 +01:00
David Baker	909cdb6e9a	Depend on prop-types module ... So we can start writing code compatible with new React	2017-05-04 16:22:06 +01:00
Michael Telatynski	c8fb18dc93	Pin filesize ver to fix break upstream ... https://travis-ci.org/vector-im/riot-web/builds/227340622 https://github.com/avoidwork/filesize.js/issues/87 3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us	2017-04-30 13:00:47 +01:00
David Baker	d81adb234a	v0.8.8	2017-04-25 10:53:59 +01:00
David Baker	74dabb2087	Released js-sdk	2017-04-25 10:52:44 +01:00
David Baker	e569144d6f	v0.8.8-rc.2	2017-04-24 18:24:29 +01:00
David Baker	a55eb00dad	v0.8.8-rc.1	2017-04-21 18:22:39 +01:00
David Baker	665f507537	Update js-sdk dependency	2017-04-21 18:18:35 +01:00
Matthew Hodgson	8da07740d1	bump react-gemini-scrollbar	2017-04-19 23:34:29 +01:00
David Baker	1d836c7d02	Back to js-sdk develop	2017-04-12 10:04:25 +01:00
David Baker	1ff4439566	v0.8.7	2017-04-12 10:02:21 +01:00
David Baker	73888ea616	js-sdk 0.7.6	2017-04-12 10:00:35 +01:00
David Baker	25665a81ae	v0.8.7-rc.4	2017-04-11 18:47:45 +01:00
David Baker	46b362b20c	v0.8.7-rc.3	2017-04-10 16:52:30 +01:00
David Baker	a77fdd0383	js-sdk rc.2	2017-04-10 16:47:45 +01:00
David Baker	966dc3a071	v0.8.7-rc.2	2017-04-10 16:46:14 +01:00
David Baker	440307bd39	v0.8.7-rc.1	2017-04-07 17:04:03 +01:00
David Baker	2285239428	js-sdk prerelease	2017-04-07 17:02:47 +01:00
Aviral Dasgupta	0e66b370d4	fix eslint's no-invalid-this rule for class properties	2017-02-16 16:49:00 +05:30
Richard van der Hoff	6d8dcd97af	Merge branch 'master' into develop ... (Keep js-sdk on develop)	2017-02-04 10:42:31 +00:00
Richard van der Hoff	a9cd1bfd4b	v0.8.6	2017-02-04 10:30:16 +00:00
Richard van der Hoff	39488f294b	bump to js-sdk 0.7.5	2017-02-04 10:23:56 +00:00
Richard van der Hoff	19b0f956d2	v0.8.6-rc.3	2017-02-03 15:32:37 +00:00