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

Clarify contracts description #1357

Closed
wants to merge 13 commits into from
Closed

Clarify contracts description #1357

wants to merge 13 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
  • 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
  • build: Update to latest profile template. ci: Move JavaScript linting to separate workflow.
  • ci: Add missing workflow file
  • 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
  • changelog: Clarify the change in Add termination codes to contractStatus #1201
  • Contract(s) definition
  • Contract - update basic descriptions
  • signed --> concluded
  • Update value fields
  • Update design contest
  • Remove empty lines
  • Changelog
  • Formatting fix
  • schema: Fix extra whitespace
  • Framework agreement multiple awards
  • Change "grant" to "give"
  • Merge 1.2-dev into 896-clarify-contracts-description
  • docs/schema/reference: Fix broken internal link

@jpmckinney jpmckinney changed the base branch from 1.1-dev to 1.2-dev July 30, 2021 02:56
@jpmckinney
Copy link
Member Author

Testing what went wrong with the merge in #1208. Still seeing 332 files changed.

@jpmckinney jpmckinney closed this Jul 30, 2021
@jpmckinney jpmckinney deleted the 896-test branch July 30, 2021 02:57
@jpmckinney
Copy link
Member Author

Aha, I had started a merge, then abandoned it, then made the same changes as the merge would have done. I guess this doesn't get recognized as a merge, and so the changes show up in the commit.

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.

2 participants