Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix various issues surrounding granular settings to date #1613

Merged
merged 10 commits into from
Nov 16, 2017
Merged

Fix various issues surrounding granular settings to date #1613

merged 10 commits into from
Nov 16, 2017

Commits on Nov 16, 2017

  1. Use SettingsStore for default theme 

    Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    022e40a View commit details
    Browse the repository at this point in the history

  2. Validate that URL previews are explicitly enabled/disabled 

    Otherwise `!null` ends up being "true", therefore forcing URL previews on for everyone.

Fixes element-hq/element-web#5607

Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    cf8ff6a View commit details
    Browse the repository at this point in the history

  3. Use the correct level order when getting arbitrary settings 

    This shouldn't currently be causing problems, but will in teh future. The bug can be exposed by having a setting where the level order is completely reversed, therefore causing LEVEL_ORDER[0] to actually be the most generic, not the most specific. Instead, we'll pull in the setting's level order and fallback to LEVEL_ORDER, therefore requesting the most specific value.

Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    f141ee1 View commit details
    Browse the repository at this point in the history

  4. Language is a local setting 

    Fixes element-hq/element-web#5611

Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    10a1d9c View commit details
    Browse the repository at this point in the history

  5. Treat null/undefined notification settings as "not set" 

    Otherwise we end up lying and saying notifications are disabled, despite the push rules saying otherwise.

Part 1 of the fix for:
* element-hq/element-web#5603
* element-hq/element-web#5606

Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    5976fb2 View commit details
    Browse the repository at this point in the history

  6. 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:
* element-hq/element-web#5603
* element-hq/element-web#5606

Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    fb1f20b View commit details
    Browse the repository at this point in the history

  7. Fix URL preview string not being translated 

    Signed-off-by: Travis Ralston <travpc@gmail.com>
    @turt2live
    turt2live committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    d0a0a9c View commit details
    Browse the repository at this point in the history

  8. remove rogue debug

    @ara4n
    ara4n committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    3e13a91 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into travis/granular_bugs

    @ara4n
    ara4n committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    f62b04c View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into travis/granular_bugs

    @ara4n
    ara4n committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    52e2c98 View commit details
    Browse the repository at this point in the history