12490 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
RiotRobot	b9837cc771	Merge branch 'master' into develop	2023-03-31 10:48:17 +01:00
RiotRobot	9faa625551	v1.11.27	2023-03-31 10:27:10 +01:00
RiotRobot	ebda5f4d31	Prepare changelog for v1.11.27	2023-03-31 10:27:09 +01:00
RiotRobot	145564719f	Upgrade matrix-react-sdk to 3.69.1	2023-03-31 10:23:03 +01:00
Weblate	166d88058c	Merge branch 'origin/develop' into Weblate.	2023-03-30 12:55:17 +00:00
Michael Telatynski	60d5ab427a	Fix concurrency conflict (#24989)	2023-03-30 13:55:09 +01:00
Weblate	bcc5bd8e54	Merge branch 'origin/develop' into Weblate.	2023-03-30 11:28:27 +00:00
Richard van der Hoff	b9b52c8c06	code_style.md: Add notes on comments (#24990)	2023-03-30 12:28:22 +01:00
Weblate	3210ff2e9c	Merge branch 'origin/develop' into Weblate.	2023-03-29 14:32:10 +00:00
Andy Balaam	7cbd8e04c2	Update changelog for v1.11.26 now the security issue is public (#24975)	2023-03-29 15:32:02 +01:00
Weblate	86c2cb7649	Merge branch 'origin/develop' into Weblate.	2023-03-29 14:08:05 +00:00
Michael Telatynski	84242fc81f	Delete .sentryclirc (#24978)	2023-03-29 15:07:56 +01:00
Weblate	48e845575a	Merge branch 'origin/develop' into Weblate.	2023-03-29 07:30:22 +00:00
Michael Telatynski	39061f9b8c	Update docker base images (#24966)	2023-03-29 08:30:16 +01:00
Weblate	41d025bf48	Merge branch 'origin/develop' into Weblate.	2023-03-28 13:48:14 +00:00
Weblate	581beee0b2	Merge branch 'origin/develop' into Weblate.	2023-03-28 13:47:22 +00:00
RiotRobot	9ec10a274e	Reset matrix-react-sdk back to develop branch	2023-03-28 14:47:11 +01:00
RiotRobot	c848295b8b	Reset matrix-js-sdk back to develop branch	2023-03-28 14:46:52 +01:00
RiotRobot	b472f34d63	Merge branch 'master' into develop	2023-03-28 14:45:38 +01:00
RiotRobot	7a002341f4	v1.11.26	2023-03-28 14:40:55 +01:00
RiotRobot	4969a80c06	Prepare changelog for v1.11.26	2023-03-28 14:40:54 +01:00
RiotRobot	21fa0887bd	Upgrade matrix-react-sdk to 3.69.0	2023-03-28 14:37:43 +01:00
RiotRobot	11f56b06bf	Upgrade matrix-js-sdk to 24.0.0	2023-03-28 14:37:24 +01:00
Weblate	dfaeb6368b	Merge branch 'origin/develop' into Weblate.	2023-03-27 20:01:42 +00:00
Kerry	f033becebb	remove makeType utility from loading-test (#24958)	2023-03-28 09:01:33 +13:00
Weblate	f10171b6bc	Merge branch 'origin/develop' into Weblate.	2023-03-22 16:49:51 +00:00
Johannes Marbach	dcc0cb74fe	Merge pull request #24895 from vector-im/Johennes-patch-1	2023-03-22 17:49:46 +01:00
Johannes Marbach	389f55c261	Update config.yml	2023-03-22 16:25:20 +01:00
Weblate	1716a7f9ca	Merge branch 'origin/develop' into Weblate.	2023-03-22 14:05:16 +00:00
emrah	2575322360	Use a newly generated access_token while joining Jitsi (#24646) ... Fixes: #24687 Signed-off-by: Emrah Eryilmaz emrah.com@gmail.com	2023-03-22 14:05:10 +00:00
Weblate	ab19f5654c	Merge branch 'origin/develop' into Weblate.	2023-03-22 09:22:57 +00:00
Michael Telatynski	b9b0b096a4	Allow desktop app to expose recent rooms in UI integrations (#16940)	2023-03-22 09:22:51 +00:00
Weblate	b391109469	Merge branch 'origin/develop' into Weblate.	2023-03-21 10:25:35 +00:00
Robin	50f8be4a62	Update matrix-widget-api (#24872)	2023-03-21 10:25:26 +00:00
Weblate	d35f3df621	Merge branch 'origin/develop' into Weblate.	2023-03-20 08:21:23 +00:00
renovate[bot]	4121f72593	Update typescript-eslint monorepo to v5.55.0 (#24788) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-03-20 09:21:14 +01:00
Weblate	6a1a47aae1	Merge branch 'origin/develop' into Weblate.	2023-03-17 09:04:59 +00:00
Michael Telatynski	4440315cfb	Update apple-app-site-association (#24847)	2023-03-17 09:04:52 +00:00
Weblate	b2a7d65fc9	Merge branch 'origin/develop' into Weblate.	2023-03-16 11:32:46 +00:00
Germain	c8b3f5d512	Update safari support policy (#24842)	2023-03-16 11:32:39 +00:00
Weblate	21a2a028a5	Merge branch 'origin/develop' into Weblate.	2023-03-15 15:53:11 +00:00
Michael Telatynski	77e7bad4f1	Clear electron data when logging out (#24827)	2023-03-15 15:53:02 +00:00
Weblate	292449369e	Merge branch 'origin/develop' into Weblate.	2023-03-15 13:04:24 +00:00
RiotRobot	e7be53fe85	Reset matrix-react-sdk back to develop branch	2023-03-15 13:04:17 +00:00
RiotRobot	310b478b75	Reset matrix-js-sdk back to develop branch	2023-03-15 13:04:04 +00:00
Weblate	86ab455b54	Merge branch 'origin/develop' into Weblate.	2023-03-15 13:03:59 +00:00
RiotRobot	a66f5e7530	Merge branch 'master' into develop	2023-03-15 13:03:52 +00:00
RiotRobot	e300d45831	v1.11.25	2023-03-15 13:00:08 +00:00
RiotRobot	1046920b6c	Prepare changelog for v1.11.25	2023-03-15 13:00:08 +00:00
RiotRobot	db501e8e2d	Upgrade matrix-react-sdk to 3.68.0	2023-03-15 12:56:12 +00:00