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

More work on BeerJSON #79

Merged
merged 81 commits into from
Mar 31, 2024
Merged

More work on BeerJSON #79

merged 81 commits into from
Mar 31, 2024

Commits on May 28, 2023

  1. Correction to macro name

    Matt Young committed May 28, 2023
    Configuration menu
    Copy the full SHA
    2697c14 View commit details
    Browse the repository at this point in the history

  2. Make Hop::Use optional, plus tidy-up

    Matt Young committed May 28, 2023
    Configuration menu
    Copy the full SHA
    d2e2b82 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. First steps on adding BeerJSON support for Yeast

    Matt Young committed May 29, 2023
    Configuration menu
    Copy the full SHA
    8fe65fa View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Progress on adding BeerJSON support to Yeast

    Matt Young committed May 31, 2023
    Configuration menu
    Copy the full SHA
    0ef0167 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. BeerJSON for Yeast - done

    Matt Young committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    3ea3341 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Tidy up, in particular of Water and Salt

    Matt Young committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    7d2a527 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2023

  1. Tidy up Equipment, plus Mac build fix

    Matt Young committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    ed451b8 View commit details
    Browse the repository at this point in the history

  2. Tidy up

    Matt Young committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    77a92f9 View commit details
    Browse the repository at this point in the history

  3. Tidy up including BeerXML optional Style fields

    Matt Young committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    1b25b5c View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. StyleTableModel (still needs some work) plus refactoring

    Matt Young committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    00c858b View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Bug fixes, tidy up, add new Style fields to style editor

    Matt Young committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    0b66240 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Tidy up

    Matt Young committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    f7090f3 View commit details
    Browse the repository at this point in the history

  2. Remove unused signals from Equipment

    Matt Young committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    12cad36 View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary Equipment signals; tidy-up

    Matt Young committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    1d48b6f View commit details
    Browse the repository at this point in the history

  4. Incorrect handling of SingleUnitValue and Date in JSON import

    Matt Young committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    b5fb66b View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Extend JsonXPath to deal with Named array item identifiers

    Matt Young committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    fcd8eb5 View commit details
    Browse the repository at this point in the history

  2. Tidy up

    Matt Young committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    0529078 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2023

  1. Start on Equipment work for BeerJSON, including a bit more weights an… 

    …d measures
    Matt Young committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    ca0d3ab View commit details
    Browse the repository at this point in the history

  2. More on BeerJSON for Equipment

    Matt Young committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    2abb428 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Progress on EquipmentEditor, including introduction of InfoButton & I… 

    …nfoText. Still a way to go.
    Matt Young committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    f0aaaac View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2023

  1. Equipment Editor pretty much there

    Matt Young committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    ca5e176 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Tidy up list model classes, including to remove duplicate/similar cod… 

    …e. Still have other start-up bugs to fix though.
    Matt Young committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    51ad8e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Fix start-up crash

    Matt Young committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    9df8344 View commit details
    Browse the repository at this point in the history

  2. Build fixes for Mac and Old Ubuntu

    Matt Young committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    6a7c35a View commit details
    Browse the repository at this point in the history

  3. More build fixes

    Matt Young committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    e4fcc1f View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Starting work on MashStep for BeerJSON

    Matt Young committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    fce1582 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2023

  1. More on MashStep editor plus fix Measurement regex problems

    Matt Young committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    8bf39b5 View commit details
    Browse the repository at this point in the history

  2. Finish changes to mash step editor

    Matt Young committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    7a0e65a View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2023

  1. Make certain fields optional on Mash

    Matt Young committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    66f483b View commit details
    Browse the repository at this point in the history

  2. Progress on JSON child records; make a start on Recipe support for Be… 

    …erJSON
    Matt Young committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    373f4e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. A bit more work on Recipe support of BeerJSON

    Matt Young committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    f7a2dd8 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. Continue with Recipe BeerJSON support - Boil, BoilStep, Fermentation,… 

    … FermentationStep
    Matt Young committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    1acf2e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Still not compiling, but we are getting there...

    Matt Young committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2fd0068 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. It compiles, but does not yet run. Need to debug.

    Matt Young committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    79fa149 View commit details
    Browse the repository at this point in the history

  2. More type safety on constructors

    Matt Young committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    ebe55bb View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Tidy up a bit more. Still various hop addition bugs to fix.

    Matt Young committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    8058afd View commit details
    Browse the repository at this point in the history

  2. Build fixes

    Matt Young committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    9ca76b5 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. More fixes, though still crashing when you try to edit hop addition t… 

    …imes
    Matt Young committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    bd9b7cd View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Fix table ordering problem on edit

    Matt Young committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    ff2132f View commit details
    Browse the repository at this point in the history

  2. Build fix

    Matt Young committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    8e06b50 View commit details
    Browse the repository at this point in the history

  3. Fixes for editing Hop inside RecipeAdditionHop - probably need some m… 

    …ore work on UI tho
    Matt Young committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    ba7af91 View commit details
    Browse the repository at this point in the history

  4. Build fix

    Matt Young committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    18c7bb7 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. Inventory fixes etc

    Matt Young committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    b9c647b View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Getting closer

    Matt Young committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    fde05ac View commit details
    Browse the repository at this point in the history

  2. Now showing raw numbers for RecipeAdditionHop amounts. Need to do uni… 

    …ts and formatting.
    Matt Young committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    52c754a View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Showing correct amounts for RecipeAdditionHop, but not yet accepting … 

    …edits
    Matt Young committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    3b3df93 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. RecipeAdditionHop now seems working. Need to work on Inventory.

    Matt Young committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    92f174e View commit details
    Browse the repository at this point in the history

  2. Remove RecipeAdditionMassOrVolume, as no longer needed

    Matt Young committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    c1988de View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Progress on hop inventory. Still need to do UI.

    Matt Young committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    d8818f9 View commit details
    Browse the repository at this point in the history

  2. Fix unit tests for inventory

    Matt Young committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    17d06a8 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Build fixes

    Matt Young committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    cd90cdc View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Fixes for unit tests

    Matt Young committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    6b5fff3 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Simple UI for inventory

    Matt Young committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    745169c View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Amount Type column now working in RecipeAdditionHopTableModel

    Matt Young committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    436c0cb View commit details
    Browse the repository at this point in the history

  2. Inventory restored to HopTableModel

    Matt Young committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    4830fb3 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Minor fixes

    Matt Young committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    d3423e2 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. It compiles...

    Matt Young committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    dee6437 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. Hop Additions seems working. Plus Mac build fix. Plus fix for Brewtar… 

    …get/brewtarget#780
    Matt Young committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    9308c44 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2023

  1. First stab at RecipeAdditionFermentable etc

    Matt Young committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    25c84b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Check-in progress

    Matt Young committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    4990e3f View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

  1. Compiles but does not link

    Matt Young committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    7f76e79 View commit details
    Browse the repository at this point in the history

  2. Links but tests fail

    Matt Young committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    03059f4 View commit details
    Browse the repository at this point in the history

  3. Tests pass

    Matt Young committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    a842e75 View commit details
    Browse the repository at this point in the history

  4. Starts up without barfing

    Matt Young committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    8ee547d View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Before big edit

    Matt Young committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    69d16b6 View commit details
    Browse the repository at this point in the history

  2. After big search-and-replace

    Matt Young committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0021eb3 View commit details
    Browse the repository at this point in the history

  3. After big search-and-replace

    Matt Young committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e9d2f0b View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Compiles but does not link

    Matt Young committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    e075982 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. Compiles and links again

    Matt Young committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    0eba82c View commit details
    Browse the repository at this point in the history

  2. Tests pass

    Matt Young committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    35be2de View commit details
    Browse the repository at this point in the history

  3. Starts up but still buggy

    Matt Young committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    1ba84de View commit details
    Browse the repository at this point in the history

  4. XML import working on a couple of test files

    Matt Young committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    f2a0a66 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. Before bulk edit

    Matt Young committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    f4a9fc3 View commit details
    Browse the repository at this point in the history

  2. It compiles and runs, but still needs some work on BeerJson schema etc

    Matt Young committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    43c4ab1 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. More progress on fixing Recipe BeerJSON round-trip bugs

    Matt Young committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    aeb5c02 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Compiles but does not link

    Matt Young committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    b64808a View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Compiles and links

    Matt Young committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    833d04a View commit details
    Browse the repository at this point in the history

  2. Unit tests pass

    Matt Young committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    bed3ed8 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. Not crashing but still some bugs to fix

    Matt Young committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    e8fe7c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. Fixed one bug but created another. Need to look at equality tests of … 

    …RecipeAdditions. Getting there.
    Matt Young committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    60c6747 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. Broadly working

    Matt Young committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    2d024b7 View commit details
    Browse the repository at this point in the history