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: diffpy/diffpy.srxplanar
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: diffpy/diffpy.srxplanar
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: nonGPL
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 24, 2014

  1. avoid importing fabio in reading

    @XiaohaoYang
    XiaohaoYang committed Oct 24, 2014
    Configuration menu
    Copy the full SHA
    124d86b View commit details
    Browse the repository at this point in the history

  2. terminate subprocess after loading image

    @XiaohaoYang
    XiaohaoYang committed Oct 24, 2014
    Configuration menu
    Copy the full SHA
    8a29a04 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2014

  1. add .txt format support

    @XiaohaoYang
    XiaohaoYang committed Oct 25, 2014
    Configuration menu
    Copy the full SHA
    c05c109 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2014

  1. add dm3 support

    @XiaohaoYang
    XiaohaoYang committed Nov 8, 2014
    Configuration menu
    Copy the full SHA
    1671767 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2014

  1. bug fix: loading tiff data with 3 dimensions

    @XiaohaoYang
    XiaohaoYang committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    02cf4b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2015

  1. Merge branch 'develop' into nonGPL

    @XiaohaoYang
    XiaohaoYang committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    c42bb9a View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. Merge branch 'develop' into nonGPL 

    Conflicts:
	diffpy/srxplanar/loadimage.py
    @XiaohaoYang
    XiaohaoYang committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    6367652 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into nonGPL 

    Conflicts:
	diffpy/srxplanar/loadimage.py
    @XiaohaoYang
    XiaohaoYang committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    f98403f View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2015

  1. Merge branch 'develop' into nonGPL

    @XiaohaoYang
    XiaohaoYang committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    10b66e7 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2015

  1. Merge branch 'develop' into nonGPL

    @XiaohaoYang
    XiaohaoYang committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    242f04a View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Merge branch 'develop' into nonGPL 

    Conflicts:
	diffpy/srxplanar/loadimage.py
    xyang committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    1118c54 View commit details
    Browse the repository at this point in the history
Loading