395 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jorik Schellekens	2cc25f699b	Delabs font-scaling	2020-07-13 19:10:59 +01:00
Travis Ralston	94b2ac703a	Merge pull request #109 from vector-im/travis/room-list/enable ... Remove room list labs flag from config	2020-07-13 06:56:19 -06:00
Travis Ralston	e88ef97b87	Merge branch 'develop' into travis/room-list/enable	2020-07-10 21:35:47 -06:00
Jorik Schellekens	c7683d70b4	Merge pull request #111 from vector-im/joriks/delabs-irc-layout ... Remove the irc layout setting from labs	2020-07-09 16:20:41 +01:00
Jorik Schellekens	53950e69ad	Remove the irc layout setting from labs	2020-07-09 15:59:16 +01:00
Travis Ralston	d9047d7960	Merge pull request #108 from vector-im/travis/update-npm ... Update npm to ^6.14.6	2020-07-07 14:49:35 -06:00
Travis Ralston	5e2876649d	Update npm to ^6.14.6	2020-07-07 14:48:36 -06:00
Travis Ralston	bed2eb2c41	Remove labs flag from config	2020-07-07 13:58:33 -06:00
RiotRobot	4f844d9a64	Reset matrix-js-sdk back to develop branch	2020-07-03 13:23:36 +01:00
RiotRobot	d91034a938	v1.6.8	2020-07-03 13:23:00 +01:00
RiotRobot	46d5e0508b	Prepare changelog for v1.6.8	2020-07-03 13:23:00 +01:00
RiotRobot	ed3a07e61b	Upgrade matrix-js-sdk to 7.1.0	2020-07-03 13:22:09 +01:00
RiotRobot	1ea9a9d8be	v1.6.8-rc.1	2020-07-01 14:31:37 +01:00
RiotRobot	c859c78621	Prepare changelog for v1.6.8-rc.1	2020-07-01 14:31:37 +01:00
RiotRobot	c057dde907	Upgrade matrix-js-sdk to 7.1.0-rc.1	2020-07-01 14:23:47 +01:00
Michael Telatynski	4ca58eebf9	Merge pull request #106 from vector-im/t3chguy/download_toast ... Show expiring toast on completed downloads to prompt user to open	2020-06-30 20:18:56 +01:00
J. Ryan Stinnett	b337f41a93	Merge pull request #107 from vector-im/jryans/e-9.0.5 ... Upgrade to Electron 9.0.5	2020-06-30 17:32:20 +01:00
J. Ryan Stinnett	60d01d1a33	Upgrade to Electron 9.0.5	2020-06-30 16:55:14 +01:00
Andrew Morgan	fb6c87200e	Merge pull request #105 from vector-im/anoa/new_spinner_feature_flag ... Add new spinner labs option to config.json	2020-06-29 17:09:20 +01:00
RiotRobot	9c92b57193	Reset matrix-js-sdk back to develop branch	2020-06-29 16:17:45 +01:00
RiotRobot	910cd9824b	Merge branch 'master' into develop	2020-06-29 16:17:16 +01:00
RiotRobot	e368f44ebb	v1.6.7	2020-06-29 16:16:53 +01:00
RiotRobot	fda652deaf	Prepare changelog for v1.6.7	2020-06-29 16:16:53 +01:00
Michael Telatynski	891e7ca234	Show expiring toast on completed downloads to prompt user to open ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-06-29 16:08:39 +01:00
Andrew Morgan	6c04a56579	Add new spinner labs option to config.json ... Previously added to Riot Web's config.json: https://github.com/vector-im/riot-web/pull/14213	2020-06-28 19:26:25 +01:00
Damir Jelić	a11feaca32	Merge branch 'poljar/skip-unneeded-reindex' into develop	2020-06-24 16:59:29 +02:00
Damir Jelić	b23cc417e1	package.json: Bump the required Seshat version.	2020-06-24 16:31:49 +02:00
Damir Jelić	2da6bc6a1e	electron-main: Rename the deletion method for the index.	2020-06-24 11:06:09 +02:00
Damir Jelić	141107c678	electron-main: Skip the reindex if we're going to delete the db anyways.	2020-06-23 16:42:27 +02:00
RiotRobot	503442e189	Reset matrix-js-sdk back to develop branch	2020-06-23 15:20:45 +01:00
RiotRobot	43e9c19f8d	Merge branch 'master' into develop	2020-06-23 15:20:01 +01:00
RiotRobot	ef94a61b5d	v1.6.6	2020-06-23 15:19:38 +01:00
RiotRobot	dde4e2da9b	Prepare changelog for v1.6.6	2020-06-23 15:19:38 +01:00
RiotRobot	c1e20617f5	Upgrade matrix-js-sdk to 7.0.0	2020-06-23 14:49:49 +01:00
Damir Jelić	748f4dccb4	riot-desktop: Bump the required seshat version.	2020-06-19 10:52:02 +02:00
Damir Jelić	069f009d85	Merge remote-tracking branch 'origin/poljar/eventindex-user-version' into develop	2020-06-19 09:54:29 +02:00
Damir Jelić	c1646e882a	Merge remote-tracking branch 'origin/poljar/eventindex-newly-encrypted-room' into develop	2020-06-19 09:54:19 +02:00
RiotRobot	0168182f5b	v1.6.6-rc.1	2020-06-17 21:40:42 +01:00
RiotRobot	9cf829730f	Prepare changelog for v1.6.6-rc.1	2020-06-17 21:40:42 +01:00
RiotRobot	ab2a1e5fdd	Upgrade matrix-js-sdk to 7.0.0-rc.1	2020-06-17 21:38:17 +01:00
Michael Telatynski	3597f43b73	Merge pull request #94 from vector-im/t3chguy/electron9 ... Upgrade to Electron 9	2020-06-17 20:59:14 +01:00
Michael Telatynski	17cbc88d39	Bump to electron 9.0.4 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-06-17 16:58:36 +01:00
Michael Telatynski	a95e40506b	Merge branches 'develop' and 't3chguy/electron9' of https://github.com/vector-im/riot-desktop into t3chguy/electron9	2020-06-17 16:57:17 +01:00
Damir Jelić	a9b4110d65	electron-main: Add support to set and get the user version.	2020-06-17 17:19:47 +02:00
Michael Telatynski	e10582749b	Merge pull request #101 from vector-im/t3chguy/needle ... Upgrade needle to avoid bugs with modern Node	2020-06-16 13:46:10 +01:00
Michael Telatynski	d0d14e80ce	Upgrade needle to avoid bugs with modern Node ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-06-16 12:41:58 +01:00
RiotRobot	f9d928a534	Reset matrix-js-sdk back to develop branch	2020-06-16 11:16:49 +01:00
RiotRobot	8f4ef2d332	Merge branch 'master' into develop	2020-06-16 11:16:18 +01:00
RiotRobot	a5b809ab06	v1.6.5	2020-06-16 11:14:38 +01:00
RiotRobot	2891019044	Prepare changelog for v1.6.5	2020-06-16 11:14:38 +01:00