Commit Graph

25789 Commits (7683f2fe1a637e1f4ad0539c3ef2b8b08e63073c)

Author SHA1 Message Date
Michael Telatynski 7683f2fe1a
Merge pull request #4834 from matrix-org/t3chguy/notifications0
Hide app badge count for hidden upgraded rooms (non-highlight)
2020-06-25 15:43:50 +01:00
Michael Telatynski 61618d5162 tidy up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 15:02:52 +01:00
Jorik Schellekens a2d53229ea
Merge pull request #4822 from matrix-org/joriks/appearance-tab-compact-to-advanced
Move compact modern layout checkbox to 'advanced'
2020-06-25 14:38:18 +01:00
Jorik Schellekens 41c59cc75e Fix deactivated checked checkbox styling 2020-06-25 14:21:08 +01:00
Travis Ralston 4d47dcaabd
Merge pull request #4825 from matrix-org/travis/room-list/default-lists
Allow the user to resize the new sublists to 1 tile
2020-06-25 07:18:26 -06:00
Travis Ralston 92f0f1a5d8
Merge pull request #4832 from matrix-org/travis/react-can-shush
Make LoggedInView a real component because it uses shouldComponentUpdate
2020-06-25 07:17:56 -06:00
Travis Ralston a3b38a2b5f Make LoggedInView a real component because it uses shouldComponentUpdate
React demands this.
2020-06-25 07:14:02 -06:00
Michael Telatynski 98fc23acb3
Merge pull request #4829 from matrix-org/t3chguy/notifications0
Small tweaks in preparation for Notifications rework
2020-06-25 14:11:24 +01:00
Michael Telatynski 8743af56ad Bring notification utils into this century to simplify ongoing Notifications work
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 09:00:13 +01:00
Michael Telatynski d4eebd5202 Fix alwaysShowBadgeCounts settings defn
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 08:58:54 +01:00
Michael Telatynski edd09f66d1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-25 08:45:32 +01:00
Michael Telatynski dbe575d523 Remove DEBUG
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 08:44:24 +01:00
Michael Telatynski dc099efb19 make Notifier getSoundForRoom synchronous
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 08:43:35 +01:00
Travis Ralston 223c26b033
Merge pull request #4826 from matrix-org/travis/room-list/cleanup
Remove extraneous debug from the new left panel
2020-06-24 20:26:32 -06:00
Travis Ralston 90ff4585d5 Remove extraneous debug from the new left panel 2020-06-24 20:14:01 -06:00
Travis Ralston 37a415693f Allow the user to resize the new sublists to 1 tile
For dogfooding https://github.com/vector-im/riot-web/issues/14137

To change the default: `localStorage.setItem("mx_dogfood_rl_defTiles", 4);`
2020-06-24 20:08:26 -06:00
Travis Ralston 7dc2fc0751
Merge pull request #4824 from matrix-org/travis/room-list/fix-icons
Fix icons in the new user menu not showing up
2020-06-24 19:48:53 -06:00
Travis Ralston 291914492f Fix icons in the new user menu not showing up 2020-06-24 19:20:43 -06:00
Travis Ralston bb9999a414
Merge pull request #4817 from matrix-org/travis/room-list/sticky-room-fixes
Fix sticky room disappearing/jumping in search results
2020-06-24 10:55:14 -06:00
Travis Ralston c047a76f1d Update the filtering for the right tag 2020-06-24 10:36:43 -06:00
J. Ryan Stinnett 767090dd78
Merge pull request #4821 from matrix-org/jryans/more-reset-paths
Show cross-signing / secret storage reset button in more cases
2020-06-24 17:35:24 +01:00
Travis Ralston 906b72082e
Merge pull request #4819 from matrix-org/travis/room-list/icon-masks
Use theme-capable icons in the user menu
2020-06-24 10:34:29 -06:00
Jorik Schellekens 0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
J. Ryan Stinnett b01015f5c5 Show cross-signing / secret storage reset button in more cases
This exposes the cross-signing / secret storage reset button in more cases to
hopefully give people a better chance of trying again in case something failed
halfway through set up. In particular, any combination of keys existing now
reveals the reset button.

Fixes https://github.com/vector-im/riot-web/issues/13993
2020-06-24 14:30:12 +01:00
Bruno Windels fc61145c11
Merge pull request #4814 from matrix-org/bwindels/custom-theme-font
Font support in custom themes
2020-06-24 13:15:42 +00:00
Travis Ralston 5e07052f9e
Merge pull request #4816 from matrix-org/travis/room-list/tweak/sublisting
Decrease margin between new sublists
2020-06-24 07:05:46 -06:00
Travis Ralston 3b24f42def
Merge pull request #4818 from matrix-org/travis/room-list/user-menu-polish
Update profile information in User Menu and truncate where needed
2020-06-24 07:04:49 -06:00
Travis Ralston 256636ccf8 Use display:block over absolute positioning 2020-06-24 07:04:19 -06:00
Bruno Windels 183eb78fa8 fix lint 2020-06-24 14:58:41 +02:00
Bruno Windels b3fd1eda03 change the format of font faces to something closer to the css 2020-06-24 14:54:14 +02:00
Jorik Schellekens c660467c33
Merge pull request #4802 from matrix-org/joriks/fix-reply-messageactionbar
Fix MessageActionBar in irc layout
2020-06-24 11:00:08 +01:00
Travis Ralston 5c7e59b132 Use theme-capable icons in the user menu
They're still inconsistent weights, but at least they are the right color on non-light-theme clients.
2020-06-23 21:17:39 -06:00
Travis Ralston 380aed4244 Update profile information in User Menu
Fixes https://github.com/vector-im/riot-web/issues/14158 (we needed an HTTP avatar URL)
Fixes https://github.com/vector-im/riot-web/issues/14159
Fixes https://github.com/vector-im/riot-web/issues/14157
Also fixes an issue where it wasn't updating automatically when the user changed their profile info.

This is all achieved through a new OwnProfileStore which does the heavy lifting, as we have to keep at least 2 components updated.
2020-06-23 21:01:50 -06:00
Travis Ralston f93d67fc65 Fix sticky room disappearing/jumping in search results
Fixes https://github.com/vector-im/riot-web/issues/14124
Fixes https://github.com/vector-im/riot-web/issues/14154 (which was technically supposed to say that the sticky room when filtering was always last)

This is all a bit complicated, but the theory is that we end up with a stable list even through filtering. There's some notes within, though I suspect it'll be difficult to understand :(
2020-06-23 16:49:39 -06:00
Hubert Chathi 74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup
Mark messages with a black shield if the megolm session isn't trusted
2020-06-23 15:38:03 -04:00
Travis Ralston dd9112a01a Decrease margin between new sublists
This is an attempt to increase density without adjusting the tiles directly.
2020-06-23 11:44:40 -06:00
Bruno Windels 3b13a623cd cleanup 2020-06-23 17:54:57 +02:00
Bruno Windels 2f6fc6bba2 allow adding custom font faces in theme 2020-06-23 17:54:38 +02:00
Bruno Windels b3510aa2b4 remove css vars when switching theme 2020-06-23 17:54:17 +02:00
Bruno Windels e083856801 allow changing the font-family 2020-06-23 17:53:40 +02:00
Bruno Windels 86597aabca better naming 2020-06-23 17:52:54 +02:00
Jorik Schellekens 1e39279a77
Merge pull request #4761 from matrix-org/joriks/appearance-advanced
Custom font selection
2020-06-23 15:38:50 +01:00
RiotRobot 6739c90f44 Fix SDK in changelog 2020-06-23 15:25:59 +01:00
J. Ryan Stinnett 3829362754 Fix up merge to develop 2020-06-23 15:24:02 +01:00
RiotRobot f3af603102 Reset matrix-js-sdk back to develop branch 2020-06-23 15:19:55 +01:00
RiotRobot 6161f95434 Merge branch 'master' into develop 2020-06-23 15:18:35 +01:00
RiotRobot 5256a86545 v2.8.0 2020-06-23 15:06:53 +01:00
RiotRobot 059d5f927d Prepare changelog for v2.8.0 2020-06-23 15:06:52 +01:00
RiotRobot 54ba75afd7 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 14:48:23 +01:00
Jorik Schellekens 680e997a94 Cleanup tooltip classnames 2020-06-23 13:38:50 +01:00