Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preferences redesign #8813

Merged
merged 42 commits into from
Jan 15, 2020
Merged

Preferences redesign #8813

merged 42 commits into from
Jan 15, 2020

Commits on Dec 18, 2019

  1. Separate out Integrations tab

    @kuychaco
    kuychaco committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    27532d8 View commit details
    Browse the repository at this point in the history

  2. Include footer for Integrations tab

    @kuychaco
    kuychaco committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    b9be775 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. Add "Applications" header to Integrations tab

    @kuychaco
    kuychaco committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    feddfad View commit details
    Browse the repository at this point in the history

  2. Make Advanced tab less redundant

    @kuychaco
    kuychaco committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    be54b99 View commit details
    Browse the repository at this point in the history

  3. Add section in Advanced for handling changes when switching branches

    @kuychaco
    kuychaco committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    222b8b8 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2019

  1. Wire up radio buttons, store value in local storage

    @kuychaco
    kuychaco committed Dec 21, 2019
    Configuration menu
    Copy the full SHA
    a397784 View commit details
    Browse the repository at this point in the history

  2. Add getUncommittedChangesStrategy helper

    @kuychaco
    kuychaco committed Dec 21, 2019
    Configuration menu
    Copy the full SHA
    54eb1c9 View commit details
    Browse the repository at this point in the history

  3. Default to selected uncommittedChangesStrategy in app store methods

    @kuychaco
    kuychaco committed Dec 21, 2019
    Configuration menu
    Copy the full SHA
    74a6408 View commit details
    Browse the repository at this point in the history

  4. Use uncommittedChangesStragety selected when switching branches

    @kuychaco
    kuychaco committed Dec 21, 2019
    Configuration menu
    Copy the full SHA
    fe54a35 View commit details
    Browse the repository at this point in the history

  5. Use uncommittedChangesStrategy selected when creating new branch

    @kuychaco
    kuychaco committed Dec 21, 2019
    Configuration menu
    Copy the full SHA
    b89ecbd View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2019

  1. Verticalize tab bar

    @kuychaco
    kuychaco committed Dec 25, 2019
    Configuration menu
    Copy the full SHA
    a9b202b View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2019

  1. Add icons

    @kuychaco
    kuychaco committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    a83f84a View commit details
    Browse the repository at this point in the history

  2. Make dialog width wider for new sidebar

    @kuychaco
    kuychaco committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    e37b78b View commit details
    Browse the repository at this point in the history

  3. Update styles for selected item

    @kuychaco
    kuychaco committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    77af3a4 View commit details
    Browse the repository at this point in the history

  4. Style icons

    @kuychaco
    kuychaco committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    ca3d5ba View commit details
    Browse the repository at this point in the history

  5. Fix spacing

    @kuychaco
    kuychaco committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    211f5a0 View commit details
    Browse the repository at this point in the history

  6. Border radius

    @kuychaco
    kuychaco committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    14fd997 View commit details
    Browse the repository at this point in the history

  7. Fix width of tab-container

    @kuychaco
    kuychaco committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    13e7516 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'development' into ku-preferences-redesign

    @kuychaco
    kuychaco committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    ff7cd2c View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Fix styling 

    Co-Authored-By: evelyn masso <outofambit@github.com>
    @kuychaco @outofambit
    kuychaco and outofambit committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    c97f005 View commit details
    Browse the repository at this point in the history

  2. Use arrow up/down for navigation

    @kuychaco
    kuychaco committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    3c72edd View commit details
    Browse the repository at this point in the history

  3. Stash only if changes exist 

    Co-Authored-By: evelyn masso <outofambit@github.com>
    @kuychaco @outofambit
    kuychaco and outofambit committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    76afcf6 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. Prompt before overwriting current stash

    @kuychaco
    kuychaco committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    eeb0589 View commit details
    Browse the repository at this point in the history

  2. Only prompt if there are changes

    @kuychaco
    kuychaco committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    bc7c047 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into ku-preferences-redesign

    @kuychaco
    kuychaco committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    a60d295 View commit details
    Browse the repository at this point in the history

  4. Tiny spacing tweaks

    @ampinsk
    ampinsk committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    4c5ac1d View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Styling tweaks 

    Co-Authored-By: evelyn masso <outofambit@github.com>
    @kuychaco @outofambit
    kuychaco and outofambit committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    a5454b0 View commit details
    Browse the repository at this point in the history

  2. Extract styles to shared base class 

    Co-Authored-By: evelyn masso <outofambit@github.com>
    @kuychaco @outofambit
    kuychaco and outofambit committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    d7bed4e View commit details
    Browse the repository at this point in the history

  3. Fix tab bar background color 

    Co-Authored-By: Amanda Pinsker <apinsker4@gmail.com>
    @kuychaco @ampinsk
    kuychaco and ampinsk committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    4cd70f2 View commit details
    Browse the repository at this point in the history

  4. Align text next to icons 

    Co-Authored-By: evelyn masso <outofambit@github.com>
Co-Authored-By: Amanda Pinsker <apinsker4@gmail.com>
    @kuychaco @outofambit @ampinsk
    3 people committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    7e50c7d View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2020

  1. Fix spacing of Advanced section

    @kuychaco
    kuychaco committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    5bbc79d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into ku-preferences-redesign

    @kuychaco
    kuychaco committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    3acdd9a View commit details
    Browse the repository at this point in the history

  3. Make non-selected icons gray 

    Co-Authored-By: Amanda Pinsker <apinsker4@gmail.com>
    @kuychaco @ampinsk
    kuychaco and ampinsk committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    48d3a65 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development' into ku-preferences-redesign

    @kuychaco
    kuychaco committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    1a56994 View commit details
    Browse the repository at this point in the history

  5. 🔥 unnecessary code

    @kuychaco
    kuychaco committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    77354a6 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. add a parse method for uncommittedChangesStrategyKind 

    useful for getting values out of local storage

Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @outofambit @kuychaco
    outofambit and kuychaco committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    fe21309 View commit details
    Browse the repository at this point in the history

  2. some docs for getUncommittedChangesStrategy 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @outofambit @kuychaco
    outofambit and kuychaco committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    f2aeb50 View commit details
    Browse the repository at this point in the history

  3. remove extra line 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @outofambit @kuychaco
    outofambit and kuychaco committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    09e954c View commit details
    Browse the repository at this point in the history

  4. hasChagnesAndStash --> couldOverwriteStash 

    Co-Authored-By: evelyn masso <outofambit@github.com>
    @kuychaco @outofambit
    kuychaco and outofambit committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    8cee164 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development' into ku-preferences-redesign

    @kuychaco
    kuychaco committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    6d70d14 View commit details
    Browse the repository at this point in the history

  6. lint

    @outofambit
    outofambit committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    564be7f View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/development' into ku-preferences… 

    …-redesign
    @outofambit
    outofambit committed Jan 15, 2020
    Configuration menu
    Copy the full SHA
    79dc0d4 View commit details
    Browse the repository at this point in the history