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

Pyqtgraph replacement in webgl upgrade #1636

Merged
merged 9 commits into from
Jul 5, 2024
Merged

Pyqtgraph replacement in webgl upgrade #1636

merged 9 commits into from
Jul 5, 2024

Commits on Jul 4, 2024

  1. open in webbrowser from dist

    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    46d129a View commit details
    Browse the repository at this point in the history

  2. now works with copy node_modules instead of npm install that required… 

    … internet connection
    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    827be3d View commit details
    Browse the repository at this point in the history

  3. removed package-lock.json

    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    4e87a60 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'pyqtgraph-replacement-in-webgl-upgrade' of https://gith… 

    …ub.com/theogutt/McStas3D into webgl-upgrade

# Conflicts:
#	tools/Python/mcdisplay/webgl/package-lock.json
    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    cb8e845 View commit details
    Browse the repository at this point in the history

  5. removed dist from gitignore

    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    e01aa41 View commit details
    Browse the repository at this point in the history

  6. commit node_modules dist

    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    8801439 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/pyqtgraph-replacement-in-webgl-u… 

    …pgrade' into pyqtgraph-replacement-in-webgl-upgrade

# Conflicts:
#	tools/Python/mcdisplay/webgl/node_modules/rollup/dist/bin/rollup
    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    05879e1 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'refs/remotes/origin/webgl-upgrade' into… 

    … pyqtgraph-replacement-in-webgl-upgrade

# Conflicts:
#	tools/Python/mcdisplay/webgl/dist/index.html
    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    1d95c00 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'pyqtgraph-replacement-in-webgl-upgrade' of https://gith… 

    …ub.com/theogutt/McStas3D into pyqtgraph-replacement-in-webgl-upgrade
    @theogutt
    theogutt committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    6ba8cf5 View commit details
    Browse the repository at this point in the history