216 commits

Author	SHA1	Message	Date
Travis Ralston	b9794ea6e4	Remove webpack-build-notifier from lockfile	2020-05-26 13:50:31 -06:00
Jorik Schellekens	43c0148123	Fix @types/react conflict in matrix-react-sdk	2020-05-25 18:37:30 +01:00
RiotRobot	ef60265bb6	Reset matrix-react-sdk back to develop branch	2020-05-22 14:36:23 +01:00
RiotRobot	aed4568882	Reset matrix-js-sdk back to develop branch	2020-05-22 14:36:11 +01:00
RiotRobot	16ecc007d6	Reset matrix-react-sdk back to develop branch	2020-05-19 11:36:17 +01:00
RiotRobot	92b94af9ed	Reset matrix-js-sdk back to develop branch	2020-05-19 11:36:07 +01:00
RiotRobot	ef0076bd83	Merge branch 'master' into develop	2020-05-19 11:34:45 +01:00
RiotRobot	a9fbc190bf	Upgrade matrix-react-sdk to 2.6.0	2020-05-19 11:28:08 +01:00
RiotRobot	f35ec09b54	Upgrade matrix-js-sdk to 6.1.0	2020-05-19 11:27:41 +01:00
RiotRobot	fe32590e30	Upgrade matrix-react-sdk to 2.6.0-rc.1	2020-05-14 16:35:02 +01:00
RiotRobot	710dc18f2c	Upgrade matrix-js-sdk to 6.1.0-rc.1	2020-05-14 16:33:28 +01:00
Michael Telatynski	911bd2e469	Replace favico.js dependency with simplified variant grown from it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-05-13 05:19:08 +01:00
Michael Telatynski	f4e21c3fc7	Remove electron_app as we now have riot-desktop repo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-05-06 11:32:13 +01:00
RiotRobot	fb33b6082d	Reset matrix-react-sdk back to develop branch	2020-05-05 11:41:33 +01:00
RiotRobot	99af02eecd	Reset matrix-js-sdk back to develop branch	2020-05-05 11:41:11 +01:00
RiotRobot	d5d4b95fee	Merge branch 'master' into develop	2020-05-05 11:39:12 +01:00
RiotRobot	3e13de3069	Upgrade matrix-react-sdk to 2.5.0	2020-05-05 11:31:28 +01:00
RiotRobot	cc192ab882	Upgrade matrix-js-sdk to 6.0.0	2020-05-05 11:30:41 +01:00
RiotRobot	1edfde3932	Upgrade matrix-react-sdk to 2.5.0-rc.6	2020-05-01 16:33:00 +01:00
RiotRobot	43879c410c	Upgrade matrix-js-sdk to 6.0.0-rc.2	2020-05-01 16:32:34 +01:00
RiotRobot	3c7de2c08f	Upgrade matrix-react-sdk to 2.5.0-rc.5	2020-04-30 11:34:11 +01:00
RiotRobot	ecc73905c1	Upgrade matrix-js-sdk to 6.0.0-rc.1	2020-04-30 11:33:23 +01:00
RiotRobot	e7cb2e4022	Upgrade matrix-react-sdk to 2.5.0-rc.4	2020-04-23 15:58:10 +01:00
RiotRobot	7600571cf5	Upgrade matrix-js-sdk to 5.3.1-rc.4	2020-04-23 15:57:32 +01:00
Travis Ralston	3eadf35819	Manually undo emojibase changes in lockfile	2020-04-20 09:49:09 -06:00
RiotRobot	393d701ee9	Upgrade matrix-js-sdk to 5.3.1-rc.3	2020-04-17 17:58:52 +01:00
RiotRobot	ef5d1f421d	Upgrade matrix-react-sdk to 2.5.0-rc.3	2020-04-17 17:57:33 +01:00
RiotRobot	6ca2f4c87d	Upgrade matrix-react-sdk to 2.5.0-rc.2	2020-04-16 20:06:01 +01:00
RiotRobot	0c12630b89	Upgrade matrix-js-sdk to 5.3.1-rc.2	2020-04-16 20:04:19 +01:00
Travis Ralston	005269e2ad	Make Jitsi download script a JS script ... It's awful but means that we create the directory on all platforms in-process. Fixes https://github.com/vector-im/riot-web/issues/13215	2020-04-16 12:37:41 -06:00
RiotRobot	2cd585cd6c	Upgrade matrix-react-sdk to 2.5.0-rc.1	2020-04-15 19:24:18 +01:00
RiotRobot	0b32f7c87f	Upgrade matrix-js-sdk to 5.3.1-rc.1	2020-04-15 19:22:38 +01:00
RiotRobot	08ef4ff3b1	Merge branch 'release-v1.5.16' into release-v1.6.0	2020-04-15 19:08:28 +01:00
J. Ryan Stinnett	a1ef707065	yarn upgrade	2020-04-08 14:55:46 +01:00
RiotRobot	48018b33cc	Upgrade matrix-react-sdk to 2.4.0-rc.1	2020-04-08 14:06:02 +01:00
RiotRobot	83af795358	Upgrade matrix-js-sdk to 5.3.0-rc.1	2020-04-08 14:03:43 +01:00
Michael Telatynski	b647e35c48	Merge pull request #13049 from vector-im/t3chguy/default_home ... Add new default home page fallback	2020-04-07 14:47:01 +01:00
Michael Telatynski	e58cd1f73a	Add new default home page fallback ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-07 10:48:56 +01:00
Michael Telatynski	b1575524aa	Switch things to typescript, use @types/modernizr, fix global.d.ts. Move mobile_guide redirect to index.ts ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-05 00:55:36 +01:00
RiotRobot	cb8319ea2d	Reset matrix-react-sdk back to develop branch	2020-04-01 15:35:13 +01:00
RiotRobot	af35696db9	Reset matrix-js-sdk back to develop branch	2020-04-01 15:35:02 +01:00
RiotRobot	ccd998d709	Merge branch 'master' into develop	2020-04-01 15:34:02 +01:00
RiotRobot	5f5d46eb11	Upgrade matrix-react-sdk to 2.3.1	2020-04-01 15:08:57 +01:00
RiotRobot	d4f75e4e1b	Reset matrix-react-sdk back to develop branch	2020-03-30 13:54:09 +01:00
RiotRobot	4a4df94339	Reset matrix-js-sdk back to develop branch	2020-03-30 13:53:58 +01:00
RiotRobot	51f4327ce1	Upgrade matrix-react-sdk to 2.3.0	2020-03-30 13:45:21 +01:00
RiotRobot	37cebf38cc	Upgrade matrix-js-sdk to 5.2.0	2020-03-30 13:44:42 +01:00
RiotRobot	5b35d6e570	Upgrade matrix-react-sdk to 2.3.0-rc.1	2020-03-26 13:28:04 +00:00
RiotRobot	9269d9b669	Upgrade matrix-js-sdk to 5.2.0-rc.1	2020-03-26 13:27:40 +00:00
Michael Telatynski	7296b704a8	Merge pull request #12756 from vector-im/t3chguy/gemini ... Remove remainders of gemini-scrollbar and react-gemini-scrollbar	2020-03-18 14:03:59 +00:00