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

NEVER merge: Tracking changes on DEV branch #944

Draft
wants to merge 59 commits into
base: master
Choose a base branch
from
Draft

NEVER merge: Tracking changes on DEV branch #944

wants to merge 59 commits into from

Commits on Jul 11, 2023

  1. Update Dockerfile

    @matentzn
    matentzn committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    2aba940 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. Add new term request github issue template

    @matentzn
    matentzn committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    1d31572 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev

    @matentzn
    matentzn committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    46033d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    ea14c2a View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Re-enable the LightRDF-based RDF/XML check. 

    The ODK used to have a validation check that ensured that RDF/XML files
were valid. The check was based on LightRDF, whichwas fast enough to
make it possible to enable the check by default.

We had to disable that check because of a bug in LightRDF that caused
the library to sometimes fail to parse perfectly valid RDF/XML files
(#745). That bug has been fixed, so now we can re-enable the check by
default.

The check-rdfxml script is now invoked by default, and by default is
uses the fast LightRDF-based check. A new ODK option is added
(extra_rdfxml_checks): when enabled, it instructs the check-rdfxml
script to *also* perform the Jena- and RDFLib-based checks (which are
not enabled by default as they are more time-consuming).
    @gouttegd
    gouttegd committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    e19d7cb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #939 from INCATools/re-enable-lightrdf-based-check… 

    …-dev

Re-enable the LightRDF-based RDF/XML check.
    @gouttegd
    gouttegd authored Oct 5, 2023
    Configuration menu
    Copy the full SHA
    a6d7e0e View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    c468b44 View commit details
    Browse the repository at this point in the history

  2. Add ROBOT test version for OWL API 4.5.27

    @matentzn
    matentzn authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    5b237c3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into dev

    @matentzn
    matentzn committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    b44693c View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge branch 'per-command-resource-usage' into dev

    @matentzn
    matentzn committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    51d2ea7 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    70257a6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/re-enable-lightrdf-based-check' … 

    …into dev
    @matentzn
    matentzn committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    691e228 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    89cb2e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    57d2bd0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/fix-mirroring-pipeline' into dev

    @matentzn
    matentzn committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    390a20d View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    6488552 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. create ANNOTATION_PROPERTIES_ontid

    @anitacaron
    anitacaron committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    9ce8a08 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. loop annotation properties directly in robot remove command

    @anitacaron
    anitacaron committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    bbdc1f4 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    b386116 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    4765569 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/fix-runsh-return-code' into dev

    @matentzn
    matentzn committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    5b5ec3e View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. Merge branch 'master' into anitacaron/issue814

    Anita Caron authored Jan 29, 2024
    Configuration menu
    Copy the full SHA
    c14baeb View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    719755b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into anitacaron/issue814

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    decde8d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into add-new-term-template

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e99c538 View commit details
    Browse the repository at this point in the history

  4. Mistakenly removed a row during merge

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    003bc92 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    5e89dff View commit details
    Browse the repository at this point in the history

  6. Merge branch 'issue551-generate-custom-reports-during-release' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    3798a07 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'issue552-custom-robot-reports-check' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    bc186bc View commit details
    Browse the repository at this point in the history

  8. Merge branch 'issue647-inferred-axioms' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2ad43f2 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'add-new-term-template' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    bb16e04 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'rm-aps-merged-import' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4b79da2 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'anitacaron/issue814' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e7a32bd View commit details
    Browse the repository at this point in the history

  12. Update docker/odklite/Dockerfile

    @matentzn
    matentzn authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    46e4ac4 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'issue552-custom-robot-reports-check' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    6cf084c View commit details
    Browse the repository at this point in the history

  14. Fixed typo in download path to report_profile.txt

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    484c290 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'issue552-custom-robot-reports-check' into dev

    @matentzn
    matentzn committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    963bbd7 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Use @balhoff version of ROBOT

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    e157df5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    6668780 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'matentzn-patch-1' into dev

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    2b6d814 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into dev

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    4074a0d View commit details
    Browse the repository at this point in the history

  5. Update CHANGELOG.md

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    d03a518 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into dev

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    f352ffe View commit details
    Browse the repository at this point in the history

  7. Update CHANGELOG.md

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    efdee99 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'international-edition' into dev

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    e4ca80d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'international-edition' into dev

    @matentzn
    matentzn committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    016f63f View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    0681e6b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev

    @matentzn
    matentzn committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    2b91683 View commit details
    Browse the repository at this point in the history

  3. Revert some changes to master

    @matentzn
    matentzn committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    e479e74 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Merge branch 'master' into dev

    @matentzn
    matentzn committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    3b1eec0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev

    @matentzn
    matentzn committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    7229807 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into dev

    @matentzn
    matentzn committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    47b7f68 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into dev

    @matentzn
    matentzn committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    04668ae View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Merge branch 'base-merge-drop' into dev

    @matentzn
    matentzn committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    3c63180 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'last-fixes' into dev

    @matentzn
    matentzn committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    570ff96 View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @matentzn
    matentzn committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    3cdd08a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into dev

    @matentzn
    matentzn committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    b8d0fad View commit details
    Browse the repository at this point in the history

  5. Merge branch 'last-fixes' into dev

    @matentzn
    matentzn committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    481a807 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into dev

    @matentzn
    matentzn committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    3b95e0c View commit details
    Browse the repository at this point in the history