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

WIP: Attempt to merge schemaorg master 2020-07-08 into BioChemEntity branch #9

Merged
merged 387 commits into from
Jul 31, 2020

Conversation

stain
Copy link

@stain stain commented Jul 8, 2020

See #8 and highlighted conflicts.

RichardWallis and others added 30 commits January 22, 2020 09:57
* Revert "Rationalise definitions of enumerations and enumeration values"

This reverts commit 97643b9.

* Revert "Tweaked tests and added new ones to cope withe enumeration and enumerationvalue rationalisation"

This reverts commit c3d581e.

Co-authored-by: Richard Wallis <rjw@dataliberate.com>
* Reinstated 301 redirect to https

* Fixed typo: Recommendation not Recommended.

* Add in tweaks to OPTIONS request response headers

* Drafting implementation of MediaReview for discussion. /cc #2450

* Updated mediaAuthenticityCategory label.

* Added disclaimer. /cc #2450

* updated so that label matches id.

* usageInfo and acquireLicensePage properties #2454

Co-authored-by: Richard Wallis <rjw@dataliberate.com>
* Add petsAllowed to ApartmentComplex
* Add petsAllowed, amenityFeature and floorSize to FloorPlan
* Create an explicit numberOfBedRooms and allow it in Accommodation, ApartmentComplex and FloorPlan.
* In ApartmentComplex and FloorPlan the value might be a range to allow describing all apartments under that entity, so the value should allow both Number and QuantitativeValue
* Add a "book a tour" (/tourBookingPage) property - url value allowed on Accommodation and ApartmentComplex
…pport cases where it is not clear the distinction between classroom-based and work-based programs. (#2461)

* Issue #2341: Added SportsTeam to the domain for gender.

* Remove file added to wrong branch.

* Issue #2460: Added properties to EducationalOccupationalProgram.
Update Gemfile.lock, fixes nokogiri warning.
Ensure schemorg.owl & sitemap.xml are built for all deploys
Fix schemaorg.owl missing from deploys
Fix to missing version file
danbri and others added 28 commits July 14, 2020 19:32
Trying the stale issue/PR tagger /cc @RichardWallis
Co-authored-by: Dataliberate <rjw@dataliberate.com>
…very and ParcelService (#2655)

Co-authored-by: Dataliberate <rjw@dataliberate.com>
We will at some point soon migrate this into core and/or pending sections
of the site.
Removed @en language tags for now.
This is consistent with our other files.

There is probably a case to make for tagging everything, but
for now let's get consistency.
* Simplified and expanded dump files and updated associated documentation.
Re: issue (#2304)

* Adjust all-lays copies to account for limited file builds (as in travis)

* Updated dump file names to schemaorg-current & schemaorg-all

* Updated to create http & https versions of dumpfiles.

* Modified name of dumpfile used to reflect changes

Co-authored-by: Dataliberate <rjw@dataliberate.com>
Moved call to buildTermConfig.sh to before running unit tests
Fix for issue #2657
@danbri danbri deleted the master branch July 23, 2020 13:08
@AlasdairGray AlasdairGray merged commit b55c958 into BioSchemas:BioChemEntity Jul 31, 2020
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.