1194 commits

Author	SHA1	Message	Date
RiotRobot	5446184e6e	Upgrade matrix-js-sdk to 9.0.0	2020-10-26 16:49:16 +00:00
Aleks Kissinger	4536f51ec0	Merge branch 'develop' into katex	2020-10-25 12:28:17 +00:00
Aleks Kissinger	173d798865	added cheerio as explicit dep in package.json	2020-10-23 18:41:24 +01:00
RiotRobot	5c7e9e8a46	v3.7.0-rc.2	2020-10-21 15:21:44 +01:00
RiotRobot	b585cf76bd	Upgrade matrix-js-sdk to 9.0.0-rc.1	2020-10-21 15:16:46 +01:00
RiotRobot	2f3eb0cd01	v3.7.0-rc.1	2020-10-21 14:44:21 +01:00
RiotRobot	65d7b9c0f2	Upgrade matrix-js-sdk to 8.5.0	2020-10-21 14:38:51 +01:00
RiotRobot	bd1276c56b	Reset matrix-js-sdk back to develop branch	2020-10-20 11:27:33 +01:00
RiotRobot	2d5528fccd	Merge branch 'master' into develop	2020-10-20 11:26:23 +01:00
RiotRobot	3b90ed0664	v3.6.1	2020-10-20 11:23:48 +01:00
J. Ryan Stinnett	2219419f52	Upgrade widget API	2020-10-19 17:41:04 +01:00
J. Ryan Stinnett	d6a166d3bf	Upgrade widget API	2020-10-19 16:56:36 +01:00
RiotRobot	d007b06d7c	Reset matrix-js-sdk back to develop branch	2020-10-12 13:40:23 +01:00
RiotRobot	ddd3d97b71	Merge branch 'master' into develop	2020-10-12 13:39:18 +01:00
RiotRobot	2242e6b8c6	v3.6.0	2020-10-12 13:36:52 +01:00
RiotRobot	0ac4f21652	Upgrade matrix-js-sdk to 8.5.0	2020-10-12 13:24:53 +01:00
Aleks Kissinger	aafaf34233	Merge branch 'develop' into katex	2020-10-10 19:31:46 +01:00
Travis Ralston	2caf679024	Update widget-api	2020-10-08 21:22:17 -06:00
Travis Ralston	25db3e9efa	Update widget-api	2020-10-08 21:21:11 -06:00
RiotRobot	4abaa107ab	v3.6.0-rc.1	2020-10-07 14:30:51 +01:00
RiotRobot	2fd9b9b3b9	Upgrade matrix-js-sdk to 8.5.0-rc.1	2020-10-07 14:23:52 +01:00
Michael Telatynski	0d6edab708	Workaround Jest bug with ArrayBuffers ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-10-07 01:22:29 +01:00
Michael Telatynski	13afb8d4f1	Update Jest and JSDOM ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-10-07 00:08:40 +01:00
Travis Ralston	08c5e9e039	Use the beta release of the widget-api	2020-09-30 20:42:37 -06:00
RiotRobot	524b2dbd22	Reset matrix-js-sdk back to develop branch	2020-09-28 16:20:07 +01:00
RiotRobot	ceb2975c91	v3.5.0	2020-09-28 16:18:15 +01:00
RiotRobot	a16ca8226c	Upgrade matrix-js-sdk to 8.4.1	2020-09-28 16:12:05 +01:00
RiotRobot	fe5e1f4543	Upgrade matrix-js-sdk to 8.4.0	2020-09-28 14:25:51 +01:00
RiotRobot	9ac3af4176	v3.5.0-rc.1	2020-09-23 15:32:47 +01:00
RiotRobot	ca4b11ec6a	Upgrade matrix-js-sdk to 8.4.0-rc.1	2020-09-23 15:27:40 +01:00
J. Ryan Stinnett	064ae187e2	Upgrade sanitize-html, set nesting limit ... This uses the recently added option to allow specifying a nesting limit. Fixes https://github.com/vector-im/element-web/issues/15122	2020-09-22 18:06:10 +01:00
Aleks Kissinger	0604c86779	added katex package and import	2020-09-19 15:45:35 +01:00
Michael Telatynski	d59a1fbd80	Merge pull request #5179 from matrix-org/t3chguy/tidy-dev-deps ... Tidy devDeps, all the webpack stuff lives in the layer above	2020-09-17 15:06:16 +01:00
RiotRobot	747126950b	Merge branch 'master' into develop	2020-09-14 16:07:54 +01:00
RiotRobot	4f930ac50c	v3.4.1	2020-09-14 15:49:09 +01:00
RiotRobot	148cad6ea2	Reset matrix-js-sdk back to develop branch	2020-09-14 13:42:34 +01:00
RiotRobot	099f50b10e	v3.4.0	2020-09-14 13:36:32 +01:00
RiotRobot	ba73847296	Upgrade matrix-js-sdk to 8.3.0	2020-09-14 13:31:41 +01:00
RiotRobot	c5e033d81a	v3.4.0-rc.1	2020-09-09 15:53:04 +01:00
RiotRobot	cc353dbe43	Upgrade matrix-js-sdk to 8.3.0-rc.1	2020-09-09 15:13:40 +01:00
Michael Telatynski	b878c27741	Tidy devDeps, all the webpack stuff lives in the layer above	2020-09-08 16:56:22 +01:00
Jason Robinson	75518254fb	Merge pull request #5173 from matrix-org/jaywink/jitsi-openidjwt-auth ... Support creation of Jitsi widgets with "openidtoken-jwt" auth	2020-09-08 17:16:50 +03:00
Jason Robinson	db2e1a9cd0	Add rfc4648 (base64/32/16) encoder to dependencies	2020-09-04 10:04:18 +03:00
Michael Telatynski	e624ce11b4	Merge pull request #5157 from matrix-org/t3chguy/crc1 ... Remove create-react-class	2020-09-03 17:21:58 +01:00
RiotRobot	0d290c9bd2	Reset matrix-js-sdk back to develop branch	2020-09-01 17:39:09 +01:00
RiotRobot	52691a1a42	Merge branch 'master' into develop	2020-09-01 17:38:21 +01:00
RiotRobot	9df5371dca	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2020-09-01 17:37:52 +01:00
RiotRobot	d1d823dcc7	v3.3.0	2020-09-01 17:36:21 +01:00
RiotRobot	bb248670a6	Upgrade matrix-js-sdk to 8.2.0	2020-09-01 17:02:49 +01:00
Michael Telatynski	72498df28f	Remove create-react-class	2020-08-29 12:14:16 +01:00
Michael Telatynski	672d0fe97b	Remove redundant components and devDependencies	2020-08-29 12:09:07 +01:00
RiotRobot	d0358ab196	v3.3.0-rc.1	2020-08-26 12:02:11 +01:00
RiotRobot	b142d72e97	Upgrade matrix-js-sdk to 8.2.0-rc.1	2020-08-26 11:52:28 +01:00
Michael Telatynski	8cff59f123	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs	2020-08-18 17:36:04 +01:00
RiotRobot	c91fc99d4b	Reset matrix-js-sdk back to develop branch	2020-08-17 13:08:45 +01:00
RiotRobot	ea337465ae	v3.2.0	2020-08-17 12:59:51 +01:00
RiotRobot	32ca810809	Upgrade matrix-js-sdk to 8.1.0	2020-08-17 12:53:33 +01:00
RiotRobot	8e8a2e602b	v3.2.0-rc.1	2020-08-13 12:17:59 +01:00
RiotRobot	47bb6d0b25	Upgrade matrix-js-sdk to 8.1.0-rc.1	2020-08-13 12:12:10 +01:00
Michael Telatynski	df980dbf92	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs	2020-08-12 22:48:03 +01:00
RiotRobot	45b79a0b7c	Reset matrix-js-sdk back to develop branch	2020-08-05 16:11:28 +01:00
RiotRobot	f8cdd51fe3	Merge branch 'master' into develop	2020-08-05 16:10:29 +01:00
RiotRobot	f8ed635fbf	v3.1.0	2020-08-05 16:05:30 +01:00
RiotRobot	57814a40c1	Upgrade matrix-js-sdk to 8.0.1	2020-08-05 15:50:03 +01:00
Michael Telatynski	cbcac9dd49	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs ... Conflicts: package.json	2020-08-03 12:54:06 +01:00
Travis Ralston	fed20d46c5	Replace i18n generation script with something matching our project ... We've been relying on flow being close enough to TypeScript for so long that it is starting to run into issues. Here we switch to babel's parser given we already use babel in the project. Babel's parser is also *slightly* faster, allowing us to generate strings 0.1s faster.	2020-07-31 13:33:33 -06:00
RiotRobot	d08a08daeb	v3.1.0-rc.1	2020-07-31 13:30:45 +01:00
RiotRobot	31c66a1128	Upgrade matrix-js-sdk to 8.0.1-rc.1	2020-07-31 13:24:17 +01:00
J. Ryan Stinnett	50bc7fc62f	Remove redundant lint dependencies ... These are no longer needed with the new standard lint repo.	2020-07-29 12:00:42 +01:00
RiotRobot	96ba645cbd	Reset matrix-js-sdk back to develop branch	2020-07-27 21:29:22 +01:00
RiotRobot	f7444a13b4	v3.0.0	2020-07-27 21:18:15 +01:00
RiotRobot	ebb4d2ff87	Upgrade matrix-js-sdk to 8.0.0	2020-07-27 21:05:55 +01:00
Travis Ralston	66eb069651	Pin flow-parser for i18n	2020-07-23 15:43:53 -06:00
Travis Ralston	9d091e5e02	Update packages to modern versions	2020-07-23 15:27:10 -06:00
Michael Telatynski	c4fc70b9be	Post-merge fix ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-21 22:28:36 +01:00
Michael Telatynski	70c81cc377	Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs ... Conflicts: src/i18n/strings/en_EN.json src/rageshake/submit-rageshake.ts	2020-07-21 22:22:28 +01:00
Jorik Schellekens	6219e67a8a	add dep eslint-config-matrix-org	2020-07-20 21:19:49 +01:00
Jorik Schellekens	b3fa855bd8	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config	2020-07-20 16:22:32 +01:00
RiotRobot	2f9bfdbb69	Reset matrix-js-sdk back to develop branch	2020-07-16 16:11:59 +01:00
RiotRobot	0c89b8d267	v2.10.1	2020-07-16 16:09:41 +01:00
RiotRobot	bc97f731fc	Upgrade matrix-js-sdk to 7.1.0	2020-07-16 16:03:00 +01:00
RiotRobot	7098cbfce1	Reset matrix-js-sdk back to develop branch	2020-07-15 12:01:14 +01:00
RiotRobot	a842e0936e	v2.10.0	2020-07-15 11:49:38 +01:00
RiotRobot	c339e5cbf9	Upgrade matrix-js-sdk to 7.1.0	2020-07-15 11:40:31 +01:00
Travis Ralston	3912f2d21c	Merge remote-tracking branch 'origin/develop' into travis/room-list/resizable	2020-07-08 07:55:10 -06:00
Michael Telatynski	c5e8a0b5af	Convert HtmlUtils to TypeScript ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-08 08:40:58 +01:00
Travis Ralston	15b6a273c9	Swap out the resizer lib for something more stable ... react-resizer appears to be okay at tracking state, but it often desyncs from reality. re-resizer is more maintained and more broadly used (160k downloads vs 110k), and appears to generally do a better job of tracking the cursor. The new library has some oddities though, such as deltas, touch support (hence the polyfill), and calling handles "Enable". For https://github.com/vector-im/riot-web/issues/14022	2020-07-07 22:21:00 -06:00
Michael Telatynski	2c1eb07768	Merge pull request #4883 from matrix-org/t3chguy/ts123 ... Convert things to Typescript, including languageHandler	2020-07-06 18:54:19 +01:00
RiotRobot	5c56a55cf0	Reset matrix-js-sdk back to develop branch	2020-07-03 13:29:56 +01:00
RiotRobot	21b7b88fde	v2.9.0	2020-07-03 13:27:48 +01:00
RiotRobot	452bb73dcf	Upgrade matrix-js-sdk to 7.1.0	2020-07-03 13:22:03 +01:00
Michael Telatynski	48ce294a49	Transition languageHandler to Typescript ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-02 23:15:08 +01:00
RiotRobot	f9cb0b9cab	v2.9.0-rc.1	2020-07-01 14:32:20 +01:00
RiotRobot	161c37d93c	Upgrade matrix-js-sdk to 7.1.0-rc.1	2020-07-01 14:21:35 +01:00
Jorik Schellekens	b110639c76	Merge remote-tracking branch 'origin' into joriks/eslint-config	2020-06-29 16:49:33 +01:00
RiotRobot	0059d44e15	Merge branch 'master' into develop	2020-06-29 16:10:32 +01:00
RiotRobot	e43311c0f4	v2.8.1	2020-06-29 15:59:37 +01:00
Jorik Schellekens	0a2934203f	Remove tslint	2020-06-23 17:01:40 +01:00
Jorik Schellekens	7699aafcaf	Use new eslint package- fix lint issues in ts and js	2020-06-23 17:01:19 +01:00
RiotRobot	f3af603102	Reset matrix-js-sdk back to develop branch	2020-06-23 15:19:55 +01:00
RiotRobot	5256a86545	v2.8.0	2020-06-23 15:06:53 +01:00
RiotRobot	54ba75afd7	Upgrade matrix-js-sdk to 7.0.0	2020-06-23 14:48:23 +01:00
RiotRobot	b5aa66015c	v2.8.0-rc.1	2020-06-17 21:46:34 +01:00
RiotRobot	dd23a50a3c	Upgrade matrix-js-sdk to 7.0.0-rc.1	2020-06-17 21:40:30 +01:00
RiotRobot	6f6793bc85	Reset matrix-js-sdk back to develop branch	2020-06-16 11:45:28 +01:00
RiotRobot	8047bace91	Merge branch 'master' into develop	2020-06-16 11:44:27 +01:00
RiotRobot	0f6a0bb3ae	v2.7.2	2020-06-16 11:35:29 +01:00
RiotRobot	1374d2020a	Upgrade matrix-js-sdk to 6.2.2	2020-06-16 11:26:12 +01:00
Travis Ralston	1467191a5d	Update the CSS transition for breadcrumbs ... The actual transition length might need adjusting, but this is fairly close to what was requested.	2020-06-09 15:06:54 -06:00
Michael Telatynski	69ea635398	Allow searching the emoji picker using other emoji ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-06-05 23:19:00 +01:00
Travis Ralston	ee3d2c51d8	Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize ... New room list scrolling and resizing	2020-06-05 13:17:59 -06:00
RiotRobot	d54308a8c6	Reset matrix-js-sdk back to develop branch	2020-06-05 15:48:06 +01:00
RiotRobot	c8366b7a47	v2.7.1	2020-06-05 15:43:24 +01:00
RiotRobot	e78fa602c0	Upgrade matrix-js-sdk to 6.2.1	2020-06-05 15:13:55 +01:00
Travis Ralston	cdf2d70aea	Merge branch 'develop' into travis/room-list/scrolling-resize	2020-06-04 09:19:54 -06:00
RiotRobot	3c73930e9a	Reset matrix-js-sdk back to develop branch	2020-06-04 15:14:34 +01:00
RiotRobot	260d448db6	Merge branch 'master' into develop	2020-06-04 15:13:41 +01:00
RiotRobot	65e59fd708	v2.7.0	2020-06-04 15:12:24 +01:00
RiotRobot	07a12a73ee	Upgrade matrix-js-sdk to 6.2.0	2020-06-04 15:06:40 +01:00
Travis Ralston	dbf996439b	Wedge t3chguy's resizer prototype into the sublist	2020-06-03 21:17:51 -06:00
RiotRobot	ec35445bf0	v2.7.0-rc.2	2020-06-02 14:37:47 +01:00
RiotRobot	039c42dc09	v2.7.0-rc.1	2020-06-02 13:59:10 +01:00
RiotRobot	98a6dd88e3	Upgrade matrix-js-sdk to 6.2.0-rc.1	2020-06-02 13:53:13 +01:00
Matthew Hodgson	9cdc1788b2	rebuild with emojibase-data 5	2020-05-31 16:04:15 +01:00
Matthew Hodgson	c3ad15e479	upgrade to twemoji 13.0.0	2020-05-31 14:09:44 +01:00
Jorik Schellekens	076a3e058d	Merge pull request #4635 from JorikSchellekens/joriks/field-ts ... Move Field to Typescript	2020-05-26 16:13:03 +01:00
Michael Telatynski	c74d890774	Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 ... Conflicts: src/@types/global.d.ts src/components/structures/ToastContainer.tsx	2020-05-26 13:38:17 +01:00
Jorik Schellekens	b4624baf2f	Merge branch 'develop' into joriks/field-ts	2020-05-25 17:29:25 +01:00
Jorik Schellekens	30e2b01022	unlock react types	2020-05-25 17:08:37 +01:00
Jorik Schellekens	63f78b0808	Move tooltip to ts	2020-05-25 13:40:05 +01:00
Michael Telatynski	880e16aaa2	Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks ... Conflicts: src/components/views/avatars/BaseAvatar.js test/components/views/messages/TextualBody-test.js	2020-05-23 11:12:58 +01:00
Michael Telatynski	efeb8a8487	Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3	2020-05-23 11:01:36 +01:00
RiotRobot	5ec8459468	Merge branch 'master' into develop	2020-05-22 14:13:01 +01:00
RiotRobot	5a4da13e86	v2.6.1	2020-05-22 14:00:29 +01:00
Michael Telatynski	dc37469808	Convert ToastContainer and ToastStore to Typescript ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-05-22 12:47:40 +01:00
Travis Ralston	7ff850deea	Merge pull request #4253 from matrix-org/travis/room-list-2 ... Rewrite the room list store	2020-05-21 13:30:32 -06:00
RiotRobot	833eccf5cd	Reset matrix-js-sdk back to develop branch	2020-05-19 11:25:07 +01:00
RiotRobot	19e496cacc	Merge branch 'master' into develop	2020-05-19 11:23:16 +01:00
RiotRobot	26e6447be5	v2.6.0	2020-05-19 11:22:00 +01:00
RiotRobot	406839e89a	Upgrade matrix-js-sdk to 6.1.0	2020-05-19 11:13:57 +01:00
Travis Ralston	38920e7f30	Merge branch 'develop' into travis/room-list-2	2020-05-18 23:23:59 -06:00
Travis Ralston	9aff2e836e	Merge pull request #4593 from matrix-org/travis/dispatcher-types ... Convert the dispatcher to TypeScript	2020-05-18 23:22:32 -06:00
Michael Telatynski	1eea203db6	Merge pull request #4599 from matrix-org/t3chguy/progress_colour ... Consolidate password/passphrase fields into a component & add dynamic colour to progress	2020-05-18 11:08:08 +01:00
Travis Ralston	798e7a1f86	Merge branch 'develop' into travis/dispatcher-types	2020-05-15 09:56:02 -06:00
Michael Telatynski	59f1657b43	Add jest-canvas-mock ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-05-15 00:25:19 +01:00
Michael Telatynski	cf3c4d9e5f	Extract Password field from Registration into a reusable component ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-05-14 20:20:36 +01:00
Travis Ralston	861268d39f	Invent an AsyncStore and use it for room lists ... This is to get around the problem of a slow dispatch loop. Instead of slowing the whole app down to deal with room lists, we'll just raise events to say we're ready. Based upon the EventEmitter class.	2020-05-14 12:44:29 -06:00
Travis Ralston	08419d195e	Initial breakout for room list rewrite ... This does a number of things (sorry): * Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593) * Sets up the stack for a whole new room list store, and later components for usage. * Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled * Demonstrates a possible structure for algorithms	2020-05-14 12:44:29 -06:00
RiotRobot	81174b5f55	v2.6.0-rc.1	2020-05-14 16:30:17 +01:00
RiotRobot	d8003df24c	Upgrade matrix-js-sdk to 6.1.0-rc.1	2020-05-14 16:22:30 +01:00
Michael Telatynski	1ba19e78f8	Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode ... Conflicts: package.json	2020-05-14 10:50:42 +01:00
Travis Ralston	fa83df4bde	Convert dispatcher to TypeScript and replace async usage with new class ... Due to TypeScript and flux's types being annoying and highly typesafe, we need an AsyncActionPayload which intentionally doesn't use the 'action' property. This looks a bit awkward, though for the rare cases we do actually fire async actions it should be fine enough. The call signature changes slightly for async events, therefore this commit also updates its usages for async events. The `fire()` function is to be used in a future commit. Remove biased comment	2020-05-13 21:07:50 -06:00
RiotRobot	aa0c6f1f71	Reset matrix-js-sdk back to develop branch	2020-05-05 11:40:37 +01:00
RiotRobot	338486b561	Merge branch 'master' into develop	2020-05-05 11:27:52 +01:00
RiotRobot	854855a5aa	v2.5.0	2020-05-05 11:10:36 +01:00
RiotRobot	1423c2e4bc	Upgrade matrix-js-sdk to 6.0.0	2020-05-05 11:04:24 +01:00
RiotRobot	ccb6d91988	v2.5.0-rc.6	2020-05-01 16:30:10 +01:00
RiotRobot	b5cb912cfd	Upgrade matrix-js-sdk to 6.0.0-rc.2	2020-05-01 16:24:59 +01:00
RiotRobot	619fbd6adc	v2.5.0-rc.5	2020-04-30 11:30:14 +01:00
RiotRobot	5a29bf569d	Upgrade matrix-js-sdk to 6.0.0-rc.1	2020-04-30 11:21:33 +01:00
Michael Telatynski	42a857cb5e	Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" ... (cherry picked from commit 972f9d354d)	2020-04-24 13:24:54 +01:00
Michael Telatynski	972f9d354d	Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"	2020-04-24 12:25:19 +01:00
RiotRobot	941709d19a	v2.5.0-rc.4	2020-04-23 15:55:37 +01:00
RiotRobot	86200812a5	Upgrade matrix-js-sdk to 5.3.1-rc.4	2020-04-23 15:49:21 +01:00
Travis Ralston	a55698e943	Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements	2020-04-20 09:22:38 -06:00
Michael Telatynski	3bc5a0a0b2	Convert submit-rageshake to typescript ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-19 12:06:56 +01:00
RiotRobot	1ee2d6f3a2	v2.5.0-rc.3	2020-04-17 17:51:49 +01:00
RiotRobot	383915d5cc	Upgrade matrix-js-sdk to 5.3.1-rc.3	2020-04-17 17:46:55 +01:00
Travis Ralston	6d46ef548e	Enable tests again to catch failures	2020-04-16 16:26:29 -06:00
RiotRobot	23f167d681	v2.5.0-rc.2	2020-04-16 20:01:46 +01:00
RiotRobot	c6746e68b2	Upgrade matrix-js-sdk to 5.3.1-rc.2	2020-04-16 19:56:11 +01:00
Travis Ralston	c3f90ed289	Short-circuit all end to end tests	2020-04-16 12:42:42 -06:00
Travis Ralston	1deece3fb5	Short-circuit all end to end tests	2020-04-16 12:41:48 -06:00
RiotRobot	6ee09cd688	v2.5.0-rc.1	2020-04-15 19:18:45 +01:00
RiotRobot	5022eaf483	Upgrade matrix-js-sdk to 5.3.1-rc.1	2020-04-15 19:13:00 +01:00
RiotRobot	a054ea0653	Merge branch 'release-v2.4.0' into release-v2.5.0	2020-04-15 19:07:11 +01:00
Travis Ralston	77bdde4021	Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements	2020-04-14 12:58:16 -06:00
Michael Telatynski	4fc88d69a3	Remove unused react-addons-css-transition-group ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-12 01:04:54 +01:00
Michael Telatynski	237084da78	wrap node-qrcode in a React FC and use it for ShareDialog instead of qrcode-react ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-11 23:46:58 +01:00
Travis Ralston	0165ff0bc9	Allow iframes and Jitsi URLs in /addwidget ... Fixes https://github.com/vector-im/riot-web/issues/12784	2020-04-09 16:03:40 -06:00
RiotRobot	0d1b7b9963	v2.4.0-rc.1	2020-04-08 13:59:23 +01:00
RiotRobot	6095a00703	Upgrade matrix-js-sdk to 5.3.0-rc.1	2020-04-08 13:52:46 +01:00
Michael Telatynski	5ac68d4ce0	Update emojibase for fixed emoji codepoints and Emoji 13 support ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-06 11:10:00 +01:00
RiotRobot	d8d48275c3	Merge branch 'master' into develop	2020-04-01 14:59:01 +01:00
RiotRobot	adb2fc89e2	v2.3.1	2020-04-01 14:57:53 +01:00
Michael Telatynski	2a45ccaef3	Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs ... Conflicts: yarn.lock	2020-03-30 15:52:36 +01:00
RiotRobot	78fd8e4569	Reset matrix-js-sdk back to develop branch	2020-03-30 13:42:52 +01:00
RiotRobot	e32e9cec06	v2.3.0	2020-03-30 13:41:02 +01:00
RiotRobot	d369695e22	Upgrade matrix-js-sdk to 5.2.0	2020-03-30 13:31:42 +01:00
RiotRobot	2fe0edd3eb	v2.3.0-rc.1	2020-03-26 13:21:11 +00:00
RiotRobot	a1c83a4f0e	Upgrade matrix-js-sdk to 5.2.0-rc.1	2020-03-26 13:02:54 +00:00
Travis Ralston	94d23c815a	Improve naming of Jitsi conferences ... Fixes https://github.com/vector-im/riot-web/issues/12812	2020-03-20 14:19:47 -06:00
Michael Telatynski	d593a76f28	Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd	2020-03-18 20:41:13 +00:00
Michael Telatynski	cad28c81c0	Add Keyboard shortcuts dialog ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-03-18 16:40:21 +00:00
Michael Telatynski	42ee157645	Merge pull request #4217 from matrix-org/t3chguy/gemini ... Remove Gemini Scrollbars	2020-03-18 14:03:51 +00:00
RiotRobot	b09c063d1b	Reset matrix-js-sdk back to develop branch	2020-03-17 14:25:44 +00:00
RiotRobot	8e8723bb36	Merge branch 'master' into develop	2020-03-17 14:24:35 +00:00
RiotRobot	1e3b917aed	v2.2.3	2020-03-17 14:18:15 +00:00
RiotRobot	83b6155637	Upgrade matrix-js-sdk to 5.1.1	2020-03-17 14:12:15 +00:00
Michael Telatynski	44b0aa2d88	Remove remainders of gemini-scrollbar and react-gemini-scrollbar ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-03-17 10:31:45 +00:00