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.

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

NEVER merge: Tracking changes on DEV branch #944

Draft
wants to merge 59 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
2aba940
Update Dockerfile
matentzn Jul 11, 2023
1d31572
Add new term request github issue template
matentzn Jul 15, 2023
46033d0
Merge branch 'master' into dev
matentzn Jul 15, 2023
ea14c2a
Merge branch 'master' into dev
matentzn Jul 17, 2023
e19d7cb
Re-enable the LightRDF-based RDF/XML check.
gouttegd Sep 26, 2023
a6d7e0e
Merge pull request #939 from INCATools/re-enable-lightrdf-based-check…
gouttegd Oct 5, 2023
c468b44
Merge branch 'master' into dev
matentzn Oct 19, 2023
5b237c3
Add ROBOT test version for OWL API 4.5.27
matentzn Oct 19, 2023
b44693c
Merge branch 'master' into dev
matentzn Oct 19, 2023
51d2ea7
Merge branch 'per-command-resource-usage' into dev
matentzn Oct 24, 2023
70257a6
Merge branch 'master' into dev
matentzn Nov 23, 2023
691e228
Merge remote-tracking branch 'origin/re-enable-lightrdf-based-check' …
matentzn Nov 23, 2023
89cb2e2
Merge branch 'master' into dev
matentzn Dec 6, 2023
57d2bd0
Merge branch 'master' into dev
matentzn Dec 21, 2023
390a20d
Merge remote-tracking branch 'origin/fix-mirroring-pipeline' into dev
matentzn Dec 21, 2023
6488552
Merge branch 'master' into dev
matentzn Jan 2, 2024
9ce8a08
create `ANNOTATION_PROPERTIES_ontid`
anitacaron Jan 3, 2024
bbdc1f4
loop annotation properties directly in robot remove command
anitacaron Jan 4, 2024
b386116
Merge branch 'master' into dev
matentzn Jan 5, 2024
4765569
Merge branch 'master' into dev
matentzn Jan 20, 2024
5b5ec3e
Merge remote-tracking branch 'origin/fix-runsh-return-code' into dev
matentzn Jan 20, 2024
c14baeb
Merge branch 'master' into anitacaron/issue814
Jan 29, 2024
719755b
Merge branch 'master' into dev
matentzn Feb 24, 2024
decde8d
Merge branch 'master' into anitacaron/issue814
matentzn Feb 24, 2024
e99c538
Merge branch 'master' into add-new-term-template
matentzn Feb 24, 2024
003bc92
Mistakenly removed a row during merge
matentzn Feb 24, 2024
5e89dff
Merge branch 'master' into dev
matentzn Feb 24, 2024
3798a07
Merge branch 'issue551-generate-custom-reports-during-release' into dev
matentzn Feb 24, 2024
bc186bc
Merge branch 'issue552-custom-robot-reports-check' into dev
matentzn Feb 24, 2024
2ad43f2
Merge branch 'issue647-inferred-axioms' into dev
matentzn Feb 24, 2024
bb16e04
Merge branch 'add-new-term-template' into dev
matentzn Feb 24, 2024
4b79da2
Merge branch 'rm-aps-merged-import' into dev
matentzn Feb 24, 2024
e7a32bd
Merge branch 'anitacaron/issue814' into dev
matentzn Feb 24, 2024
46e4ac4
Update docker/odklite/Dockerfile
matentzn Feb 24, 2024
6cf084c
Merge branch 'issue552-custom-robot-reports-check' into dev
matentzn Feb 24, 2024
484c290
Fixed typo in download path to report_profile.txt
matentzn Feb 24, 2024
963bbd7
Merge branch 'issue552-custom-robot-reports-check' into dev
matentzn Feb 24, 2024
e157df5
Use @balhoff version of ROBOT
matentzn Feb 25, 2024
6668780
Merge branch 'master' into dev
matentzn Feb 25, 2024
2b6d814
Merge branch 'matentzn-patch-1' into dev
matentzn Feb 25, 2024
4074a0d
Merge branch 'master' into dev
matentzn Feb 25, 2024
d03a518
Update CHANGELOG.md
matentzn Feb 25, 2024
f352ffe
Merge branch 'master' into dev
matentzn Feb 25, 2024
efdee99
Update CHANGELOG.md
matentzn Feb 25, 2024
e4ca80d
Merge branch 'international-edition' into dev
matentzn Feb 25, 2024
016f63f
Merge branch 'international-edition' into dev
matentzn Feb 25, 2024
0681e6b
Merge branch 'master' into dev
matentzn Feb 29, 2024
2b91683
Merge branch 'master' into dev
matentzn Feb 29, 2024
e479e74
Revert some changes to master
matentzn Feb 29, 2024
3b1eec0
Merge branch 'master' into dev
matentzn Mar 1, 2024
7229807
Merge branch 'master' into dev
matentzn Mar 1, 2024
47b7f68
Merge branch 'master' into dev
matentzn Mar 1, 2024
04668ae
Merge branch 'master' into dev
matentzn Mar 1, 2024
3c63180
Merge branch 'base-merge-drop' into dev
matentzn Mar 2, 2024
570ff96
Merge branch 'last-fixes' into dev
matentzn Mar 2, 2024
3cdd08a
Update CHANGELOG.md
matentzn Mar 2, 2024
b8d0fad
Merge branch 'master' into dev
matentzn Mar 2, 2024
481a807
Merge branch 'last-fixes' into dev
matentzn Mar 2, 2024
3b95e0c
Merge branch 'master' into dev
matentzn Mar 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.