Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d1e1a9e7f102
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f9d628d0987
Choose a head ref
  • 16 commits
  • 12 files changed
  • 4 contributors

Commits on Sep 22, 2020

  1. Migrate the gui-dev changes to a gui-new branch. 

    This was needed as master couldn't be merged into gui-dev cleanly due to the
submodule refactoring.
    @tarunik
    tarunik committed Sep 22, 2020
    Copy the full SHA
    47c74d3 View commit details

Commits on Sep 23, 2020

  1. Merge pull request #182 from tarunik/gui-dev-new 

    Migrate the gui-dev changes to a gui-dev-new branch.
    @azonenberg
    azonenberg authored Sep 23, 2020
    Copy the full SHA
    e45482d View commit details

Commits on Oct 8, 2020

  1. Node base for preference tree

    nshcat committed Oct 8, 2020
    Copy the full SHA
    0fd9c93 View commit details

  2. More work on the preference tree

    @nshcat
    nshcat committed Oct 8, 2020
    Copy the full SHA
    0986def View commit details

  3. Implemented To/From YAML for pref tree

    @nshcat
    nshcat committed Oct 8, 2020
    Copy the full SHA
    5496e4e View commit details

  4. Preference tree construction methods

    @nshcat
    nshcat committed Oct 8, 2020
    Copy the full SHA
    2fc3b45 View commit details

  5. PreferenceManager adjustments

    @nshcat
    nshcat committed Oct 8, 2020
    Copy the full SHA
    50f7a51 View commit details

Commits on Oct 9, 2020

  1. Fixed compiler errors (didnt have a compiler at hand yesterday)

    @nshcat
    nshcat committed Oct 9, 2020
    Copy the full SHA
    31cbedd View commit details

  2. Made property tree ready to be used in preference GUI

    @nshcat
    nshcat committed Oct 9, 2020
    Copy the full SHA
    4b71121 View commit details

Commits on Oct 25, 2020

  1. Finished preference dialog

    @nshcat
    nshcat committed Oct 25, 2020
    Copy the full SHA
    72f902f View commit details

Commits on Oct 26, 2020

  1. Merge branch 'master' into gui-dev-new

    @azonenberg
    azonenberg authored Oct 26, 2020
    Copy the full SHA
    f1bbee7 View commit details

  2. Fixed windows build errors

    @nshcat
    nshcat committed Oct 26, 2020
    Copy the full SHA
    23db3a7 View commit details

  3. Merge branch 'gui-dev-new' of github.com:azonenberg/scopehal-apps int… 

    …o gui-dev-new
    @nshcat
    nshcat committed Oct 26, 2020
    Copy the full SHA
    984f1b3 View commit details

Commits on Oct 27, 2020

  1. More windows wchar_t related fixes

    @nshcat
    nshcat committed Oct 27, 2020
    Copy the full SHA
    2d8cd77 View commit details

  2. More windows fixes

    @nshcat
    nshcat committed Oct 27, 2020
    Copy the full SHA
    b742674 View commit details

  3. Merge pull request #252 from azonenberg/gui-dev-new 

    Implemented Preferences System
    @azonenberg
    azonenberg authored Oct 27, 2020
    Copy the full SHA
    7f9d628 View commit details
Loading