26693 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Telatynski	3060cdf934	Iterate PR ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-13 17:01:50 +01:00
Travis Ralston	9a3744ebb2	Fix default sorting mechanics for new room list ... Fixes https://github.com/vector-im/riot-web/issues/14445	2020-07-13 09:54:15 -06:00
Michael Telatynski	b3c3ef594e	i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-13 16:39:59 +01:00
Michael Telatynski	5bee948717	Fix room tile context menu for Historical rooms ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-13 16:35:03 +01:00
Jorik Schellekens	59e153e024	Merge branch 'develop' into joriks/delabs-font-scaling	2020-07-13 16:15:52 +01:00
Jorik Schellekens	cd83f12a82	Fix badges for font size 20	2020-07-13 16:11:21 +01:00
Jorik Schellekens	ea15725164	Merge pull request #4895 from jugglinmike/gh-12743-ignore-user-names ... "ignore"/"unignore" commands: validate user ID	2020-07-13 16:07:31 +01:00
Jorik Schellekens	71e97177b0	Merge pull request #4957 from matrix-org/joriks/room-list-avatar-aspect-ratio ... Stop classname from overwritting baseavatar's	2020-07-13 16:02:06 +01:00
Michael Telatynski	1ce3ae0cf2	Merge pull request #4952 from matrix-org/t3chguy/room-list/14413 ... Remove redundant scroll-margins and fix RoomTile wrongly scrolling	2020-07-13 15:57:27 +01:00
Jorik Schellekens	3e2280a6f4	Stop classname from overwritting baseavatar's	2020-07-13 15:43:34 +01:00
Michael Telatynski	3c096fdf23	Merge pull request #4953 from matrix-org/t3chguy/fix/14402 ... Fix RoomAvatar viewAvatarOnClick to work on actual avatars instead of default ones	2020-07-13 15:28:29 +01:00
Michael Telatynski	97734395f7	Merge pull request #4955 from matrix-org/t3chguy/fix/13991 ... Be consistent with the at-room pill avatar configurability	2020-07-13 15:28:12 +01:00
Michael Telatynski	72407a30d3	Merge pull request #4954 from matrix-org/t3chguy/room-list/14409 ... Room List v2 Enter in the filter field should select the first result	2020-07-13 15:27:16 +01:00
Travis Ralston	a70e575b96	Merge pull request #4919 from matrix-org/travis/room-list/enable ... Enable the new room list by default	2020-07-13 06:56:25 -06:00
J. Ryan Stinnett	c77b312fd3	Merge branch 'jryans/rename-strings' into 'element' ... Update brand name using variable in all strings See merge request new-vector/element/element-web/matrix-react-sdk!3	2020-07-13 12:23:28 +00:00
Travis Ralston	0908e813fb	Merge branch 'develop' into travis/room-list/enable	2020-07-12 22:50:27 -06:00
Michael Telatynski	c3789245b8	Be consistent with the at-room pill avatar configurability ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-12 19:25:43 +01:00
Michael Telatynski	d253c58830	Room List v2 Enter in the filter field should select the first result ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-12 19:06:47 +01:00
Michael Telatynski	71ecd5dc85	clean-up ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-12 18:40:24 +01:00
Michael Telatynski	3f51bb84e1	Fix RoomAvatar viewAvatarOnClick to work on actual avatars instead of default ones ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-12 18:24:28 +01:00
Travis Ralston	1c52c2777e	Merge pull request #4949 from matrix-org/travis/room-list/mute-floats ... Convert ImportanceAlgorithm over to using NotificationColor instead	2020-07-12 11:00:18 -06:00
Michael Telatynski	213e2df9fc	Remove redundant scroll-margins and fix RoomTile wrongly scrolling ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-07-12 08:49:04 +01:00
J. Ryan Stinnett	0c06975e7a	Merge remote-tracking branch 'origin/develop' into element	2020-07-11 19:16:26 +01:00
Travis Ralston	31f1fbd962	Merge pull request #4951 from matrix-org/travis/room-list/fix-sublist-menu ... Internalize algorithm updates in the new room list store	2020-07-11 12:15:53 -06:00
Travis Ralston	b924dcc6ad	Merge pull request #4950 from matrix-org/travis/room-list/cleanup-resizing ... Remove now-dead code from sublist resizing	2020-07-11 12:11:51 -06:00
Travis Ralston	0e49c4343c	Internalize algorithm updates in the new room list store ... Fixes https://github.com/vector-im/riot-web/issues/14411 The act of setting/changing the algorithm was causing the update function to be marked, meaning we wouldn't trigger an update until something else happened later. To get around this, and still support internal functions spamming calls without multiple updates, we simply move the guts to an internalized function and make the public interface do a trigger.	2020-07-10 21:59:12 -06:00
Travis Ralston	c153232575	Merge branch 'develop' into travis/room-list/enable	2020-07-10 21:33:35 -06:00
Travis Ralston	e6c7e7c28e	Merge pull request #4948 from matrix-org/travis/room-list/fix-filter ... Ensure triggered updates get fired for filters in the new room list	2020-07-10 16:52:02 -06:00
Travis Ralston	cfc39dc4a9	Remove now-dead code from sublist resizing	2020-07-10 16:10:05 -06:00
Travis Ralston	3062d14a78	Convert ImportanceAlgorithm over to using NotificationColor instead ... Fixes https://github.com/vector-im/riot-web/issues/14362 implicitly By re-using constructs we already have, we don't need to invent code which figures it out.	2020-07-10 16:07:40 -06:00
Travis Ralston	87120c6c26	Ensure triggered updates get fired for filters in the new room list ... Fixes https://github.com/vector-im/riot-web/issues/14404	2020-07-10 15:58:39 -06:00
Travis Ralston	bb6d46f926	When the algorithm changes, re-add the filter listener	2020-07-10 15:57:05 -06:00
J. Ryan Stinnett	e808cdbe2f	Remove translations missing the brand variable	2020-07-10 19:57:01 +01:00
J. Ryan Stinnett	fa55f9fda2	Prune translations for strings that no longer exist	2020-07-10 19:57:01 +01:00
J. Ryan Stinnett	f1ad49e745	Replace brand name in stranslated strings	2020-07-10 19:57:01 +01:00
J. Ryan Stinnett	9085627a28	Use brand name from config in all strings	2020-07-10 19:57:01 +01:00
J. Ryan Stinnett	bb5107a60b	Change default brand name	2020-07-10 19:57:01 +01:00
J. Ryan Stinnett	5f78522681	Move the default brand into the config module	2020-07-10 19:57:01 +01:00
J. Ryan Stinnett	7686039874	Work around timeout types for now	2020-07-10 18:32:43 +01:00
J. Ryan Stinnett	063e6e3e9c	Fix a few types	2020-07-10 18:23:27 +01:00
J. Ryan Stinnett	353eae44f2	Merge remote-tracking branch 'origin/develop' into element	2020-07-10 18:14:21 +01:00
Travis Ralston	bdb641279a	Merge branch 'develop' into travis/room-list/enable	2020-07-10 11:11:25 -06:00
Travis Ralston	b5e9b5fc32	Merge pull request #4947 from matrix-org/travis/room-list/filter-fix ... Handle off-cycle filtering updates in the new room list	2020-07-10 11:10:05 -06:00
David Baker	503159c1c8	Merge branch 'dbkr/in-app-rebrand-prompt' into 'element' ... Add in-app rebranding toasts & prompts See merge request new-vector/element/element-web/matrix-react-sdk!1	2020-07-10 17:09:17 +00:00
Travis Ralston	9e76a2cebf	Handle off-cycle filtering updates in the new room list	2020-07-10 11:07:47 -06:00
Bruno Windels	a2cb6f375a	fix padding upon Nads request	2020-07-10 19:06:48 +02:00
Travis Ralston	3826d81358	Enable test mode	2020-07-10 11:05:56 -06:00
Bruno Windels	b7ded18fde	Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element	2020-07-10 19:05:46 +02:00
Bruno Windels	952200f031	Merge branch 'develop' into element	2020-07-10 19:04:45 +02:00
Travis Ralston	1175eb001f	Fix bad merge	2020-07-10 11:01:11 -06:00