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

Merge branch 'dev_release' into 'master' (v1.1.1) #53

Merged
merged 12 commits into from
Aug 10, 2021
Merged

Merge branch 'dev_release' into 'master' (v1.1.1) #53

merged 12 commits into from
Aug 10, 2021

Commits on Jul 16, 2021

  1. GitLab version.

    j.schoenau committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    7d717b6 View commit details
    Browse the repository at this point in the history

  2. Updated change log

    j.schoenau committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    9ea1797 View commit details
    Browse the repository at this point in the history

  3. Redo copy

    j.schoenau committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    c9e80f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2021

  1. Delete testperiods_predefClusterOrder.csv

    @OfficialCodexplosive
    OfficialCodexplosive committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    8e89cef View commit details
    Browse the repository at this point in the history

  2. Delete testperiods_predefClusterOrderAndClusterCenters.csv

    @OfficialCodexplosive
    OfficialCodexplosive committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    b70de1d View commit details
    Browse the repository at this point in the history

  3. Replace /examples/results files with older versions

    @OfficialCodexplosive
    OfficialCodexplosive committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    99000e3 View commit details
    Browse the repository at this point in the history

  4. Delete testperiods_predefClusterOrder.csv

    @OfficialCodexplosive
    OfficialCodexplosive committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    1824266 View commit details
    Browse the repository at this point in the history

  5. Delete testperiods_predefClusterOrderAndClusterCenters.csv

    @OfficialCodexplosive
    OfficialCodexplosive committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    328a234 View commit details
    Browse the repository at this point in the history

  6. Use results from jugit

    @OfficialCodexplosive
    OfficialCodexplosive committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    d33c6a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2021

  1. Copy of develop branch on jugit: Fix cluster-order test

    j.schoenau committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    fbfeb42 View commit details
    Browse the repository at this point in the history

  2. Update news documentation.

    j.schoenau committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    3406d54 View commit details
    Browse the repository at this point in the history

  3. Update setup.py for PyPI and docs/source/conf.py for readTheDocs

    j.schoenau committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    bdda748 View commit details
    Browse the repository at this point in the history