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

Maintenance: Clean up some stuff around settings #2685

Merged
merged 7 commits into from
Feb 25, 2019
Merged

Maintenance: Clean up some stuff around settings #2685

merged 7 commits into from
Feb 25, 2019

Commits on Feb 22, 2019

  1. Sort settings tabs into a logical structure 

    Fixes element-hq/element-web#8864
    @turt2live
    turt2live committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    bd54a40 View commit details
    Browse the repository at this point in the history

  2. Remove DragDropContext from FlairSettings 

    This also fixes a technical bug where one could drag a community from the settings to the LLP
    @turt2live
    turt2live committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    014e4a2 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

  1. Merge remote-tracking branch 'origin/develop' into travis/settings-cl… 

    …eanup-1
    @turt2live
    turt2live committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    4801b25 View commit details
    Browse the repository at this point in the history

  2. Port minimize to tray to new settings tab (post-merge) 

    Brings in b02b371
    @turt2live
    turt2live committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    5bf9f72 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into travis/settings-cl… 

    …eanup-1
    @turt2live
    turt2live committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    cdf0930 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into travis/settings-cleanup-1

    @turt2live
    turt2live committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    24099de View commit details
    Browse the repository at this point in the history

  5. Fix variable reference

    @turt2live
    turt2live committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    1aef157 View commit details
    Browse the repository at this point in the history