OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
26,616 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

26616 Commits (1f9657c7fbccde7b3c4230fcabcba746a441d890)

Author SHA1 Message Date
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
Travis Ralston 033ae988d6
Merge pull request #4941 from matrix-org/travis/room-list/showmore2 
Make the show more button do a clean cut on the room list while transparent
 2020-07-10 10:57:56 -06:00
Travis Ralston 477472c178 Merge branch 'develop' into travis/room-list/showmore2 2020-07-10 10:57:17 -06:00
Bruno Windels ae8d6f5523 make tsc happy 2020-07-10 18:48:54 +02:00
Bruno Windels 15ea3a5287 add types 2020-07-10 18:42:51 +02:00
Bruno Windels 85ac256231 cleanup 2020-07-10 18:40:09 +02:00
Bruno Windels e2aa6ecf6b fix show X more counter 2020-07-10 18:40:09 +02:00
Bruno Windels 86817430c5 update initially shown amount of tiles on component update 
as rooms aren't all available at ctor time
 2020-07-10 18:40:09 +02:00
Bruno Windels 96f2968854 make all height changes update component state 
also set visibleTiles as side-effect
 2020-07-10 18:40:09 +02:00
Bruno Windels 652fb9e613 track height in pixels in component state 2020-07-10 18:40:09 +02:00
Travis Ralston 314250a6e4 Add a test mode flag to the store 2020-07-10 10:38:07 -06:00
Bruno Windels 49f7170d95 extract type 2020-07-10 18:31:53 +02:00
Bruno Windels 725b7f8950 make show more button a bit less tall 2020-07-10 18:30:52 +02:00
Bruno Windels d5a3071518 put show more button inside resizer 
this way we have a flexbox layout in the resizer with:
 - the resize handle (fixed)
 - the show more/less button, if any (fixed)
 - the list of tiles (grabbing whatever is left)
 2020-07-10 18:29:39 +02:00
Travis Ralston f8db0a4637 Resolve complex merge conflicts 2020-07-10 10:21:00 -06:00
Travis Ralston bf0a503e44 [WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable 2020-07-10 10:18:12 -06:00
Travis Ralston 23d96fbe25 Merge branch 'travis/room-list/user-menu/EL_theme' into 'element' 
Make the theme switcher switch between Element themes

See merge request new-vector/element/element-web/matrix-react-sdk!2
 2020-07-10 15:21:02 +00:00
Travis Ralston 3a3bfb39ee Make the theme switcher switch between Element themes 2020-07-10 09:18:53 -06:00
J. Ryan Stinnett 28bbac8574 Merge remote-tracking branch 'origin/develop' into element 2020-07-10 16:03:11 +01:00
Travis Ralston 976f7381ab Merge remote-tracking branch 'origin/joriks/room-list-fix-search-padding' into develop 2020-07-10 08:53:30 -06:00
Travis Ralston 2bf2a08e7a Mark safari hacks 2020-07-10 08:52:46 -06:00
Travis Ralston 37a8b68539 Merge remote-tracking branch 'origin/joriks/room-list-safari-fix' into develop 2020-07-10 08:51:31 -06:00
Travis Ralston d88dad46b1
Merge pull request #4943 from matrix-org/travis/room-list/perf/dedupe-recalc 
Reduce event loop load caused by duplicate calculations in the new room list
 2020-07-10 08:39:13 -06:00
David Baker 8701e9293e Add in-app rebranding toasts & prompts 
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
 2020-07-10 15:32:34 +01:00
Travis Ralston 26427817f2 Fix potential listener conflict with RVS 
If the RVS ever emits something that contains `trigger: false`, we're pretty screwed, so avoid that.
 2020-07-10 08:18:40 -06:00
Travis Ralston 46d53e5c8c Reset before trigger just in case the function triggers too 2020-07-10 08:14:33 -06:00
Travis Ralston a5ba0cad1f Rename to trigger and add docs 2020-07-10 08:13:23 -06:00