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

Correct so branches are only MAJOR versions + Develop #165

Merged
merged 107 commits into from
Oct 12, 2020
Merged

Conversation

cookeac
Copy link
Collaborator

@cookeac cookeac commented Oct 12, 2020

So merging ADE-1-1 into branch ADE-1

erwinspeybroeck and others added 30 commits June 22, 2020 16:20
Corrrected case in enumerations to address #61
…Type.json

Base makes sense in the context of a Breeding Value, but when looking at ICAR specs in general, it is not clear what icarBaseIdentifierType represents. Renamed to icarBVBaseIdentifierType.
Changed base file from icarBaseIdentifierType.json to icarBVBaseIdentifierType.json
Corrected description of calculationType enumeration.
removed redoc since it does not work anymore with current spec
Update from adewg\ICAR\Develop
cookeac and others added 25 commits August 27, 2020 19:22
Corrected linting errors and file names
Add DoNotBreed to Repro status
zorgen dat ik weer bij ben
organised the API's in sections
Get URL Scheme updates from Develop
Add observation events for animal status - lactation and reproduction status
Merge from Develop to ADE-1-1
Hotfix: Remove oneOf: allow both courses and treatments
@cookeac cookeac requested review from ahokkonen and alamers October 12, 2020 00:42
@ahokkonen
Copy link
Contributor

All good

@ahokkonen ahokkonen merged commit eaf2657 into ADE-1 Oct 12, 2020
@cookeac cookeac deleted the ADE-1-1 branch October 12, 2020 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants