689 Commits

Author	SHA1	Message	Date
David Baker	f5a257ca79	v0.16.0-rc.1	2018-07-24 18:35:02 +01:00
David Baker	96b624e941	js-sdk & react-sdk rc.1	2018-07-24 18:33:04 +01:00
David Baker	25c0656106	Update to electron 2.0.5	2018-07-24 18:28:48 +01:00
David Baker	7e03b25030	v0.15.7	2018-07-09 13:20:29 +01:00
David Baker	73be5005c2	Released react-sdk & js-sdk	2018-07-09 13:16:42 +01:00
David Baker	c36b42af71	v0.15.7-rc.2	2018-07-06 16:01:42 +01:00
David Baker	75e9489db5	js-sdk rc.1 & react-sdk rc.2	2018-07-06 15:58:39 +01:00
David Baker	0de36d331f	v0.15.7-rc.1	2018-07-04 11:28:19 +01:00
David Baker	6ada5e5b26	react-sdk rc.1	2018-07-04 11:26:33 +01:00
David Baker	aee6b28469	Bump electron version	2018-07-04 11:18:30 +01:00
David Baker	768e206c4a	v0.15.6	2018-06-29 12:02:51 +01:00
David Baker	e193b65bc7	Released js-sdk & react-sdk	2018-06-29 11:54:01 +01:00
David Baker	fb43e49954	v0.15.6-rc.2	2018-06-22 18:15:34 +01:00
David Baker	79cf34b72e	react-sdk rc.2	2018-06-22 18:12:41 +01:00
David Baker	ee6fc5859c	v0.15.6-rc.1	2018-06-21 10:20:26 +01:00
David Baker	f9e7af6e90	js & react sdk rc.1	2018-06-21 10:09:01 +01:00
David Baker	9dd37ac9e2	v0.15.5	2018-06-12 14:36:10 +01:00
David Baker	79bc81317d	Released react-sdk & js-sdk	2018-06-12 14:30:44 +01:00
David Baker	33a2e068f6	v0.15.5-rc.1	2018-06-06 16:11:58 +01:00
David Baker	1ed2935eb6	react-sdk & js-sdk rc.1	2018-06-06 16:08:47 +01:00
David Baker	a4b58f4d83	v0.15.4	2018-05-25 15:25:10 +01:00
David Baker	57c79c7133	released react-sdk & js-sdk	2018-05-25 15:22:39 +01:00
David Baker	93ea9d7c36	v0.15.4-rc.1	2018-05-24 18:28:44 +01:00
David Baker	cd9821f87e	Merge branch 'develop' into release-v0.15.4	2018-05-24 18:26:02 +01:00
David Baker	10881587e9	electron 2.0.2	2018-05-24 18:25:35 +01:00
David Baker	1bfe4513ac	js-sdk & react-sdk RCs	2018-05-24 18:24:20 +01:00
David Baker	ec62b5f03c	v0.15.3	2018-05-18 12:38:59 +01:00
David Baker	b1f0f33204	Update to electron 2.0.1 ... It does have a security fix	2018-05-18 12:24:12 +01:00
David Baker	b128431128	v0.15.2	2018-05-17 17:10:17 +01:00
David Baker	b90017ff15	react-sdk v0.12.5	2018-05-17 17:06:24 +01:00
David Baker	4e6c2fdd1c	v0.15.1	2018-05-16 16:16:23 +01:00
David Baker	f759bfb1f6	Bump to Electron 2.0.0(!)	2018-05-16 15:30:42 +01:00
David Baker	0a4614247f	v0.15.0	2018-05-16 11:56:07 +01:00
David Baker	c4ecf40d1c	Released react-sdk	2018-05-16 11:54:29 +01:00
David Baker	02ab1fded2	v0.15.0-rc.6	2018-05-15 18:08:52 +01:00
David Baker	ecfefd6b21	react-sdk rc.6	2018-05-15 18:06:11 +01:00
Luke Barnard	50e430d8dc	v0.15.0-rc.5	2018-05-15 16:01:39 +01:00
Luke Barnard	7eb14ad12c	Bump react-sdk version to 0.12.4-rc.5	2018-05-15 15:54:07 +01:00
Luke Barnard	e5641fe71c	v0.15.0-rc.4	2018-05-14 18:31:07 +01:00
Luke Barnard	be5aa59e39	Bump react-sdk dep to 0.12.4-rc.4	2018-05-14 18:20:28 +01:00
Luke Barnard	9b2fa966f1	v0.15.0-rc.3	2018-05-11 18:31:34 +01:00
Luke Barnard	030fc041be	Bump react-sdk dep to 12.4-rc.3 (for instant sticker picker)	2018-05-11 18:28:40 +01:00
David Baker	8f4953c182	Merge branch 'develop' into webpack4	2018-05-11 16:27:50 +01:00
Luke Barnard	c2fccb7e14	v0.15.0-rc.2	2018-05-09 17:39:57 +01:00
Luke Barnard	82a27d7fa3	Bump react-sdk version to 0.12.4-rc.2	2018-05-09 17:31:31 +01:00
Luke Barnard	2ea7ad6d7b	v0.15.0-rc.1	2018-05-09 15:31:25 +01:00
Luke Barnard	fb0bbf31c4	v0.14.3-rc.1	2018-05-09 13:52:27 +01:00
Luke Barnard	0e00677851	Bump react-sdk dep to 12.4-rc.1	2018-05-09 13:48:06 +01:00
David Baker	d6a226e6bd	Put webpack-dev-server in development mode ... https://github.com/webpack/webpack-dev-server/issues/1327	2018-05-04 18:37:29 +01:00
David Baker	76d4a4f3fe	v0.14.2	2018-04-30 13:44:23 +01:00
David Baker	ff8f617fc6	Released react-sdk & js-sdk	2018-04-30 13:42:38 +01:00
MTRNord	d69084f31e	Fix builld:dev build by using raw-loader instead css-raw-loader	2018-04-27 12:02:00 +02:00
MTRNord	02a185f2fe	Update Webpack to version 4	2018-04-27 11:32:59 +02:00
David Baker	137665685d	v0.14.2-rc.3	2018-04-26 15:38:18 +01:00
David Baker	1eb82d97ae	Fix dependencies to the same versions as react-sdk ... Otherwise Things Get Weird, eg. headers in the left panel end up in the wrong place because the gemini scrollbar CSS has changed between versions.	2018-04-26 15:25:20 +01:00
David Baker	b8f7025f2a	v0.14.2-rc.2	2018-04-26 11:46:38 +01:00
David Baker	18ba570c74	Bump react-sdk version	2018-04-26 11:33:44 +01:00
David Baker	5923417654	v0.14.2-rc.1	2018-04-25 17:39:56 +01:00
David Baker	981bd94615	Change CSS dependencies to not hardcoded paths ... Add add direct dependencies on the packages they come from, because referring to them by path like this doesn't work in a frash checkout / npm install because of how npm lays out the packages.	2018-04-25 17:33:18 +01:00
David Baker	8d4d16bde1	Bump react-sdk version	2018-04-25 16:35:13 +01:00
David Baker	ee9f781adc	js-sdk & react-sdk RCs	2018-04-25 15:37:24 +01:00
David Baker	83c20f5d5d	Bump electron version to 1.8.4	2018-04-25 15:00:39 +01:00
Matthew Hodgson	df3fb83da3	move deps to sdk for stuff now in the sdk	2018-04-18 10:53:17 +01:00
David Baker	c8a3471135	Merge branch 'master' into develop	2018-04-12 13:07:09 +01:00
David Baker	740b221769	v0.14.1	2018-04-12 13:02:27 +01:00
David Baker	c631858ab3	Bump js-sdk & react-sdk	2018-04-12 12:57:04 +01:00
Luke Barnard	8644a5ead9	Merge branch 'master' into develop	2018-04-11 12:04:58 +01:00
Luke Barnard	eaeb495349	v0.14.0	2018-04-11 12:01:45 +01:00
Luke Barnard	5fc37032ad	Bump js-sdk to 0.10.0, react-sdk to 0.12.1	2018-04-11 11:42:56 +01:00
Luke Barnard	74454567bc	v0.14.0-rc.6	2018-04-09 17:16:37 +01:00
Luke Barnard	8eaabceb0c	Bump react version number	2018-04-09 17:09:11 +01:00
Luke Barnard	ec2adc4516	v0.14.0-rc.5	2018-04-09 15:46:35 +01:00
Luke Barnard	60079d4206	Bump matrix-js-sdk, matrix-react-sdk versions	2018-04-09 15:36:43 +01:00
Luke Barnard	e739d1b850	Bump source-map-loader version to avoid bug /w inline base64 maps	2018-04-09 13:50:43 +01:00
David Baker	220b553a97	v0.14.0-rc.4	2018-03-22 13:29:01 +00:00
David Baker	047d37b417	Bump react-sdk version	2018-03-22 13:25:30 +00:00
David Baker	96b56fd901	v0.14.0-rc.3	2018-03-20 17:42:23 +00:00
David Baker	f3a5a31ccf	Bump react-sdk version	2018-03-20 17:39:31 +00:00
David Baker	99b20e49c3	v0.14.0-rc.2	2018-03-19 15:02:10 +00:00
David Baker	ae44efcebf	Bump react-sdk version	2018-03-19 15:00:09 +00:00
David Baker	d7c0e3ddc9	v0.14.0-rc.1	2018-03-19 12:21:05 +00:00
David Baker	4af53fabbc	Bump js-sdk & react-sdk	2018-03-19 12:17:53 +00:00
David Baker	0e2a911b57	Bump electron version	2018-03-16 16:16:50 +00:00
David Baker	1d2f5bafda	Merge branch 'master' into develop	2018-02-09 12:46:28 +00:00
David Baker	9e614a54da	v0.13.5	2018-02-09 12:43:45 +00:00
David Baker	b20dea58c6	Bump react-sdk version	2018-02-09 12:36:19 +00:00
lukebarnard	883ee4ec75	Remove react-dnd	2018-01-19 13:35:11 +00:00
lukebarnard	3481283af8	Swap RoomList to react-beautiful-dnd ... Includes themeing See matrix-org/matrix-react-sdk#1711	2018-01-18 17:54:39 +00:00
Michael Telatynski	627ebb848d	Change author	2018-01-08 21:32:25 +00:00
David Baker	5635614549	v0.13.4	2018-01-03 16:13:24 +00:00
Luke Barnard	b73f0c7b90	v0.13.3	2017-12-04 12:31:50 +00:00
Luke Barnard	c685546e9a	Bump js-sdk to 0.9.2, react-sdk to 0.11.3	2017-12-04 12:27:49 +00:00
Richard van der Hoff	5fff46fdac	v0.13.2	2017-11-28 11:17:57 +00:00
Richard van der Hoff	2e9f309415	Bump to react-sdk 0.11.2	2017-11-28 11:16:13 +00:00
David Baker	aad2069a51	v0.13.1	2017-11-17 16:09:48 +00:00
David Baker	538e1d2446	Released js-sdk & react-sdk	2017-11-17 16:05:01 +00:00
Luke Barnard	629a18ebef	v0.13.0	2017-11-15 11:09:31 +00:00
Luke Barnard	02c2e1a14c	Bump js/react SDKs to releases 0.9.0 & 0.11.0	2017-11-15 11:03:20 +00:00
Luke Barnard	ad0cb6f0a8	v0.13.0-rc.3	2017-11-14 14:22:29 +00:00
Luke Barnard	e1c762dcaa	Bump react-sdk version to 0.11.0-rc.3	2017-11-14 14:20:21 +00:00
Luke Barnard	ef9f2f7ce6	v0.13.0-rc.2	2017-11-10 16:53:03 +00:00
Luke Barnard	150fa43735	Bump react-sdk dep	2017-11-10 16:51:05 +00:00
Luke Barnard	5c9dd17d21	v0.13.0-rc.1	2017-11-10 13:44:55 +00:00
Luke Barnard	1008ede4d1	Bump matrix-react/js-sdk deps	2017-11-10 13:42:31 +00:00
Richard Lewis	63bcca1c7d	Merge pull request #4881 from vector-im/rxl881/parallelshell ... Rxl881/parallelshell	2017-10-20 17:11:20 +01:00
David Baker	00f902cab1	Add script to prune unused translations	2017-10-19 12:11:53 +01:00
David Baker	4e31aea402	Switch to gen-i18n script	2017-10-19 10:53:02 +01:00
Richard Lewis	568cd0aac6	Update parallelshell to ^3.02	2017-10-19 10:12:00 +01:00
Michael Telatynski	6ccacfee46	bump version to prevent eslint errors ... got bumped in react-sdk, missed here Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-17 14:44:41 +01:00
David Baker	bf56a00d60	v0.12.7	2017-10-16 14:56:52 +01:00
David Baker	bfae8e98a1	Released js-sdk & react-sdk	2017-10-16 14:52:00 +01:00
David Baker	f5397acfa1	v0.12.7-rc.3	2017-10-13 16:36:57 +01:00
David Baker	f555f2036e	react-sdk rc.3	2017-10-13 16:35:41 +01:00
David Baker	3b2650e5ea	Merge remote-tracking branch 'origin/develop' into release-v0.12.7	2017-10-13 16:33:55 +01:00
David Baker	b727944b11	Bump electron version	2017-10-13 16:27:01 +01:00
David Baker	adceda7588	v0.12.7-rc.2	2017-10-13 15:06:18 +01:00
David Baker	b3da206a92	react-sdk rc.2	2017-10-13 15:03:43 +01:00
David Baker	f8554ca2f2	v0.12.7-rc.1	2017-10-13 11:15:41 +01:00
David Baker	64cfc9b717	js & react sdk rc.1	2017-10-13 11:13:54 +01:00
David Baker	ef503cca11	Merge branch 'master' into develop	2017-09-21 21:56:58 +01:00
David Baker	2b7ee756f8	v0.12.6	2017-09-21 21:53:09 +01:00
David Baker	aaff9133c7	Newer js-sdk & react-sdk for js-sdk build fix	2017-09-21 21:49:43 +01:00
David Baker	50e6536195	Merge branch 'master' into develop	2017-09-21 18:11:46 +01:00
David Baker	fbccf22e00	v0.12.5	2017-09-21 18:08:17 +01:00
David Baker	dbd4cf8756	Clean on prepublish (#5097) ... Otherwise you can make broken releases on case insensitive file systems	2017-09-21 18:06:41 +01:00
David Baker	874e88c4a8	react-sdk v0.10.5	2017-09-21 18:05:22 +01:00
David Baker	2ea9fc3f9a	v0.12.4	2017-09-20 15:19:10 +01:00
David Baker	d957f0cdd7	released js-sdk & react-sdk	2017-09-20 15:16:42 +01:00
David Baker	ca50d1f04a	v0.12.4-rc.1	2017-09-19 10:57:02 +01:00
David Baker	57851cd508	js-sdk & react-sdk rc.1	2017-09-19 10:54:35 +01:00
David Baker	f148844573	Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip ... generic contextual menu for tooltip/responses	2017-09-13 14:27:28 +01:00
Michael Telatynski	2316f4230e	install and use prop-types over React.PropTypes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-13 14:23:35 +01:00
David Baker	38575a653d	Revert "Implement sticky date separators"	2017-09-06 17:36:43 +01:00
David Baker	8b250bda64	Merge branch 'master' into develop	2017-09-06 13:36:11 +01:00
David Baker	92d31a8890	v0.12.3	2017-09-06 13:32:33 +01:00
David Baker	e8dd7be8a3	matrix-react-sdk v0.10.3	2017-09-06 13:31:00 +01:00
David Baker	b8d9276f29	Merge pull request #4939 from vector-im/luke/feature-sticky-date-separators ... Implement sticky date separators	2017-09-05 14:16:21 +01:00
David Baker	c1e2ee8123	v0.12.3-rc.3	2017-09-05 13:43:40 +01:00
David Baker	17bf8cb4ab	v0.12.3-rc.2	2017-09-05 13:15:56 +01:00
David Baker	32423654b4	new react-sdk rc	2017-09-05 13:13:58 +01:00
David Baker	3f8564f641	v0.12.3-rc.1	2017-09-01 16:22:24 +01:00
David Baker	c1fe3dff22	react-sdk v0.10.3	2017-09-01 16:19:08 +01:00
Luke Barnard	88228a5a3f	Implement sticky date separators ... Codep https://github.com/matrix-org/matrix-react-sdk/pull/1353	2017-08-30 14:06:50 +01:00
Richard Lewis	52717ae486	Update parallelshell version.	2017-08-25 09:51:07 +01:00
David Baker	65f0bd04f2	v0.12.2	2017-08-24 14:53:02 +01:00
David Baker	f69d5d7e3f	Released js-sdk & react-sdk	2017-08-24 14:50:44 +01:00
David Baker	a65196ee8c	Update electron version	2017-08-23 21:17:07 +01:00
David Baker	9e57c9d78f	v0.12.1	2017-08-23 15:58:50 +01:00
David Baker	c900b58120	Released js-sdk & react-sdk	2017-08-23 15:57:45 +01:00
David Baker	f523d93720	v0.12.1-rc.1	2017-08-22 18:57:20 +01:00
David Baker	ab2a72a193	Bump version temporarily ... so we get the diff from v0.12.0-rc.2	2017-08-22 18:55:33 +01:00
David Baker	6bdad8b5f6	Released js-sdk & react-sdk	2017-08-22 18:55:09 +01:00
Luke Barnard	064181731c	v0.12.0-rc.1	2017-08-16 10:40:28 +01:00
Luke Barnard	cc8518101b	js-sdk 0.8.0 react-sdk 0.10.0-rc.1	2017-08-16 10:10:03 +01:00
Richard van der Hoff	06ef674597	Enable fancy karma reporters ... cargo-cult luke's stuff from react-sdk	2017-08-08 19:05:58 +01:00
Richard van der Hoff	df33d40285	Enable karma-sourcemap-loader ... This turns (some) stacktraces back into something useful, so that unpicking test failures is vaguely tractable	2017-08-08 19:05:49 +01:00
Richard van der Hoff	10ee9f4de4	Merge pull request #4754 from vector-im/rav/fix_crypto_build ... Fix crypto on develop	2017-08-08 10:13:06 +01:00
Richard van der Hoff	9c3c1b7608	Make webpack exit non-zero on error ... Pass `--bail` to webpack, so that if we can't find a module, we bail out rather than deploy a broken version to /develop. https://github.com/webpack/webpack/issues/708 is somewhat relevant.	2017-08-08 09:50:49 +01:00
Luke Barnard	8ca2af0fe7	Update draft-js from 0.10.1 to 0.11.0-alpha (see https://github.com/matrix-org/matrix-react-sdk/pull/1269)	2017-08-03 15:22:52 +01:00
Luke Barnard	2f99a4883f	Update draft-js from 0.8.1 to 0.10.1 ... Hopefully to fix #4675 and friends	2017-08-02 11:52:47 +01:00
Richard van der Hoff	66ddf25977	Deflake the joining test ... Just give the client longer to get started (it seems to be taking a long time to get started talking to indexeddb)	2017-07-14 16:14:42 +01:00
Richard van der Hoff	0c31c62a62	build fix: bump to mock-request 1.1 ... This should have happened with 32ef273f: now that we are using flushAllExpected, we nee matrix-mock-request 1.1.0	2017-07-14 15:41:13 +01:00
Richard van der Hoff	01d954e4ab	Bump react to 15.6 to fix build problems ... matrix-react-test-tools requires react 15.6 or later, so make sure we require it in riot-web too.	2017-07-14 14:45:44 +01:00
Richard van der Hoff	3ec4b25793	Transform async functions to bluebird promises ... It turns out that the assertion made in https://github.com/vector-im/riot-web/pull/4565 about `async` functions returning bluebird promises was only correct when babel used an inline version of the `asyncToGenerator` helper; in react-sdk we are using `babel-transform-runtime` which means that we use a separate `babel-runtime/helpers/asyncToGenerator`, which returns a native (or core-js) Promise. This meant that we were still in the situation where some methods returned native Promises, and some bluebird ones, which is exactly the situation I wanted to resolve by switching to bluebird in the first place: in short, unless/until we get rid of all code which assumes Promises have a `done` method etc, we need to make sure that everything returns a bluebird promise. (Aside: there was debate over whether in the long term we should be trying to wean ourselves off bluebird promises by assuming all promises are native. The conclusion was that the complexity hit involved in doing so outweighed any benefit of a potential future migration away from bluebird).	2017-07-13 17:34:47 +01:00
Richard van der Hoff	76181f4771	Merge remote-tracking branch 'origin/develop' into rav/bluebird	2017-07-13 12:04:54 +01:00
Richard van der Hoff	10decf95f6	replace imports of q with bluebird ... update `package.json` ``` find src test -name '*.js' | xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' find src test -name '*.js' | xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }' ```	2017-07-13 00:48:31 +01:00
Richard van der Hoff	b2403d59b7	loading tests: wait for login component ... Rather than a fixed delay, use matrix-react-test-utils to wait for the login component to appear. Hopefully this will deflakify some tests.	2017-07-13 00:18:49 +01:00
Richard van der Hoff	0f8a2554dc	Enable colours for karma test output ... I don't really know why we disable colours here.	2017-07-13 00:18:10 +01:00
Richard van der Hoff	9969d6095d	Remove phantomjs; add chrome	2017-07-05 09:43:40 +01:00
Richard van der Hoff	38b1ca9b90	Use headless chrome instead of phantomjs for tests	2017-07-05 09:35:51 +01:00
Richard van der Hoff	48889b51b0	Bump to matrix-mock-request 1.0.0 ... - for consistency with js-sdk updates	2017-07-04 16:38:19 +01:00
Richard van der Hoff	bd1196716a	Use external mock-request ... mock-request is now factored out to matrix-mock-request; use it	2017-07-04 15:59:21 +01:00
David Baker	cf5cf02529	v0.11.4	2017-06-22 12:04:49 +01:00
David Baker	c380e7566a	Released js-sdk & react-sdk	2017-06-22 11:58:57 +01:00
David Baker	639b17c663	v0.11.3	2017-06-20 13:15:36 +01:00
David Baker	6ef32f182a	react-sdk 0.9.6	2017-06-20 13:13:03 +01:00
David Baker	448e33bb65	v0.11.2	2017-06-19 13:20:45 +01:00
David Baker	f420a18696	Released js-sdk & react-sdk	2017-06-19 13:12:40 +01:00
David Baker	8cf6712426	v0.11.2-rc.2	2017-06-16 13:32:57 +01:00
David Baker	1a12528634	react-sdk rc.2	2017-06-16 13:30:27 +01:00
David Baker	104cb7b999	v0.11.2-rc.1	2017-06-15 17:21:01 +01:00
David Baker	cb905e9be7	released js-sdk & react-sdk	2017-06-15 17:18:33 +01:00
David Baker	4edd21ba8a	v0.11.1	2017-06-14 11:21:27 +01:00
David Baker	f9795232e0	react-sdk 0.9.4	2017-06-14 11:19:43 +01:00
David Baker	bddb6b7f8f	v0.11.0	2017-06-12 16:04:24 +01:00
David Baker	8c541a2702	released js sdk & react sdk	2017-06-12 15:53:46 +01:00
David Baker	89e14c1b49	v0.11.0-rc.2	2017-06-09 22:20:38 +01:00
David Baker	f086629fed	react-sdk rc.2	2017-06-09 22:17:30 +01:00
David Baker	d108f34390	Change flux version to 2.1.1 ... It was previously pinned to 2.0.3 in https://github.com/vector-im/riot-web/commit/5bab440a1 but only here and not in react-sdk, meaning that react-sdk was still using the latest, at least in develop builds, however react-sdk now uses utils which requires 2.1, so pin to 2.1.1 everywhere for sanity.	2017-06-09 21:43:11 +01:00
David Baker	7237224fc9	v0.11.0-rc.1	2017-06-09 20:31:34 +01:00
David Baker	daf92c59b1	released js-sdk & react-sdk	2017-06-09 20:29:36 +01:00
Matthew Hodgson	d8f7262eac	Merge branch 'develop' into t3chguy/random_fix_1	2017-06-08 15:58:49 +01:00
David Baker	53bc78429d	Merge pull request #4212 from vector-im/t3chguy/package_json_fix ... change electron -> electron_app which was previously missed	2017-06-07 14:46:54 +01:00
Luke Barnard	a158549a4c	Merge pull request #4039 from vector-im/new-guest-access ... New guest access	2017-06-07 13:40:00 +01:00
Michael Telatynski	79d6ced201	change electron -> electron_app which was previously missed ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-06 18:39:54 +01:00
David Baker	968e21a67d	Merge branch 'master' into develop	2017-06-06 17:48:32 +01:00
David Baker	26bb962a3c	v0.10.2	2017-06-06 17:45:07 +01:00
David Baker	a62ed0eb03	reatc-sdk 0.9.2	2017-06-06 17:41:26 +01:00
David Baker	d06934c5f6	Add velocity as a dep ... As we now use it from vector, so we shouldn't rely on it being pulled in via react-sdk	2017-06-06 14:00:36 +01:00
Michael Telatynski	f24c6de245	provide react devtools in electron dev builds ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-04 15:30:44 +01:00