Commit Graph

36 Commits (6fd24e837cea347ef8476b8f3fb0a6407d3061f6)

Author SHA1 Message Date
Jorik Schellekens 82b76192ae Fixes, lints and i18n 2020-05-20 14:44:56 +01:00
Jorik Schellekens 6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Travis Ralston 90a898d03f Move dispatcher into a subdirectory
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
Jorik Schellekens f1130ecba1 Linting. Finally set up my linter properly 2020-04-23 10:45:47 +01:00
Jorik Schellekens 61f2e19d95 Basic font settings.
Include a default value getter in the store in order to make the
default value easy to work with.
2020-04-23 10:45:47 +01:00
David Baker 327b3c860b Adding the files would help 2020-03-25 18:47:57 +00:00
David Baker cb9362456f remove setter 2020-01-31 13:18:01 +00:00
David Baker 2d9b111680 Add an override for the theme
So we can force the light theme on unthemeable pages like the login
& complete security page.

Fixes https://github.com/vector-im/riot-web/issues/12149
Fixes https://github.com/vector-im/riot-web/issues/12157
2020-01-31 12:28:14 +00:00
Travis Ralston 18ac2db2ea Fix Notifier imports in NotificationControllers
require() is a bit weird for riot-web's webpack, so we fork it out to its own function to reduce the weirdness. 

The added weirdness is that require() is sync though exports a module instead. If we use import(), we get a promise which doesn't help us here. We therefore have to require() and pull out the default export, though this is only a problem for webpack - babel (our chosen compiler for exporting ES6) doesn't need this, hence the if statement.
2019-12-22 21:25:47 -07:00
Travis Ralston 042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston 806d728d59 Import from the js-sdk's src/ directory
Because ES6 and such.
2019-12-22 21:14:33 -07:00
Travis Ralston be4eeb5e07 Fix js-sdk imports for new module 2019-12-22 21:10:26 -07:00
Travis Ralston 37ec7e6f7e Ensure the settings page accurately represents theme choices
Fixes https://github.com/vector-im/riot-web/issues/11518

This also fixes a bug where the the theme logic can incorrectly get stuck in the light theme - the ThemeController was overriding *all* values, not just supposed themes. Null values aren't overridden so that the various theme logic bits don't assume the user has chosen the light theme explicitly.
2019-11-28 13:40:28 -07:00
J. Ryan Stinnett b8c0a0fe72 Reload automatically when changing cross-signing flag 2019-11-18 16:06:00 +00:00
Bruno Windels 558f8daeeb support custom themes from setting
also move theme setting code from MatrixChat to own file.
2019-10-01 15:21:22 +02:00
Michael Telatynski 7bdac85a2a Break themes out into a separate file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 14:24:12 +01:00
Michael Telatynski 916af736ad Consolidate Themes into ThemeController. Remove hardcoded themes in view
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:43:34 +01:00
Travis Ralston 0d47222132 Add LB setting to new user settings
Put under labs out of concern for https://github.com/vector-im/riot-meta/issues/66
2019-05-30 19:57:17 -06:00
J. Ryan Stinnett b0d08b9a25 Rename dharma theme to light theme 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett df2f520d72 Fix up any unsupported themes when read from settings 2019-02-13 10:44:01 +00:00
Bruno Windels ac4ab11985 remove ll feature flag, it's time! 2019-02-07 18:24:07 +00:00
J. Ryan Stinnett 632bbde598 Remove usused setting value from CustomStatusController 2019-01-15 10:54:29 -06:00
J. Ryan Stinnett c76b273fae Update RoomTiles on custom status change 2019-01-15 10:54:29 -06:00
Aaron Raimist 49ce4ef117
eslint --fix src/
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:50:38 -05:00
Bruno Windels 7dc92fe917 Avoid clearing e2e encryption keys, also avoid warning 2018-08-13 17:24:27 +02:00
Bruno Windels 2f9aaeca46 undo whitespace change 2018-08-13 11:17:04 +02:00
Bruno Windels 09ad138306 remove unused imports 2018-08-13 11:16:29 +02:00
Bruno Windels 28292c3388 implement PR feedback, move LL dialog to UserSettings 2018-08-13 11:14:30 +02:00
Bruno Windels 028f09e5d1 lazy loading settings controller to show dialog and export e2e keys 2018-08-09 18:39:55 +02:00
Bruno Windels 308a6b419e allow a setting controller to validate and revert a change (asynchronously) 2018-08-09 16:56:02 +02:00
Travis Ralston 2815c576c1 Ignore the default value when calculating if notifications are enabled
This is to make the "Enable desktop notifications" checkbox accurately reflect the user's preference. The device-level setting is still respected. 

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-25 13:29:30 -07:00
Matthew Hodgson 3e13a919ed
remove rogue debug 2017-11-16 13:09:53 +00:00
Travis Ralston fb1f20b7d4 Treat the master push rule as authoritative
Previously the push rule was ignored, leading to all kinds of interesting issues regarding notifications. This fixes those issues by giving the master push rule the authority it deserves for reasonable defaults.

Part 2 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
Travis Ralston 781b94c8f4 Appease the linter
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 15:37:06 -07:00
Travis Ralston e31c89d360 Make the controller work for notifications
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 22:28:35 -07:00
Travis Ralston 7ce4316cc8 Initial support for notification settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 21:47:18 -07:00