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

Merge 1.1-dev into 1.2-dev #1355

Closed
wants to merge 405 commits into from
Closed

Merge 1.1-dev into 1.2-dev #1355

wants to merge 405 commits into from

Conversation

jpmckinney
Copy link
Member

  • Recommendation to put hyphen after OCID prefix
  • Clarify role of publisher and definition of publisher name Clarify role of publisher and definition of publisher name #420
  • Edited the description of tender.procuringEntity Edit tender.procuringEntity description #571
  • Edit the description of procuringEntity in party role codelist Edit tender.procuringEntity description #571
  • Strengthen some normative statements in schema Strengthen some normative statements in schema #868
  • Preference for string over integer identifiers
  • Clarify uniqueness of Organization.id
  • Add guidance on populating Organization.id for parties without an organization identifier
  • add PR link to changelog
  • add link to guidance
  • fix broken links
  • Update changelog
  • Update docs/history/changelog.md
  • Replace 'schema' with 'data'
  • Replace 'schema' with 'data'
  • clarify consistency of Organization.id across releases
  • Fix description of awardCriteriaDetails (remove 'selection) Fix description of awardCriteriaDetails #1071
  • Ran util/make_dereferenced_release_schema.py
  • Updated changelog
  • Updated changelog
  • Update docs about multiple suppliers per award
  • Update changelog
  • Ran util/make_dereferenced_release_schema.py
  • Updated changelog
  • Strengthen normative statements in the definition of organization.id Strengthen some normative statements in schema #868
  • Ran util/make_dereferenced_release_schema.py
  • Active => passive voice
  • Ran util/make_dereferenced_release_schema.py
  • Updated ocid description in the schema
  • Ran util/make_dereferenced_release_schema.py
  • Update docs/history/changelog.md
  • Detailed changelog
  • Typo
  • Update docs/schema/identifiers.md
  • Update schema/dereferenced-release-schema.json
  • changelog: Copy-edit
  • tests: Remove unused environment variables from conftest.py
  • Added 'weight' to Item/unit
  • Update changelog
  • Update schema/release-schema.json
  • Update item.weight properties
  • Update dereferenced release schema
  • Update dereferenced release schema
  • Update versioned release schema with item weight
  • Update item.weight definition, add SimpleUnit
  • Apply suggestions from code review
  • Remove patternProperties from SimpleUnit
  • Add changelog for Clarify role of publisher and definition of publisher name #1067
  • Remove framework agreement related sentence from Contract section
  • Add changelog entry
  • Update changelog entry
  • Change recommendation for unknown time component
  • Add changelog entry for unknown time component recommendation
  • Procuring entity may => should be different from the buyer Edit tender.procuringEntity description #571
  • Updated the code description, and removed quotes
  • procurement process => contracting process Edit tender.procuringEntity description #571
  • Updated changelog
  • Added .statusDetails to Tender, Award, Contract Add statusDetails field to Tender, Award, Contract #764
  • Updated changelog
  • Improve the field description of the Budget object
  • Updated changelog
  • build: Update to latest profile template. ci: Move JavaScript linting to separate workflow.
  • ci: Add missing workflow file
  • Funder deprecated
  • buyer new description
  • Updated changelog
  • Update the description of procuringEntity in the partyRole codelist Edit tender.procuringEntity description #571
  • Update the description of procuringEntity in the schema Edit tender.procuringEntity description #571
  • Deprecate contractSchedule and edit contractAnnexe documentType: Deprecate contractSchedule in favor of contractAnnexe #870
  • Updated changelog
  • Funder - corrected table formatting
  • US English
  • Added contractImplementationManager
  • Updated changelog
  • Update changelog
  • Table formatting
  • table formatting
  • Documents-expand-description-documentation
  • Update changelog.md
  • Add itemClassificationScheme codes from legalBasis extension Review additions to open codelists by extensions #1157
  • Deprecate the codes of the submissionMethod codelist submissionMethod: Deprecate codes #322
  • Deprecate the codes of the submissionMethod codelist submissionMethod: Deprecate codes #322
  • Deprecate submissionMethod submissionMethod: Deprecate codes #322
  • Add deprecation notes for submissionMethod code submissionMethod: Deprecate codes #322
  • Typo
  • Updated changelog submissionMethod: Deprecate codes #322
  • Add terminatedEarly and terminatedSuccessfully to contractStatus codelist contractStatus: Add termination codes #395
  • Added new terminated contract status codes to the schema contractStatus: Add termination codes #395
  • Updated changelog contractStatus: Add termination codes #395
  • directly / full
  • changelog: Clarify the change in Add termination codes to contractStatus #1201
  • requirements: Update sphinxcontrib-opencontracting
  • Remove empty extensionlist directives
  • Use field-description and code-description directives
  • requirements: Update sphinxcontrib-opencontracting
  • electronic goods => digital goods GPA alignment of closed codelist descriptions #828
  • Updated changelog GPA alignment of closed codelist descriptions #828
  • changelog: Describe alignment with WTO GPA
  • Update changelog (legal basis) Review additions to open codelists by extensions #1157
  • requirements: Update sphinxcontrib-opencontracting
  • conf: Remove extension_versions config value
  • Improved changelog entry for the codelist, add entry for the deprecation of the field
  • Mention multi-year budgets in the description.
  • Typo
  • Added COFOG to itemClassificationScheme from organizationClassification extension Review additions to open codelists by extensions #1157
  • Removed extra field from codelist
  • Update changelog
  • Add codes to documentType from the tariffs extension Review additions to open codelists by extensions #1157
  • Add missing columns to documentType category,section
  • Update changelog
  • partyRole: Fix missing trailing comma
  • changelog: Add structure and update changelog entries for Deprecate 'funder' and update buyer description in partyRole #1182
  • Document.url: Use "IANA media type" instead of "mime type". Clarify use of fragment identifier.
  • reference: Copy-edit recommendations for document publication
  • Added tender.selectionCriteria + changelog update Add Tender.selectionCriteria field #1120
  • Ran util scripts
  • Changelog: group changes related the sme codelist
  • Typos
  • Missing colon and quotes
  • Add documentTypes codes from eu extension Review additions to open codelists by extensions #1157
  • Changelog: documentTypes codes from eu extension
  • Add milestoneType code from eu extension + changelog update Review additions to open codelists by extensions #1157
  • Add partyRole codes from eu extension + changelog update Review additions to open codelists by extensions #1157
  • Standardize documents descriptions
  • Update changelog.md
  • Update supplier description
  • Update changelog.md
  • Update schema/codelists/partyRole.csv
  • Change definition in award.suppliers
  • Clean up descriptions
  • Fix typo in changelog
  • Release id scoped by the ocid AND the version Upgrade docs: Interaction with release immutability and dates #849
  • Change link to PR and changelog entry
  • Open the releaseTag codelist in the schema Tag: Open the codelist #1214
  • Adapt the description of the field Tag: Open the codelist #1214
  • Update the changelog
  • Move the codelist to the open codelists in the guidance Tag: Open the codelist #1214
  • release-schema: Move Unit to definitions
  • release_schema: Move units to definitions changelog
  • record_package_schema: fix record definition letter case
  • Updated changelog
  • Improved wording Add Tender.selectionCriteria field #1120
  • Fixed indent
  • Add the milestoneType codes from the PPP extension Review additions to open codelists by extensions #1157
  • Update the changelog
  • Add the partyRole codes from the PPP extension Review additions to open codelists by extensions #1157
  • Update the changelog (partyRole)
  • Fixed extra newline
  • Fixed missing closing quotes
  • Expanded guidance on additional tags Tag: Open the codelist #1214
  • record_reference.md: update reference to Reocord schema
  • Move linked releases to record package schema definitions
  • Change Linked Release to LinkedRelease
  • Update Linked Release definition
  • Update records_reference to point to LinkedRelease definition
  • Restore minItems in linked releases reference
  • Add changelog
  • Describe linked releases as references to releases
  • Replace normative verbs
  • Run util scripts
  • changelog: Add entry
  • Unit.description: Use the same as item.unit descripcion
  • Add 'centralPurchasingBody' in changelog
  • Remove selectedParticipant from core for now Bids: Add support for disclosing notified suppliers #1245
  • Remove centralPurchasingBody from core for now partyRole codelist: add wholesaleBuyer #1180
  • Update merging routine documenation to take OCDS version into account Upgrade docs: Interaction with release immutability and dates #849
  • Update changelog
  • Improved wording of the definition of privateParty (PPP) Review additions to open codelists by extensions #1157
  • flake8
  • build: Update to latest profile template
  • myst: Fix warnngs in 1.2 updates
  • Improve changelog entry
  • Duplicate changelog entries
  • Improve the changelog entry
  • Added the original Source column fromm ppp extension to partyRole.csv Review additions to open codelists by extensions #1157
  • Mention PPP in the description of partyRole.leadBank
  • Proposal of improved description for 'contractClose'
  • Fix quotes in milestoneType.csv
  • Removed markdown link from partyRole.csv
  • Target the description both for users and publishers
  • Ran util scripts
  • Remove 'default' for language field.
  • Update changelog
  • milestoneType.csv: Change may -> can for descriptive text
  • ci: Only run workflows once. Fix indentation.
  • md: Use csv-table-no-translate for releaseTag codelist
  • Refined the definition of selection criteria Add Tender.selectionCriteria field #1120
  • Improve the definition of contractClose, detail changelog
  • Improve the title of contractClose, quote definition
  • Exapand the guidance for release tags Tag: Open the codelist #1214
  • Removed the recommendation to use existing codes
  • Update docs/history/changelog.md
  • schema reference: add link to framework agreement guidance
  • Aligned documentType.tenderNotice and documentType.technicalSpecifications with GPA GPA alignment of closed codelist descriptions #828
  • Update changelog
  • Update docs/history/changelog.md
  • schema: Add comma after "for example"
  • Update docs/history/changelog.md
  • Clarify some of the existing content.
  • Separate MUST and MAY, can => may
  • Notary omitted as it's a local code
  • socialWitness omitted as it's a local code
  • otherWitness omitted because loose semantics and bound to socialWitness
  • Omitted as it's synonym of buyer and procuring entity
  • consortiaMember sufficienlty covered by worked up example, thus removed
  • Changelog updated
  • Lowercase
  • Rewriting of the definitions of lender and equityInvestor
  • Events can be captured by codes or fields
  • requirements: Update sphinxcontrib-*
  • requirements: Update sphinxcontrib-*
  • build: Run: python utils/make_dereferenced_release_schema.py
  • Add a source to 'leadBank'
  • Deprecate eligibilityCriteria, add exclusionGrounds Deprecate eligibilityCriteria and add exclusionGrounds #901
  • Fixed depracatedVersion
  • Updated changelog
  • Rephrase deprecate.description
  • Rephrase
  • Ran util scripts
  • schema: deprecate versionId
  • Rephrase deprecate.description (for good)
  • clarify uniqueness rules for records
  • add record uniqueness rule to schema
  • add mediaType codelist
  • log removal of deprecated and obsolete codes
  • add rules on how to identify and date compiled releases
  • update changelog
  • remove unused function
  • add iso639-1 codelist
  • update changelog
  • update changelog
  • meta-schema: remove versiondId
  • Apply suggestions from code review
  • Rename odelist
  • Remove URI column
  • Align field descriptions
  • Remove repetitions, use comma as separator
  • run python util/make_dereferenced_release_schema.py
  • correct reference to codelist csv in schema
  • codelists: rename itemClassificationScheme to classifitacionScheme and update references
  • chore: Replace non-breaking spaces with regular spaces
  • build: Update to latest profile template
  • codelists: language: Fix title of 'el' and 'st' codes
  • codelists: language: Remove parenthical content
  • release schema: update item classification description
  • changelog: add entry for itemClassificationScheme change
  • changelog: add versionId removal entry
  • changelog: remove incorrect link
  • changelog: add missing .
  • schema/merging: Remove note about versionId issue
  • build: Merge language and media type scripts into manage.py
  • add tender.datePublished field
  • update changelog
  • fix indentation
  • add Links field
  • update changelog
  • Contextualize descriptions in linkRelationType.csv
  • fix: handle non-required properties in remove_omit_when_merged
  • run manage.py pre-commit
  • Apply suggestions from code review
  • Replace 'related to' with 'about'
  • Update Record and compiledRelease descriptions.
  • codelists: add unsuccessfulDetails to documentTypes
  • codelists: remove extra ""
  • changelog: add 'unsuccessfulDetails' to documentType
  • record-package-schema: deprecated packages
  • changelog: Add deprecate record package packages field
  • Update schema/codelists/documentType.csv
  • record-package-schema: clarify packages deprecation description
  • examples: remove packages from record packages
  • records_referece: remove record package 'packages' reference
  • Apply suggestions from code review
  • Use sentence case for title properties. Run python manage.py pre-commit
  • Update schema/release-schema.json
  • run python manage.py pre-commit
  • Replace "tender submission" etc with "bid submission"
  • Update changelog.md
  • Change order of date and duration in contract
  • Update changelog.md
  • build: Run manage.py pre-commit
  • changelog: Tidy

ColinMaudry and others added 30 commits February 15, 2021 16:09
Deprecate contractSchedule and edit contractAnnexe
…nMethods

Deprecate all the codes from submissionMethods codelist
…ion-funder-deprecated

Deprecate 'funder' and update buyer description in partyRole
…-contractImplementationManager

Add 'contractImplementationManager' in partyRole (548)
…escription-documentation

Documents-expand-description-documentation
Add COFOG to itemClassificationScheme
Add codes to documentType from the tariffs extension
yolile and others added 27 commits July 14, 2021 14:35
Signed-off-by: Yohanna Lisnichuk <yohanitalisnichuk@gmail.com>
Signed-off-by: Yohanna Lisnichuk <yohanitalisnichuk@gmail.com>
Signed-off-by: Yohanna Lisnichuk <yohanitalisnichuk@gmail.com>
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
…ccessfulDetails

codelists: add unsuccessfulDetails to documentTypes
Signed-off-by: Yohanna Lisnichuk <yohanitalisnichuk@gmail.com>
Signed-off-by: Yohanna Lisnichuk <yohanitalisnichuk@gmail.com>
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
record-package-schema: deprecate packages
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
…s-award-contract

Switch position of date and period in contract to correspond with order in award
…nder-with-submit-bid

Replace "tender submission" etc with "bid submission"
@jpmckinney
Copy link
Member Author

Looks wrong...

@jpmckinney jpmckinney closed this Jul 30, 2021
@jpmckinney jpmckinney deleted the merge-1.1-dev branch July 30, 2021 00:21
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.

None yet

6 participants