940 commits

Author	SHA1	Message	Date
RiotRobot	eaf3bdbf34	Merge branch 'master' into develop	2019-09-12 13:26:17 +01:00
RiotRobot	ceb1fcb6c1	v1.3.4	2019-09-12 13:21:14 +01:00
RiotRobot	5a6e889bd4	Released js-sdk & react-sdk	2019-09-12 13:16:26 +01:00
RiotRobot	32e2d97941	v1.3.4-rc.1	2019-09-11 18:57:45 +01:00
RiotRobot	03b5b622d0	js-sdk & react-sdk rc.1	2019-09-11 18:48:59 +01:00
Michael Telatynski	33c17a6f2e	Switch to React 16.9 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-28 11:07:46 +01:00
Michael Telatynski	7eefc9d856	Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/react16	2019-08-24 11:42:03 +01:00
liberodark	961369f48d	Upgrade to Electron 6.0.3 ... Upgrade to last Electron 6.0.3	2019-08-21 13:32:42 +02:00
J. Ryan Stinnett	0800faf057	Upgrade to Electron 6.0.2	2019-08-20 10:36:06 +01:00
J. Ryan Stinnett	d12f94888a	Use modern command name for electron-builder ... `electron-builder` now recommends you invoke it via that name instead of `build` as was previously supported.	2019-08-20 10:33:47 +01:00
J. Ryan Stinnett	a438efa4be	Upgrade to Electron 6	2019-08-20 10:29:58 +01:00
RiotRobot	c65ebd5e83	Merge branch 'master' into develop	2019-08-16 15:28:33 +01:00
J. Ryan Stinnett	ce89428bb9	Merge pull request #10579 from vector-im/jryans/electron-builder-21.2.0 ... Upgrade electron-builder to 21.2.0	2019-08-16 15:27:53 +01:00
RiotRobot	4299cdfeac	v1.3.3	2019-08-16 15:26:03 +01:00
J. Ryan Stinnett	26d70b1bd4	Set SUID bit on chrome-sandbox for Debian ... This tweaks Linux packages for Riot to SUID `chrome-sandbox` after install. This is required as of Electron 5 for certain distros, such as Debian. This change has also been provided to `electron-builder` upstream, so ideally they'll include it in the future and this becomes redundant. Fixes https://github.com/vector-im/riot-web/issues/10509	2019-08-16 15:21:59 +01:00
J. Ryan Stinnett	56674ea708	Set SUID bit on chrome-sandbox for Debian ... This tweaks Linux packages for Riot to SUID `chrome-sandbox` after install. This is required as of Electron 5 for certain distros, such as Debian. This change has also been provided to `electron-builder` upstream, so ideally they'll include it in the future and this becomes redundant. Fixes https://github.com/vector-im/riot-web/issues/10509	2019-08-16 13:34:12 +01:00
J. Ryan Stinnett	24e59ccedd	Upgrade electron-builder to 21.2.0 ... This is meant to help with: * macOS packaging for Electron 6 (https://github.com/vector-im/riot-web/issues/10473) * Linux desktop file should not have quotes (https://github.com/vector-im/riot-web/issues/6421) It did not help with: * Linux sandbox for Electron 5 (https://github.com/vector-im/riot-web/issues/10509) Fixes https://github.com/vector-im/riot-web/issues/6421 Part of https://github.com/vector-im/riot-web/issues/10473	2019-08-16 12:57:03 +01:00
Michael Telatynski	773dd0805b	Bump matrix-react-test-utils for React 16 compatibility ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-12 17:41:51 +01:00
Michael Telatynski	d347ab08e7	Merge branches 'develop' and 't3chguy/react16' of github.com:vector-im/riot-web into t3chguy/react16	2019-08-10 00:20:30 +01:00
Travis Ralston	feb62793d2	Revert "Upgrade to babel@7 and support TypeScript" ... This reverts commit 7b89893645.	2019-08-08 13:30:33 -06:00
Travis Ralston	7b89893645	Upgrade to babel@7 and support TypeScript ... See https://github.com/matrix-org/matrix-react-sdk/pull/3292 Like react-sdk#3292, this fixes the couple source files which mix imports and module exports (they can't be mixed anymore).	2019-08-08 13:30:11 -06:00
Michael Telatynski	da9f1d1fa3	discard create-react-class, no point using it here. use React.FC ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-06 18:22:11 +01:00
RiotRobot	0c438cc7a0	v1.3.2	2019-08-05 14:46:35 +01:00
David Baker	f28e5f2ebb	Released react-sdk	2019-08-05 14:42:39 +01:00
RiotRobot	3b6acfd67d	v1.3.1	2019-08-05 12:08:25 +01:00
RiotRobot	90b26a98d3	Released js-sdk & react-sdk	2019-08-05 12:04:57 +01:00
Michael Telatynski	06e7a48aaf	Switch to React 16.8 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2019-08-01 15:31:33 +01:00
RiotRobot	8c32957957	v1.3.1-rc.1	2019-07-31 16:55:49 +01:00
RiotRobot	61228d112e	Upgrade to JS SDK 2.3.0-rc.1 and React SDK 1.5.0-rc.1	2019-07-31 16:52:52 +01:00
J. Ryan Stinnett	88e8fbb39a	Upgrade to Electron 5 ... The APIs related to custom protocols went through some changes for Electron 5.x, so adjusts Riot's usages to match. I have scanned the Electron 5.x release notes, and I can't see anything else that requires immediate changes. Things appear to be working well after the upgrade. Fixes https://github.com/vector-im/riot-web/issues/10296 Fixes https://github.com/vector-im/riot-web/issues/9562	2019-07-22 15:38:08 +01:00
RiotRobot	e71fcc33f9	Merge branch 'master' into develop	2019-07-18 15:58:43 +01:00
RiotRobot	7d07642bef	v1.3.0	2019-07-18 15:56:14 +01:00
RiotRobot	72f3f1afee	Upgrade to JS SDK 2.2.0 and React SDK 1.4.0	2019-07-18 15:53:25 +01:00
RiotRobot	343279ee5d	v1.3.0-rc.3	2019-07-15 17:34:38 +01:00
RiotRobot	fab0d70f21	react-sdk rc.3	2019-07-15 17:31:13 +01:00
RiotRobot	6259fba6ad	v1.3.0-rc.2	2019-07-12 17:40:07 +01:00
RiotRobot	be601d4654	Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2	2019-07-12 17:37:01 +01:00
Andrew Morgan	fde90afe58	Convert install-app-deps to subcommand	2019-07-12 17:02:12 +01:00
RiotRobot	a28144bbc0	v1.3.0-rc.1	2019-07-12 11:43:41 +01:00
RiotRobot	f771f607d6	Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1	2019-07-12 11:39:07 +01:00
Travis Ralston	6b07186078	Verify i18n in CI	2019-07-11 12:45:06 -06:00
RiotRobot	da5ddb2518	v1.2.4	2019-07-11 11:29:11 +01:00
J. Ryan Stinnett	6ccf88f808	Upgrade to JS SDK 2.1.1 and React SDK 1.3.1	2019-07-11 11:09:56 +01:00
RiotRobot	6546108307	v1.2.3	2019-07-08 11:12:04 +01:00
RiotRobot	090b2dbd30	Upgrade to JS SDK 2.1.0 and React SDK 1.3.0	2019-07-08 10:58:13 +01:00
RiotRobot	6e502478e3	v1.2.3-rc.1	2019-07-03 17:48:55 +01:00
RiotRobot	751316f388	Upgrade to JS SDK 2.1.0-rc.1 and React SDK 1.3.0-rc.1	2019-07-03 17:25:05 +01:00
J. Ryan Stinnett	ba5cae554c	Upgrade electron-builder, electron-builder-squirrel-windows to latest	2019-07-03 16:06:12 +01:00
J. Ryan Stinnett	ea665da391	Upgrade to Electron 4.2.6	2019-07-03 15:53:23 +01:00
RiotRobot	6f1ce750bf	Merge branch 'master' into develop	2019-06-19 16:03:22 +01:00
RiotRobot	672cf1a46e	v1.2.2	2019-06-19 16:00:42 +01:00
RiotRobot	48b6f8c954	Released js-sdk & react-sdk	2019-06-19 15:55:02 +01:00
J. Ryan Stinnett	292427c275	Move default Electron icons outside asar ... Electron doesn't seem to want to load icons from within `asar`s, so this changes the default icons (used for window and tray) so that they are just regular files on disk and updates the reference to match. Part of https://github.com/vector-im/riot-web/issues/9897	2019-06-18 16:58:43 +01:00
RiotRobot	db77d91500	v1.2.2-rc.2	2019-06-18 16:02:21 +01:00
RiotRobot	589aa19246	js-sdk & react-sdk rc.2	2019-06-18 15:57:30 +01:00
RiotRobot	9af5aea687	v1.2.2-rc.1	2019-06-12 12:12:17 +01:00
RiotRobot	974da9947c	js-sdk & react-sdk rc.1	2019-06-12 12:10:37 +01:00
David Baker	dfb7c163a0	electron 4.2.4	2019-06-11 14:03:05 +01:00
RiotRobot	7446799e4b	v1.2.1	2019-05-31 11:59:31 +01:00
RiotRobot	7c03bd128b	Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1	2019-05-31 11:52:42 +01:00
RiotRobot	2af3d20a71	v1.2.0	2019-05-29 16:23:52 +01:00
RiotRobot	f4b1e3307d	Upgrade SDKs to 1.2.0	2019-05-29 16:14:25 +01:00
RiotRobot	52b2dbec85	v1.2.0-rc.1	2019-05-23 17:41:20 +01:00
RiotRobot	59fa374491	Upgrade SDKs to 1.2.0-rc.1	2019-05-23 17:39:03 +01:00
David Baker	001b7fb799	electron 4.2.2	2019-05-22 12:51:41 +01:00
Matthew Hodgson	4cbe6c1000	remove emojione	2019-05-19 21:26:11 +01:00
David Baker	05a2cb1020	Merge branch 'master' into develop	2019-05-15 14:40:16 +01:00
David Baker	5aa88abacc	v1.1.2	2019-05-15 14:36:52 +01:00
David Baker	d0def4a80f	react-sdk 1.1.2	2019-05-15 14:34:13 +01:00
David Baker	da9cde6d18	Merge branch 'master' into develop	2019-05-14 14:04:34 +01:00
David Baker	5aa8326dfc	v1.1.1	2019-05-14 14:01:01 +01:00
David Baker	8ed44e6b64	matrix-react-sdk v1.1.1	2019-05-14 13:52:05 +01:00
David Baker	814b5297ad	Merge branch 'master' into develop	2019-05-07 16:05:58 +01:00
David Baker	2ab8db3c0c	v1.1.0	2019-05-07 15:55:56 +01:00
David Baker	c81b9bab79	Released react-sdk and js-sdk	2019-05-07 15:52:50 +01:00
David Baker	1a1f2254e5	Remove karma junit output ... See https://github.com/matrix-org/matrix-react-sdk/pull/2944	2019-05-03 11:40:53 +01:00
David Baker	e4f997113d	v1.1.0-rc.1	2019-04-30 12:49:40 +01:00
David Baker	846797be76	add new babel plugins to deps	2019-04-30 12:48:18 +01:00
David Baker	cc8eaea5a7	js-sdk & react-sdk rc.1, electron 4.1.5	2019-04-30 12:10:06 +01:00
Hubert Chathi	9519ad46a1	use the release version of olm 3.1.0	2019-04-23 18:08:07 -04:00
Travis Ralston	cbaa7a81bf	Use packages.matrix.org for Olm ... Fixes https://github.com/vector-im/riot-web/issues/9497	2019-04-15 19:18:33 -06:00
David Baker	f400cea437	Merge branch 'master' into develop	2019-04-16 01:26:24 +01:00
David Baker	dcbe75ec2c	v1.0.8	2019-04-16 01:22:59 +01:00
Andrew Morgan	96be8ad072	Remove 32-bit builds for MacOS and Linux	2019-04-09 18:24:30 +01:00
Andrew Morgan	38b661e2cb	Switch to yarn	2019-04-09 17:03:58 +01:00
Andrew Morgan	657397b177	Add separate platform electron build commands ... Add commands for building separate electron builds for each platform	2019-04-09 17:01:19 +01:00
Bruno Windels	a41a14b975	Merge branch 'master' into develop	2019-04-08 16:21:13 +02:00
Bruno Windels	f76b30af15	v1.0.7	2019-04-08 16:18:22 +02:00
Bruno Windels	b6da314692	bump js-sdk to 1.0.4 and react-sdk to 1.0.7	2019-04-08 16:15:05 +02:00
Hubert Chathi	ec08cd99aa	bump olm version	2019-04-05 16:22:06 -04:00
David Baker	164a0e0160	v1.0.6	2019-04-01 13:55:12 +01:00
David Baker	51f6d02cf1	Released js-sdk & react-sdk, and bump electron version	2019-04-01 13:52:11 +01:00
David Baker	d1a5b79bc3	v1.0.6-rc.1	2019-03-27 17:47:47 +00:00
David Baker	d747896354	react-sdk & js-sdk rc.1	2019-03-27 17:44:30 +00:00
J. Ryan Stinnett	a8e4949616	Update matrix-mock-request	2019-03-27 15:09:34 +00:00
Bruno Windels	f777c2c9bc	Merge branch 'master' into develop	2019-03-21 11:40:43 +01:00
Bruno Windels	c8692473a4	v1.0.5	2019-03-21 11:37:35 +01:00
Bruno Windels	4792eb4aa4	bump matrix-react-sdk version to 1.0.5	2019-03-21 11:31:12 +01:00
David Baker	42c2692d28	Merge branch 'master' into develop	2019-03-18 14:20:09 +00:00
David Baker	dceb2dd671	v1.0.4	2019-03-18 14:16:23 +00:00
David Baker	59ebb15fe9	Released js-sdk & react-sdk	2019-03-18 14:11:09 +00:00
Travis Ralston	1fb8b23d4c	Set up BuildKite for Chrome	2019-03-13 22:03:37 -06:00
J. Ryan Stinnett	75a7e7ce82	Update webpack-dev-server	2019-03-13 15:07:50 +00:00
David Baker	bf721d031a	v1.0.4-rc.1	2019-03-13 15:00:17 +00:00
David Baker	a3585c1feb	react-sdk & js-sdk rc.1	2019-03-13 14:56:24 +00:00
David Baker	d6942353f1	Electron 4.0.8	2019-03-13 14:15:47 +00:00
J. Ryan Stinnett	1312ba537a	Update scripts and docs to use yarn where appropriate ... Most `npm` operations are replaced with `yarn`, which generally has better behavior. However, steps like publish that write to the NPM registry are left to `npm`, which currently handles these tasks best.	2019-03-12 11:06:57 +00:00
David Baker	34d875ca57	remove empty section	2019-03-06 16:51:58 +00:00
David Baker	4078443265	Change olm dependency to normal dep ... It would be nice if it were actually an optional dependency and you could just not install olm and get a Riot without olm, but you can't: what you get is a broken Riot, so having it as an optional dep isn't helping anyone. Also whatever other package-lock changes npm has decided are necessary today.	2019-03-06 16:44:36 +00:00
David Baker	acb8afaeb7	Merge branch 'master' into develop	2019-03-06 16:07:05 +00:00
David Baker	2bb134e7f5	v1.0.3	2019-03-06 15:58:00 +00:00
David Baker	052adc10b5	react-sdk v1.0.3	2019-03-06 15:48:57 +00:00
David Baker	b2d417d7ef	Merge branch 'master' into develop	2019-03-06 11:38:17 +00:00
David Baker	b6930415ce	v1.0.2	2019-03-06 11:33:14 +00:00
David Baker	72014c59be	Released matrix-sdk & js-sdk	2019-03-06 11:29:55 +00:00
David Baker	2b709c6973	v1.0.2-rc.3	2019-03-05 19:22:13 +00:00
David Baker	95c979de98	react-sdk & js-sdk rcs	2019-03-05 19:20:21 +00:00
David Baker	d4f29805c3	v1.0.2-rc.2	2019-03-01 17:42:19 +00:00
David Baker	20c437277c	react-sdk rc.3	2019-03-01 17:38:31 +00:00
David Baker	ea959d5994	v1.0.2-rc.1	2019-03-01 12:22:19 +00:00
David Baker	2e3d0e50ec	react-sdk rc.2	2019-03-01 12:19:28 +00:00
David Baker	6206b1d073	js-sdk & react-sdk rc.1	2019-02-28 14:51:51 +00:00
J. Ryan Stinnett	8b25d4f710	Nudge karma to 3.1.2 ... This includes a fix for detecting the version of Chrome used to run tests.	2019-02-28 13:52:34 +00:00
David Baker	0d5e80cc51	Update to electron 4.0.6	2019-02-27 17:34:36 +00:00
Bruno Windels	878190ba27	add content hash to individual language files	2019-02-18 16:11:41 +01:00
Bruno Windels	1b501f6582	v1.0.1	2019-02-15 14:01:19 +01:00
Bruno Windels	c953791cd0	bump matrix-react-sdk to 1.0.1	2019-02-15 13:57:04 +01:00
J. Ryan Stinnett	3b123ce5c1	v1.0.0	2019-02-14 17:08:42 +00:00
J. Ryan Stinnett	47fbe1f600	Update dependencies	2019-02-14 16:59:01 +00:00
J. Ryan Stinnett	755ad22489	Upgrade electron-builder-squirrel-windows	2019-02-14 12:24:25 +00:00
J. Ryan Stinnett	1c1ebfa784	v1.0.0-rc.2	2019-02-14 11:20:03 +00:00
J. Ryan Stinnett	39e16a18e2	Update dependencies	2019-02-14 11:18:24 +00:00
David Baker	8dca2502cd	v1.0.0-rc.1	2019-02-08 18:47:23 +00:00
David Baker	a929331160	released js-sdk & react-sdk	2019-02-08 18:45:24 +00:00
David Baker	e83c141599	Electron 4.0.4	2019-02-08 18:12:46 +00:00
Bruno Windels	90140f6361	Merge pull request #8321 from vector-im/experimental ... Merge redesign into develop	2019-01-30 12:49:37 +00:00
David Baker	68fd1f0fad	Update to prerelease olm for key verification	2019-01-28 10:21:55 +00:00
David Baker	5fe0af2500	Update electron builder ... This resolves an issue where the auto-updater on Mac with a standard (ie. non-admin) user account would leave the app in a broken, unlaunchable state (although it's not obvious what change in electron-builder fixes this). Fixes https://github.com/vector-im/riot-web/issues/8215	2019-01-23 10:53:32 +00:00
David Baker	5a30b02be4	v0.17.9	2019-01-22 11:45:33 +00:00
David Baker	40d7df793d	Released js-sdk & react-sdk	2019-01-22 11:31:00 +00:00
J. Ryan Stinnett	49be03e845	Process images with Webpack ... This adds a `file-loader` rule to the Webpack build so that any requests for image resource will be output into the app's output directory, but with an extra content has appended so that we can safely use a long cache lifetime. The CSS and SCSS rules are also changed to use `css-loader` so that any `url` inside is automatically processed by the new image rule above.	2019-01-18 08:39:09 -06:00
David Baker	e5c0af478d	v0.17.9-rc.1	2019-01-17 11:09:13 +00:00
David Baker	b09f0618a9	js-sdk & react-sdk rc.1	2019-01-17 10:56:34 +00:00
David Baker	3236f72031	Electron 4.0.1	2019-01-17 10:16:15 +00:00
David Baker	751a1dc543	Add tool to migrate logins between origins ... App checks at startup for an existing session, if there isn't one, it will start the tool to check for a login in the file:// origin. If there is one, it will copy the login over to the vector://vector origin. In principle this could also be used to migrate logins between other origins on the web if this were ever required. This includes a minified copy of the browserified js-sdk with a getAllEndToEndSessions() function added to the crypto store (https://github.com/matrix-org/matrix-js-sdk/pull/812). This is not great, but for a short-lived tool this seems better than introducing more entry points into webpack only used for the electron app.	2018-12-21 19:14:25 +00:00
David Baker	c2038a5ccc	v0.17.8	2018-12-10 13:48:11 +00:00
David Baker	a82f9d5266	Released js-sdk & react-sdk	2018-12-10 13:46:35 +00:00
David Baker	b6493a2f82	v0.17.8-rc.1	2018-12-06 12:49:53 +00:00
David Baker	bf2d792d94	Revert electron app version bump	2018-12-06 12:45:38 +00:00
David Baker	10294ab240	react-sdk rc.2	2018-12-06 12:42:52 +00:00
David Baker	88ff92a658	v0.17.8-rc.1	2018-12-06 11:21:42 +00:00
David Baker	5310b4c14b	js-sdk & react-sdk rc.1	2018-12-06 11:20:00 +00:00
David Baker	7247e97ff0	Update to electron 3.0.10	2018-12-05 15:55:20 +00:00
David Baker	1dfaf70562	Revert "Revert "Run lint on travis builds and use modern node versions""	2018-11-22 18:25:55 +00:00
David Baker	f701e2601a	Revert "Run lint on travis builds and use modern node versions"	2018-11-22 18:17:09 +00:00
David Baker	a7a5679bfa	Merge pull request #7490 from aaronraimist/lint ... Run lint on travis builds and use modern node versions	2018-11-22 18:01:04 +00:00
David Baker	d483fb0605	v0.17.7	2018-11-22 16:58:48 +00:00
David Baker	d9434c7af5	Bump js-sdk & react-sdk	2018-11-22 16:56:13 +00:00
David Baker	bbb128b672	Merge branch 'develop' into lint	2018-11-22 11:23:02 +00:00
David Baker	e604dfe9e8	v0.17.6	2018-11-19 15:24:34 +00:00
David Baker	2a594414e7	released js-sdk / react-sdk	2018-11-19 15:21:12 +00:00
David Baker	a570ee53a8	v0.17.6-rc.2	2018-11-15 15:40:54 +00:00
David Baker	d287abcd68	Update js-sdk to 0.14 & react-sdk to rc.2 ... rc.1 used js-sdk 0.13 which did not use the new Olm API.	2018-11-15 15:37:20 +00:00
David Baker	79fd38a899	v0.17.6-rc.1	2018-11-15 12:23:06 +00:00
David Baker	8f37c22917	releaesed js-sdk & react-sdk rc.1	2018-11-15 12:20:42 +00:00
David Baker	cc4d0af713	Merge branch 'master' into develop	2018-11-13 19:02:34 +00:00
David Baker	4a217d9e9f	v0.17.5	2018-11-13 18:54:25 +00:00
David Baker	7dd163ac85	bump react-sdk	2018-11-13 18:52:16 +00:00
David Baker	061838bdab	Merge branch 'master' into develop	2018-11-13 18:19:10 +00:00
David Baker	24846a1d64	v0.17.4	2018-11-13 18:11:12 +00:00
David Baker	f8ab754af4	bump react-sdk	2018-11-13 18:09:10 +00:00
J. Ryan Stinnett	e9f4594eb9	Allow Webpack dev server to listen to all interfaces ... Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>	2018-11-08 20:55:51 +01:00
Travis Ralston	36cc5de0e7	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:05:36 -06:00
David Baker	ca305399c3	npm update	2018-10-29 14:30:35 +00:00
David Baker	79c7f331c9	develop js & react sdk deps	2018-10-29 14:28:13 +00:00
David Baker	409c48efcb	Merge branch 'master' into develop	2018-10-29 14:27:46 +00:00
David Baker	29f3ff155a	v0.17.3	2018-10-29 14:22:55 +00:00
David Baker	f05646c5a1	released js-sdk & react-sdk	2018-10-29 14:20:12 +00:00
Aaron Raimist	a4ed1afeb5	Update babel-eslint to 8.1.1 ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-10-26 22:07:35 -05:00
Travis Ralston	d3805f7545	Regenerate package-lock.json and upgrade eslint again	2018-10-26 20:12:43 -06:00
Travis Ralston	70891f41a5	Merge branch 'develop' into lint	2018-10-26 19:56:33 -06:00
Travis Ralston	f9fa338960	Merge branch 'develop' into travis/permalink-routing	2018-10-26 09:22:13 -06:00
Travis Ralston	ad7ac26ff3	Upgrade babel-eslint and regenerate package-lock.json	2018-10-25 16:10:27 -06:00
Travis Ralston	10efaaa078	Merge branch 'develop' into lint	2018-10-25 16:06:02 -06:00
J. Ryan Stinnett	9732d10f24	Update chokidar to transitively get newer fsevents ... Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>	2018-10-25 23:04:25 +02:00
David Baker	9b80aa76ce	Merge pull request #7385 from vector-im/dbkr/wasm ... Support WebAssembly version of Olm	2018-10-25 15:58:24 +01:00
David Baker	bc935012da	Update to Olm 3	2018-10-25 15:44:22 +01:00
Travis Ralston	e4025f1aff	Mock fs, tls, and net to support request in the browser ... fs is mocked using memfs, which needs to be installed at all 3 layers because webpack is silly	2018-10-24 16:59:14 -06:00
David Baker	e2b55315a6	v0.17.3-rc.1	2018-10-24 11:31:59 +01:00
David Baker	f7138c0516	react-sdk & js-sdk rc.1	2018-10-24 11:27:01 +01:00
David Baker	d080a204a3	electron 3.0.5	2018-10-24 11:12:51 +01:00
Aaron Raimist	b7622d8551	Use babel-eslint 7.2.3 instead ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-10-19 23:00:02 -05:00
Aaron Raimist	c470e2dcfb	Actually I'll just fix the errors myself and get rid of lintwithexclusions ... I seemingly need babel-eslint version 8 for VectorHomePage.js but might as well just upgrade to version 10 Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-10-19 21:04:55 -05:00
Aaron Raimist	fe11ae73db	Run lintwithexclusions on travis builds ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-10-19 20:59:07 -05:00
Bruno Windels	ca1dec8e13	Merge branch 'master' into develop	2018-10-19 17:07:29 +02:00
Bruno Windels	f5eff7d349	v0.17.2	2018-10-19 16:54:27 +02:00
Bruno Windels	62f664c592	update matrix-react-sdk to 0.14.1	2018-10-19 16:45:39 +02:00
David Baker	47493fa7d9	Merge branch 'master' into develop	2018-10-18 18:43:58 +01:00
David Baker	a7ea51fc3e	v0.17.1	2018-10-18 18:39:58 +01:00
David Baker	2202ff1ccd	update deps	2018-10-16 11:12:13 +01:00