Skip to content

Merge develop into release/15.0.0#1452

Closed
stevenchalem wants to merge 189 commits into
release/15.0.0from
develop
Closed

Merge develop into release/15.0.0#1452
stevenchalem wants to merge 189 commits into
release/15.0.0from
develop

Conversation

@stevenchalem

@stevenchalem stevenchalem commented Apr 23, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Replaced by #1453

Brings release/15.0.0 up to date with changes made for release 14.1.0.

Jamie-SA and others added 30 commits October 22, 2025 14:25
Have pre-commit fail on default prefixes
eb15446
Rename files
427767f
@Jamie-SA
Merge branch 'develop' into 898-handle-default-prefixes
c2a63ce
Fix code comment
e5989c9
Merge 'origin/develop'
433436c
Merge 'origin/898-handle-default-prefixes'
001471a
Remove default prefix
b66cb08
@stevenchalem
test hook
cd2cc13
@stevenchalem
hook test
e5d6068
Add release note.
bcc3974
Add release note.
2797780
@rjyounes
Update pre-commit to verify itself
53c9e01
@rjyounes
Add release note
4320ed9
@Jamie-SA @rjyounes
Update docs/release_notes/898-remove-default-prefix
997eaad 
Co-authored-by: Rebecca Younes <rebecca.younes@semanticarts.com>
Reverting some changes
2ba471c 
This reverts commit 2797780.
Remove wrong release note
1f735d3
@Jamie-SA
Merge branch 'develop' into 898-handle-default-prefixes
0c088a6
Remove accidentally merged branch
a31296b
Merge github changes
630ac12
@stevenchalem
Merge branch '898-handle-default-prefixes' of https://github.com/sema…
1d23091 
…nticarts/gist into 898-handle-default-prefixes
@stevenchalem
commit change to gistCore.ttl
008060d
Remove default prefix again
933b4b2
@rjyounes
Refactor pre-commit hook
cf2dc5b
@rjyounes
Update release note
616fb9c
@rjyounes
Remove core.filemode false setting
904368f
@stevenchalem @rjyounes
Apply suggestion from @rjyounes
0b726c7 
don't bundle Contributing.md

Co-authored-by: Rebecca Younes <rebecca.younes@semanticarts.com>
@stevenchalem
Merge pull request #1331 from semanticarts/issue-1327-format-code-block
a7c8fb5 
Fix code block formatting
@rjyounes
Merge pull request #1330 from semanticarts/release/14.0.0
ac01557 
Merge Release/14.0.0 into Main
@rjyounes
Merge pull request #1340 from semanticarts/issue-1327-fix-readme
6ab80c1 
Merge `issue-1327-fix-readme` into `main`
@Jamie-SA
Merge branch 'develop' into 898-handle-default-prefixes
a294254
irinafilitovich and others added 21 commits April 14, 2026 17:39
@irinafilitovich @rjyounes
Update docs/release_notes/1404-update-definition-of-gistspecification.md
9e29c3d 
Co-authored-by: Rebecca Younes <rebecca.younes@semanticarts.com>
@irinafilitovich @rjyounes
Update skos:example for gist:Specification - Pharma example
4f3e2f8
@irinafilitovich @rjyounes
Update definition of gist:Specification
aaba019
@stevenchalem
Merge branch 'develop' into stevenchalem/1349-expand-README
507bcf9
@stevenchalem
clarify namespaces section of README
119b6fd
@rjyounes
Merge pull request #1424 from semanticarts/stevenchalem/1349-expand-R…
349d53f 
…EADME

Expand README.md
@stevenchalem @rjyounes
add annotation and add release note
ea911b3
@rjyounes
Apply suggestion from @rjyounes
a416c8b
@rjyounes
Apply suggestion from @rjyounes
5723075
@stevenchalem @rjyounes
remove chmod statements from setup.cmd
0512e66
@stevenchalem @rjyounes
compile release notes
28576fb
@stevenchalem @rjyounes
updates per review
3ad2a15
@stevenchalem @rjyounes
add history note
8a76f9c
@stevenchalem @rjyounes
modify README to remove links to non-bundled docs
81bbb97
@coltonglasgow @rjyounes
Fixed links in markdown and HTML during bundling process
f21ec96
@coltonglasgow @rjyounes
Uncommented validation during bundling
cf4978b
@coltonglasgow @rjyounes
Corrected issues with release notes in bundle file
1d5b79b
@coltonglasgow @rjyounes
Updated migration links in release notes when bundling
b788114
@stevenchalem @rjyounes
change release date to 2026-Apr-17
edb0779
@coltonglasgow @rjyounes
Corrected migration link in README when bundling
3bf2f2c
@rjyounes
Merge pull request #1448 from semanticarts/release/14.1.0
c73068b 
Merge Release/14.1.0 into main
@stevenchalem stevenchalem requested a review from rjyounes April 23, 2026 22:37
@stevenchalem stevenchalem mentioned this pull request Apr 24, 2026
Closed
@stevenchalem stevenchalem reopened this Apr 24, 2026
@stevenchalem

stevenchalem commented Apr 24, 2026

Copy link
Copy Markdown
Contributor Author

I can't resolve these conflicts myself due to branch permissions. Both conflicts are in ontologies/gistCore.ttl and are explained by release notes already on release/15.0.0:

Conflict 1 — gist:Determination
Keep release/15.0.0's rdfs:subClassOf gist:Task and "activity…" definition (per release note #1260 — "Made gist:Determination a direct subclass of gist:Task rather than of gist:Event"). Take develop's "sulfur" spelling in the example.

Conflict 2 — gist:containedText
Keep both sides: release/15.0.0's rdfs:range rdf:PlainLiteral (per release note #1302 — "Set ranges of gist:containedText… to rdf:PlainLiteral") AND develop's refined skos:definition ("Relates an entity containing textual information to the string constituting that textual information."). The two changes aren't semantically conflicting — they just happened to land on adjacent lines.

@stevenchalem stevenchalem mentioned this pull request Apr 24, 2026
Closed
@rjyounes

rjyounes commented Apr 27, 2026

Copy link
Copy Markdown
Collaborator

Closing - replaced by #1453.

@rjyounes rjyounes closed this Apr 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rjyounes rjyounes rjyounes approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.