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

Preset field inheritance #5712

Merged
merged 6 commits into from
Jan 15, 2019
Merged

Preset field inheritance #5712

merged 6 commits into from
Jan 15, 2019

Commits on Jan 14, 2019

  1. Added mechanism for presets to inherit their fields and moreFields va… 

    …lues
    @quincylvania
    quincylvania committed Jan 14, 2019
    Configuration menu
    Copy the full SHA
    78853e1 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2019

  1. Moved field inheritance resolution from the data build to the preset … 

    …initialization

Removed the data build check for duplicate values between fields and moreFields
Renamed the shop field from Type to Shop Type
Renamed the beauty field from Shop Type to Beauty Specialty
Added the brand field to the shop preset under moreFields
    @quincylvania
    quincylvania committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    ae7c099 View commit details
    Browse the repository at this point in the history

  2. Added documentation for preset field inheritance behavior

    @quincylvania
    quincylvania committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    d1c4e22 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into preset-field-inheritance 

    # Conflicts:
#	data/presets/presets.json
    @quincylvania
    quincylvania committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    0da15ef View commit details
    Browse the repository at this point in the history

  4. Changed preset field inheritance to target specific presets rather th… 

    …an just the parent preset
    @quincylvania
    quincylvania committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    4b2c380 View commit details
    Browse the repository at this point in the history

  5. Presets no longer inherit fields for keys that define them

    @quincylvania
    quincylvania committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    4252c5c View commit details
    Browse the repository at this point in the history