Commit graph

264 commits

Author SHA1 Message Date
Travis Ralston
cc22be4f1d Update attribution 2020-07-14 15:51:34 -06:00
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00
Jorik Schellekens
3eac852ad0 Change font slider values 2020-07-14 21:27:01 +01:00
Travis Ralston
3a8b3e26ac Fix appearance tab saying the wrong theme is selected
Fixes https://github.com/vector-im/riot-web/issues/14275
2020-07-14 11:53:10 -06:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
Bruno Windels
4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Jorik Schellekens
59e153e024
Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-13 16:15:52 +01:00
J. Ryan Stinnett
9085627a28 Use brand name from config in all strings 2020-07-10 19:57:01 +01:00
Travis Ralston
75dbd5f1d4 Merge branch 'develop' into travis/room-list/enable 2020-07-09 22:28:16 -06:00
Jorik Schellekens
1033eda7fb Move irc layout option to advanced 2020-07-09 15:54:44 +01:00
Travis Ralston
a59a8b76a9 Update TODO comments to point to new issue 2020-07-07 14:51:43 -06:00
Jorik Schellekens
1e0ff01d50 De labs font-scaling 2020-07-06 15:43:49 +01:00
Michael Telatynski
ae5ab4c394
Merge pull request #4893 from matrix-org/t3chguy/room-list/101
Radio button outline fixes including for new room list context menu
2020-07-03 20:35:17 +01:00
Michael Telatynski
c8bb6f5904 Improve radio outlines for message layout to be more consistent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:48:22 +01:00
Michael Telatynski
5a542281ed Make Styled Radio Button outlines default-off
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:27:45 +01:00
J. Ryan Stinnett
04142a8723 Remove duplicate compact settings, handle device level updates
This removes the duplicate setting for compact layout from the appearance tab,
and leaves the "advanced" one, matching the intention from Design.

This also adds the relevant handling to ensure the device-level setting triggers
an update immediately when changed.

Fixes https://github.com/vector-im/riot-web/issues/14304
2020-07-03 12:06:00 +01:00
Travis Ralston
0868af650a Appease the linter 2020-06-30 19:37:00 -06:00
Travis Ralston
d402808101 Disable use of account-level ordering options in new room list
Fixes https://github.com/vector-im/riot-web/issues/14069

We can't drop them completely for compatibility with the old room list.
2020-06-30 19:31:59 -06:00
Michael Telatynski
85c5bb3bc3
Merge pull request #4835 from matrix-org/t3chguy/notifications0
More small tweaks in preparation for Notifications rework
2020-06-25 23:34:28 +01:00
Michael Telatynski
ed634a2bde Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 16:35:40 +01:00
Jorik Schellekens
0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
Jorik Schellekens
d54676aefe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced 2020-06-22 15:35:48 +01:00
Jorik Schellekens
3d7427ccca Fix semicolons 2020-06-22 11:39:11 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced 2020-06-22 11:27:48 +01:00
Jorik Schellekens
37b299412f Fix merge conflicts 2020-06-18 15:47:26 +01:00
Jorik Schellekens
f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 15:37:01 +01:00
Jorik Schellekens
b9fb9aae4a Rename MessagePreview to EventTilePreview 2020-06-18 15:36:23 +01:00
Jorik Schellekens
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview 2020-06-18 15:19:28 +01:00
Jorik Schellekens
291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon 2020-06-18 14:54:20 +01:00
Jorik Schellekens
47a825be7c
Merge branch 'develop' into joriks/appearance-advanced 2020-06-18 14:41:28 +01:00
Jorik Schellekens
05d0309081 Lint a few semicolons 2020-06-18 14:32:43 +01:00
Jorik Schellekens
9760f94ff5 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 14:04:31 +01:00
Jorik Schellekens
69969dfee8 Respond to review
- remove all refs to getsdk
- i18n
- some lints
2020-06-18 13:58:35 +01:00
Jorik Schellekens
a579ea95db Lint and i18n 2020-06-18 13:28:24 +01:00
David Baker
54e235b0b9 Remove labs option to cache 'passphrase'
(which actually meant SSSS secrets)

Fixes https://github.com/vector-im/riot-web/issues/1392
2020-06-18 10:42:33 +01:00
Jorik Schellekens
2fcf30c1ec
Fix copy '!' 2020-06-17 14:39:44 +01:00
Jorik Schellekens
2192332968 Add layout options to the appearance tab 2020-06-16 17:55:19 +01:00
Jorik Schellekens
17dbb1ac8b Message preview for font slider 2020-06-16 15:41:10 +01:00
Jorik Schellekens
02ccdcb802 Fix field width and add tooltip 2020-06-15 17:42:30 +01:00
Jorik Schellekens
aee9cd51a0 Remove shadowed variable 2020-06-15 16:34:56 +01:00
Jorik Schellekens
edb6bbc6c0 Implement font selection 2020-06-15 15:33:52 +01:00
Jorik Schellekens
3dd49cae97 use checkbox for compact layout 2020-06-11 12:29:10 +01:00
Jorik Schellekens
cf392af52f Address design issues and set theme at device level 2020-06-11 12:27:09 +01:00
Jorik Schellekens
0f685eb0e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/radio-buttons 2020-06-11 11:03:54 +01:00
Jorik Schellekens
9b623f5b44 fix line indents 2020-06-09 13:38:29 +01:00
Jorik Schellekens
b4bdb23f5f Clean up font scaling appearance 2020-06-08 19:02:36 +01:00
Jorik Schellekens
24cf3d5f05 add key to react list and let selector container wrap 2020-06-08 18:37:36 +01:00
Jorik Schellekens
a10e71edcf Use styled radio buttons for theme selection 2020-06-08 18:17:02 +01:00
Jorik Schellekens
2fe7c37566 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-unit-change 2020-06-08 13:37:05 +01:00
Jorik Schellekens
bba6767608 Update displayed min and max 2020-06-04 18:00:22 +01:00