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

update dev #79

Merged
merged 25 commits into from
Jul 8, 2024
Merged

update dev #79

merged 25 commits into from
Jul 8, 2024

Commits on Aug 4, 2023

  1. Merge pull request #69 from qbicsoftware/development 

    Prepare next version
    @wow-such-code
    wow-such-code authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    01c320f View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Set version to 1.15.0

    @JohnnyQ5
    JohnnyQ5 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    098b4df View commit details
    Browse the repository at this point in the history

  2. revert changes to new omero version as other parts are not ready

    @wow-such-code
    wow-such-code committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    a8d4ae1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #70 from qbicsoftware/release/set-version-to-1.15.0 

    Update version to 1.15.0
    @wow-such-code
    wow-such-code authored Aug 7, 2023
    Configuration menu
    Copy the full SHA
    d133e96 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into fix/revert-omero-update

    @wow-such-code
    wow-such-code authored Aug 7, 2023
    Configuration menu
    Copy the full SHA
    8e69c31 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #71 from qbicsoftware/fix/revert-omero-update 

    revert changes to new omero version as other parts are not ready
    @wow-such-code
    wow-such-code authored Aug 7, 2023
    Configuration menu
    Copy the full SHA
    cf1d40c View commit details
    Browse the repository at this point in the history

  6. Set version to 1.15.1

    @JohnnyQ5
    JohnnyQ5 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    7ad2e70 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge pull request #72 from qbicsoftware/release/set-version-to-1.15.1 

    Update version to 1.15.1
    @wow-such-code
    wow-such-code authored Aug 8, 2023
    Configuration menu
    Copy the full SHA
    64109c1 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Bump actions/checkout from 3 to 4 

    Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Sep 11, 2023
    Configuration menu
    Copy the full SHA
    8cf4799 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Revert "revert changes to new omero version as other parts are not re… 

    …ady"
    @wow-such-code
    wow-such-code authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    ac76071 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #74 from qbicsoftware/revert-71-fix/revert-omero-u… 

    …pdate

Revert "revert changes to new omero version as other parts are not ready"
    @wow-such-code
    wow-such-code authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    59f3577 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Bump actions/github-script from 6 to 7 

    Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    783a775 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Bump actions/setup-java from 3 to 4 

    Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    a698622 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. enable freetext for LCMS method in proteomics import

    @wow-such-code
    wow-such-code committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    bb1286e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/freetext-ms-method

    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    ec27e8e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #78 from qbicsoftware/feature/freetext-ms-method 

    enable freetext for LCMS method in proteomics import
    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    4e1118f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into dependabot/github_actions/actions/setup-java-4

    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3c79b76 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into dependabot/github_actions/actions/github-scr… 

    …ipt-7
    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5bcbeac View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into dependabot/github_actions/actions/checkout-4

    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7937e92 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #77 from qbicsoftware/dependabot/github_actions/ac… 

    …tions/setup-java-4

Bump actions/setup-java from 3 to 4
    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5f526de View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into dependabot/github_actions/actions/checkout-4

    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    1b73d27 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into dependabot/github_actions/actions/github-scr… 

    …ipt-7
    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    0273ec2 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #73 from qbicsoftware/dependabot/github_actions/ac… 

    …tions/checkout-4

Bump actions/checkout from 3 to 4
    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    4d77956 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into dependabot/github_actions/actions/github-scr… 

    …ipt-7
    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    c87b2d0 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #76 from qbicsoftware/dependabot/github_actions/ac… 

    …tions/github-script-7

Bump actions/github-script from 6 to 7
    @wow-such-code
    wow-such-code authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    72ad921 View commit details
    Browse the repository at this point in the history