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 dev into stable #804

Merged
merged 35 commits into from
Nov 19, 2024
Merged

Merge dev into stable #804

merged 35 commits into from
Nov 19, 2024

Conversation

henrietteharmse
Copy link
Collaborator

No description provided.

henrietteharmse and others added 30 commits October 4, 2024 10:39
@henrietteharmse
Renamed base_uri to baseUri and ensured it is an array.
f0da38d
@henrietteharmse
Definition is now using DefinedFields and is of type array.
8814713
@henrietteharmse
DefinedBy is now using DefinedFields.
837a4ce
@henrietteharmse
AppearsIn is now using DefinedFields.
3dff062
@henrietteharmse
DirectAncestor is now using DefinedFields and is an array.
57b4561
@henrietteharmse
DirectParent is now using DefinedFields and is an array.
d3dba46
@henrietteharmse
ImportsFrom and exportsTo are now using DefinedFields.
3e60d05
@henrietteharmse
Renamed hasPreferredRoots to preferredRoot. Is now using DefinedField…
ff9b824 
…s and is an array.
@henrietteharmse
hierarchicalParent and hierarchicalAncestor are now arrays and Define…
5379b2c 
…dFields. Made use of generic PropertyValueList instead of PropertyValueStringList.java and PropertyValueUriList.java.
@henrietteharmse
Label is now an array and a DefinedField.
e5ecfbf
@henrietteharmse
Language is now an array and a DefinedField.
98578da
@henrietteharmse
relatedTo and relatedFrom are now arrays and DefinedFields. Cleaned u…
270b92b 
…p unused method parameters.
@henrietteharmse
synonym is now an array and DefinedField.
c89233e
@henrietteharmse
Merge branch 'dev' of github.com:EBISPOT/ols4 into v2-api-inconsisten…
6d5949e 
…cies-arrays

# Conflicts:
#	backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SearchController.java
@henrietteharmse
Merged with dev.
1b0a67d
@henrietteharmse
Improved error message.
be73bab
@henrietteharmse
Fixed type issues.
a1e956d
@henrietteharmse
Added fobi.
1621775
@haideriqbal
Update cardinality handling
f5c8976
@bherr2
Update HRA and CCF ontology information
b2f8b1f
@haideriqbal
Update handling of data properties and oneOf
05b6297
@jamesamcl
Merge pull request #780 from bherr2/patch-1
3783d98 
Update HRA and CCF ontology information
@henrietteharmse
Added BaseUri test.
3e2c9de
@henrietteharmse
Merged again with dev
987d91f
@henrietteharmse
Fixed definedBy issue and made oio available locally.
7fdbe90
@henrietteharmse
Fixed baseUri issue.
d028624
@henrietteharmse
TESTCASES updated
b90e5fb
@henrietteharmse
Updated README wrt testing.
a80c979
@henrietteharmse
API TESTS updated
cdc3842
@haideriqbal
Update exact synonym on frontend
893de15
haideriqbal and others added 5 commits November 11, 2024 13:22
@haideriqbal
Update synonym display on frontend
3d7c3eb
@haideriqbal
Simplify code logic
7d22f87
@haideriqbal
Merge pull request #796 from EBISPOT/fix-exact-synonym-issue
b85e4c1 
Update exact synonym display on frontend
@haideriqbal
Merge pull request #778 from EBISPOT/fix-cardinality-issue
da4c9f8 
Update cardinality handling
@henrietteharmse
Merge pull request #795 from EBISPOT/v2-api-inconsistencies-arrays-ap…
27a4cbf 
…i-tests

Merge V2 api inconsistencies arrays changes with testcases and api tests into dev
@henrietteharmse henrietteharmse merged commit 6a0ef76 into stable Nov 19, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@henrietteharmse @haideriqbal @bherr2 @jamesamcl