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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
405 commits
Select commit Hold shift + click to select a range
fc95333
Add codes to documentType from the tariffs extension #1157
ColinMaudry Feb 15, 2021
af987a6
Add missing columns to documentType category,section
ColinMaudry Feb 15, 2021
6226eed
Update changelog
ColinMaudry Feb 15, 2021
4960d9c
Merge pull request #1186 from open-contracting/870_contractAnnexe
jpmckinney Feb 17, 2021
049cbf9
Merge branch '1.2-dev' into 322_deprecateSubmissionMethods
jpmckinney Feb 17, 2021
4df3353
Merge pull request #1200 from open-contracting/322_deprecateSubmissio…
jpmckinney Feb 17, 2021
5aae3b9
Merge branch '1.2-dev' into 825-buyer-new-description-funder-deprecated
jpmckinney Feb 17, 2021
af308a2
partyRole: Fix missing trailing comma
jpmckinney Feb 17, 2021
8c45403
changelog: Add structure and update changelog entries for #1182
jpmckinney Feb 17, 2021
0451d16
Merge 825-buyer-new-description-funder-deprecated into 548-partyRole-…
jpmckinney Feb 17, 2021
a55d3b2
Merge pull request #1182 from open-contracting/825-buyer-new-descript…
jpmckinney Feb 17, 2021
17fb41a
Merge pull request #1187 from open-contracting/548-partyRole-new-code…
jpmckinney Feb 17, 2021
b8e9674
Merge branch '1.2-dev' into 707-documents-expand-description-document…
jpmckinney Feb 17, 2021
67f3cfc
Document.url: Use "IANA media type" instead of "mime type". Clarify u…
jpmckinney Feb 17, 2021
f4184bc
reference: Copy-edit recommendations for document publication
jpmckinney Feb 17, 2021
e3ba615
Merge pull request #1189 from open-contracting/707-documents-expand-d…
jpmckinney Feb 17, 2021
7594bbf
Added tender.selectionCriteria + changelog update #1120
ColinMaudry Feb 22, 2021
b5e611c
Ran util scripts
ColinMaudry Feb 22, 2021
6ce5064
Merged with 1.2-dev (new columns in documentType.csv
ColinMaudry Feb 22, 2021
3e12322
Merged upstream changes
ColinMaudry Feb 23, 2021
3d57c98
Changelog: group changes related the sme codelist
ColinMaudry Feb 23, 2021
7bee56f
Typos
ColinMaudry Feb 23, 2021
827fae0
Missing colon and quotes
ColinMaudry Feb 23, 2021
616b2a4
Merge pull request #1218 from open-contracting/1157_cofog
ColinMaudry Feb 23, 2021
7564364
Add documentTypes codes from eu extension #1157
ColinMaudry Feb 23, 2021
c165223
Changelog: documentTypes codes from eu extension
ColinMaudry Feb 23, 2021
5ef4029
Add milestoneType code from eu extension + changelog update #1157
ColinMaudry Feb 23, 2021
3c4bbbc
Add partyRole codes from eu extension + changelog update #1157
ColinMaudry Feb 23, 2021
b05b8b8
Merge branch '1.2-dev' into 1157_tariffsDocumentType
jpmckinney Feb 24, 2021
4a512d7
Merge pull request #1219 from open-contracting/1157_tariffsDocumentType
ColinMaudry Feb 24, 2021
f33344a
Standardize documents descriptions
JachymHercher Feb 27, 2021
2b70887
Update changelog.md
JachymHercher Feb 27, 2021
508c436
Update supplier description
JachymHercher Feb 28, 2021
a5355bb
Update changelog.md
JachymHercher Feb 28, 2021
925def2
Update schema/codelists/partyRole.csv
jpmckinney Mar 1, 2021
c9468df
Merge branch '1.2-dev' into 1157_euCodelists
jpmckinney Mar 2, 2021
7f737a8
Change definition in award.suppliers
JachymHercher Mar 6, 2021
1367ffa
Merge branch '1149-update-description-supplier' of https://github.com…
JachymHercher Mar 6, 2021
c351ca4
Clean up descriptions
JachymHercher Mar 7, 2021
1cc5d55
Fix typo in changelog
ColinMaudry Mar 8, 2021
0395560
Release id scoped by the ocid AND the version #849
ColinMaudry Mar 8, 2021
64c507c
Change link to PR and changelog entry
ColinMaudry Mar 8, 2021
49bffa0
Open the releaseTag codelist in the schema #1214
ColinMaudry Mar 8, 2021
dae1ab1
Adapt the description of the field #1214
ColinMaudry Mar 8, 2021
ef5a653
Update the changelog
ColinMaudry Mar 8, 2021
5736353
Move the codelist to the open codelists in the guidance #1214
ColinMaudry Mar 8, 2021
71870e3
release-schema: Move Unit to definitions
yolile Mar 8, 2021
707e31b
release_schema: Move units to definitions changelog
yolile Mar 8, 2021
0635c9b
record_package_schema: fix record definition letter case
yolile Mar 8, 2021
8731800
Merge pull request #1238 from open-contracting/1124_openReleaseTags
ColinMaudry Mar 9, 2021
d28275b
Updated changelog
ColinMaudry Mar 9, 2021
bc7e0f6
Improved wording #1120
ColinMaudry Mar 9, 2021
6bd60ae
Fixed indent
ColinMaudry Mar 9, 2021
40fbac3
Add the milestoneType codes from the PPP extension #1157
ColinMaudry Mar 9, 2021
5b1e704
Update the changelog
ColinMaudry Mar 9, 2021
ca4d78a
Add the partyRole codes from the PPP extension #1157
ColinMaudry Mar 9, 2021
0acd23a
Update the changelog (partyRole)
ColinMaudry Mar 9, 2021
a68b982
Fixed extra newline
ColinMaudry Mar 9, 2021
bf4163e
Fixed missing closing quotes
ColinMaudry Mar 10, 2021
833e4c6
Expanded guidance on additional tags #1214
ColinMaudry Mar 10, 2021
b3f1b29
record_reference.md: update reference to Reocord schema
yolile Mar 10, 2021
39d455a
Move linked releases to record package schema definitions
yolile Mar 11, 2021
39b2d25
Change Linked Release to LinkedRelease
yolile Mar 11, 2021
6d30122
Update Linked Release definition
yolile Mar 11, 2021
9769d85
Update records_reference to point to LinkedRelease definition
yolile Mar 11, 2021
16ce714
Restore minItems in linked releases reference
yolile Mar 11, 2021
9d7a8af
Add changelog
yolile Mar 12, 2021
eaa200c
Describe linked releases as references to releases
jpmckinney Mar 12, 2021
75276b3
Replace normative verbs
ColinMaudry Mar 15, 2021
805675f
Run util scripts
ColinMaudry Mar 15, 2021
9659859
changelog: Add entry
jpmckinney Mar 15, 2021
fc28321
Merge pull request #1241 from open-contracting/641-fix-letter-case-sc…
yolile Mar 15, 2021
49eea44
Merge branch '1.2-dev' of github.com:open-contracting/standard into 1…
yolile Mar 15, 2021
d7a8e48
Unit.description: Use the same as item.unit descripcion
yolile Mar 15, 2021
a786179
Merge pull request #1240 from open-contracting/1107-move-unit
yolile Mar 15, 2021
0278496
Add 'centralPurchasingBody' in changelog
ColinMaudry Mar 17, 2021
9861d69
Merge branch '1157_euCodelists' of github.com:open-contracting/standa…
ColinMaudry Mar 17, 2021
a536edb
Remove selectedParticipant from core for now #1245
ColinMaudry Mar 17, 2021
bb6c2fe
Merge branch '1.2-dev' into 1157_euCodelists
ColinMaudry Mar 17, 2021
85589cd
Remove centralPurchasingBody from core for now #1180
ColinMaudry Mar 17, 2021
3a6c8e8
Merge branch '1157_euCodelists' of github.com:open-contracting/standa…
ColinMaudry Mar 17, 2021
c100d54
Update merging routine documenation to take OCDS version into account…
ColinMaudry Mar 17, 2021
9902718
Update changelog
ColinMaudry Mar 17, 2021
91da826
Merge branch '1.2-dev' into 849_releaseImmutabilityDates
ColinMaudry Mar 17, 2021
1a12e9c
Improved wording of the definition of privateParty (PPP) #1157
ColinMaudry Mar 17, 2021
0fc9a06
Merge 1.1-dev into 1.2-dev
jpmckinney Mar 19, 2021
9aa39a6
flake8
jpmckinney Mar 19, 2021
8b7a375
Merge 1.1-dev into 1.2-dev
jpmckinney Mar 20, 2021
a08b3a4
build: Update to latest profile template
jpmckinney Mar 20, 2021
f590d59
Merge branch '1.1-dev' into merge-1.1
jpmckinney Mar 20, 2021
1de1689
myst: Fix warnngs in 1.2 updates
jpmckinney Mar 20, 2021
5a7a8fe
Merge pull request #1251 from open-contracting/merge-1.1
jpmckinney Mar 20, 2021
3ee5f5c
Improve changelog entry
ColinMaudry Mar 26, 2021
9ecfacc
Duplicate changelog entries
ColinMaudry Mar 26, 2021
5a7e7c2
Improve the changelog entry
ColinMaudry Mar 26, 2021
3cc8260
Added the original Source column fromm ppp extension to partyRole.csv…
ColinMaudry Mar 26, 2021
c4b4ece
Mention PPP in the description of partyRole.leadBank
ColinMaudry Mar 26, 2021
36dfd7d
Proposal of improved description for 'contractClose'
ColinMaudry Mar 26, 2021
862b400
Fix quotes in milestoneType.csv
ColinMaudry Mar 26, 2021
f8e2c1f
Removed markdown link from partyRole.csv
ColinMaudry Mar 26, 2021
995d99e
Target the description both for users and publishers
ColinMaudry Mar 26, 2021
fded9ae
Ran util scripts
ColinMaudry Mar 26, 2021
596fce5
Merge pull request #1242 from open-contracting/849_releaseImmutabilit…
jpmckinney Mar 27, 2021
8167d85
Remove 'default' for language field.
nativaldezt Mar 29, 2021
031f6b2
Update changelog
nativaldezt Mar 30, 2021
54a58c9
milestoneType.csv: Change may -> can for descriptive text
jpmckinney Apr 1, 2021
c523f9f
ci: Only run workflows once. Fix indentation.
jpmckinney Apr 2, 2021
c0ea942
Merge pull request #1259 from open-contracting/ci-events
jpmckinney Apr 2, 2021
ce4d8b7
md: Use csv-table-no-translate for releaseTag codelist
jpmckinney Apr 2, 2021
bd6cad8
Merge pull request #1260 from open-contracting/codelist-releasetag
jpmckinney Apr 2, 2021
d87c5a9
Merge pull request #1225 from open-contracting/1157_euCodelists
ColinMaudry Apr 2, 2021
a8f1119
Refined the definition of selection criteria #1120
ColinMaudry Apr 2, 2021
82377f7
Merge pull request #1237 from open-contracting/1120_selectionCriteria
ColinMaudry Apr 2, 2021
9f6b256
Improve the definition of contractClose, detail changelog
ColinMaudry Apr 2, 2021
504729a
Improve the title of contractClose, quote definition
ColinMaudry Apr 2, 2021
27ddba3
Merge branch '1.2-dev' into 1157_addPPPCodes
ColinMaudry Apr 2, 2021
2935a8f
Exapand the guidance for release tags #1214
ColinMaudry Apr 2, 2021
2d5330d
Removed the recommendation to use existing codes
ColinMaudry Apr 2, 2021
50e131e
Update docs/history/changelog.md
nativaldezt Apr 15, 2021
8bf8087
Merge pull request #1257 from open-contracting/1005-remove-default-fo…
jpmckinney Apr 15, 2021
5407b02
schema reference: add link to framework agreement guidance
yolile Apr 16, 2021
f2db5a3
Merge pull request #1277 from open-contracting/1266-fa-link
jpmckinney Apr 16, 2021
26514bd
Aligned documentType.tenderNotice and documentType.technicalSpecifica…
ColinMaudry Apr 19, 2021
c89b8c5
Update changelog
ColinMaudry Apr 19, 2021
b3b984a
Merge pull request #1280 from open-contracting/828_gpaAlignmentCodes
jpmckinney Apr 19, 2021
fc0a2f3
Update docs/history/changelog.md
jpmckinney Apr 20, 2021
160ab02
schema: Add comma after "for example"
jpmckinney Apr 20, 2021
a0c2677
Merge pull request #1229 from open-contracting/1188-standardize-docum…
jpmckinney Apr 20, 2021
bd8e255
Merge branch '1.2-dev' into 1149-update-description-supplier
jpmckinney Apr 20, 2021
0073c36
Update docs/history/changelog.md
jpmckinney Apr 20, 2021
f055334
Merge pull request #1232 from open-contracting/1149-update-descriptio…
jpmckinney Apr 20, 2021
188f4d0
Clarify some of the existing content.
ColinMaudry Apr 29, 2021
cd12234
Separate MUST and MAY, can => may
ColinMaudry Apr 29, 2021
996b5d9
Merge branch '1.2-dev' into 1124_openReleaseTags
ColinMaudry Apr 29, 2021
e1cc945
Notary omitted as it's a local code
ColinMaudry May 11, 2021
00fc5eb
socialWitness omitted as it's a local code
ColinMaudry May 11, 2021
441c320
otherWitness omitted because loose semantics and bound to socialWitness
ColinMaudry May 11, 2021
fb7248c
Omitted as it's synonym of buyer and procuring entity
ColinMaudry May 11, 2021
1ba1758
consortiaMember sufficienlty covered by worked up example, thus removed
ColinMaudry May 11, 2021
518604f
Changelog updated
ColinMaudry May 11, 2021
b4289f1
Lowercase
ColinMaudry May 11, 2021
89e71a9
Rewriting of the definitions of lender and equityInvestor
ColinMaudry May 11, 2021
cdc4423
Events can be captured by codes or fields
ColinMaudry May 11, 2021
e1f7fa5
Merge branch '1.2-dev' into 1157_addPPPCodes
jpmckinney May 11, 2021
a548f3c
requirements: Update sphinxcontrib-*
jpmckinney May 11, 2021
fba436e
requirements: Update sphinxcontrib-*
jpmckinney May 11, 2021
6619cd5
Merge branch '1.2-dev' into 1157_addPPPCodes
jpmckinney May 12, 2021
2314294
build: Run: python utils/make_dereferenced_release_schema.py
jpmckinney May 12, 2021
eaa8771
Merge pull request #1244 from open-contracting/1124_openReleaseTags
ColinMaudry May 14, 2021
169fd4d
Add a source to 'leadBank'
ColinMaudry May 14, 2021
6455d0c
Merge pull request #1243 from open-contracting/1157_addPPPCodes
ColinMaudry May 14, 2021
b609097
Deprecate eligibilityCriteria, add exclusionGrounds #901
ColinMaudry May 14, 2021
0bc57da
Fixed depracatedVersion
ColinMaudry May 14, 2021
3ba6a7f
Updated changelog
ColinMaudry May 28, 2021
3b16852
Rephrase deprecate.description
ColinMaudry May 29, 2021
f76f1ae
Rephrase
ColinMaudry May 29, 2021
7641391
Ran util scripts
ColinMaudry May 29, 2021
8e916ce
schema: deprecate versionId
yolile Jun 10, 2021
9aaa5d0
Rephrase deprecate.description (for good)
ColinMaudry Jun 11, 2021
066277f
clarify uniqueness rules for records
duncandewhurst Jun 15, 2021
5ce817a
Merge 1.1-dev into 1.2-dev
jpmckinney Jun 16, 2021
7fa9896
Merge pull request #1312 from open-contracting/merge-1.1-dev
jpmckinney Jun 16, 2021
b3d0ae8
Merge branch '1.2-dev' into 847-record-uniqueness
duncandewhurst Jun 17, 2021
46180e3
add record uniqueness rule to schema
duncandewhurst Jun 17, 2021
4bdce6e
Merge pull request #1296 from open-contracting/901_exlusionGrounds
ColinMaudry Jun 17, 2021
5df077a
add mediaType codelist
duncandewhurst Jun 20, 2021
9b322d8
Merge branch '1.2-dev' into 857-IANA-codelist-2
duncandewhurst Jun 20, 2021
1d9a59f
log removal of deprecated and obsolete codes
duncandewhurst Jun 20, 2021
4919a8f
add rules on how to identify and date compiled releases
duncandewhurst Jun 21, 2021
f4b31d8
update changelog
duncandewhurst Jun 21, 2021
35acbaf
Merge branch '1.2-dev' into 834-compiled-release-date-id
duncandewhurst Jun 21, 2021
59640eb
remove unused function
duncandewhurst Jun 21, 2021
1757f4a
add iso639-1 codelist
duncandewhurst Jun 21, 2021
e7e8aab
update changelog
duncandewhurst Jun 21, 2021
b265de3
update changelog
duncandewhurst Jun 21, 2021
66f1e27
Merge branch '1.2-dev' of github.com:open-contracting/standard into 8…
yolile Jun 21, 2021
142e495
meta-schema: remove versiondId
yolile Jun 21, 2021
ea89e1d
Apply suggestions from code review
duncandewhurst Jun 21, 2021
926105e
Rename odelist
duncandewhurst Jun 21, 2021
c67f5ec
Remove URI column
duncandewhurst Jun 21, 2021
bb7a0c6
Align field descriptions
duncandewhurst Jun 21, 2021
aca2992
Remove repetitions, use comma as separator
duncandewhurst Jun 22, 2021
5bd6e93
run python util/make_dereferenced_release_schema.py
duncandewhurst Jun 22, 2021
16684c2
correct reference to codelist csv in schema
duncandewhurst Jun 22, 2021
53656c8
codelists: rename itemClassificationScheme to classifitacionScheme an…
yolile Jun 22, 2021
7e01634
chore: Replace non-breaking spaces with regular spaces
jpmckinney Jun 21, 2021
f43acfa
build: Update to latest profile template
jpmckinney Jun 21, 2021
646176f
codelists: language: Fix title of 'el' and 'st' codes
jpmckinney Jun 22, 2021
dff87dc
codelists: language: Remove parenthical content
jpmckinney Jun 22, 2021
4a151fe
Merge branch '1.1-dev' into 857-IANA-codelist-2
jpmckinney Jun 22, 2021
4a41445
Merge pull request #1314 from open-contracting/857-IANA-codelist-2
jpmckinney Jun 22, 2021
25c3d9b
release schema: update item classification description
yolile Jun 22, 2021
5b57670
changelog: add entry for itemClassificationScheme change
yolile Jun 22, 2021
1444992
changelog: add versionId removal entry
yolile Jun 22, 2021
9608846
changelog: remove incorrect link
yolile Jun 22, 2021
835376a
Merge branch '1.2-dev' into 1034-rename-itemClassification
yolile Jun 22, 2021
56ff218
changelog: add missing .
yolile Jun 22, 2021
6d1bd8d
Merge pull request #1319 from open-contracting/1034-rename-itemClassi…
jpmckinney Jun 22, 2021
ecc6817
Merge branch '1.2-dev' into 858-language-codelist
duncandewhurst Jun 22, 2021
557d679
Merge pull request #1316 from open-contracting/858-language-codelist
jpmckinney Jun 22, 2021
690ede3
Merge branch '1.2-dev' into 812-deprecate-versionid
jpmckinney Jun 22, 2021
93c28ca
schema/merging: Remove note about versionId issue
jpmckinney Jun 22, 2021
142a44e
Merge pull request #1318 from open-contracting/812-deprecate-versionid
jpmckinney Jun 23, 2021
77c86b9
Merge 1.1-dev into 1.2-dev
jpmckinney Jun 24, 2021
00f3389
Merge pull request #1322 from open-contracting/merge-1.1-dev
jpmckinney Jun 24, 2021
83bb36f
build: Merge language and media type scripts into manage.py
jpmckinney Jun 24, 2021
5ab01e7
Merge pull request #1323 from open-contracting/manage-codelists
jpmckinney Jun 24, 2021
374bd97
Merge pull request #1315 from open-contracting/834-compiled-release-d…
jpmckinney Jun 30, 2021
3e94c93
add tender.datePublished field
duncandewhurst Jul 6, 2021
ab64f3e
update changelog
duncandewhurst Jul 6, 2021
e0427cc
fix indentation
duncandewhurst Jul 6, 2021
dd68122
add Links field
duncandewhurst Jul 8, 2021
9637b24
update changelog
duncandewhurst Jul 8, 2021
d9c378a
Contextualize descriptions in linkRelationType.csv
duncandewhurst Jul 8, 2021
547523e
fix: handle non-required properties in remove_omit_when_merged
duncandewhurst Jul 8, 2021
1cdc387
run manage.py pre-commit
duncandewhurst Jul 8, 2021
eabf830
Merge branch '1.2-dev' into 847-record-uniqueness
jpmckinney Jul 9, 2021
4763cf4
Apply suggestions from code review
duncandewhurst Jul 11, 2021
5b055f7
Replace 'related to' with 'about'
duncandewhurst Jul 11, 2021
5521210
Update `Record` and `compiledRelease` descriptions.
duncandewhurst Jul 11, 2021
7f03c75
Merge pull request #1307 from open-contracting/847-record-uniqueness
jpmckinney Jul 12, 2021
447964c
codelists: add unsuccessfulDetails to documentTypes
yolile Jul 14, 2021
ef9045a
codelists: remove extra ""
yolile Jul 14, 2021
5f7b10c
changelog: add 'unsuccessfulDetails' to documentType
yolile Jul 14, 2021
a569352
record-package-schema: deprecated packages
yolile Jul 15, 2021
a99b3db
changelog: Add deprecate record package packages field
yolile Jul 15, 2021
d58ba0f
Update schema/codelists/documentType.csv
yolile Jul 16, 2021
f2c3756
record-package-schema: clarify packages deprecation description
yolile Jul 16, 2021
75d00b3
Merge pull request #1336 from open-contracting/1052-documentType-unsu…
yolile Jul 16, 2021
c562b56
Merge branch '1.2-dev' of github.com:open-contracting/standard into 9…
yolile Jul 16, 2021
423c177
examples: remove packages from record packages
yolile Jul 16, 2021
8e41cff
records_referece: remove record package 'packages' reference
yolile Jul 16, 2021
2e58959
Apply suggestions from code review
duncandewhurst Jul 18, 2021
8d57e73
Use sentence case for title properties. Run python manage.py pre-commit
duncandewhurst Jul 18, 2021
34f6e77
Merge pull request #1324 from open-contracting/892-add-tender.datePub…
duncandewhurst Jul 18, 2021
90c6d4f
Merge pull request #1339 from open-contracting/920-deprecate-packages
jpmckinney Jul 19, 2021
7213ead
Update schema/release-schema.json
duncandewhurst Jul 19, 2021
5c6b462
run python manage.py pre-commit
duncandewhurst Jul 19, 2021
9f01010
Merge branch '1.2-dev' into 928-add-links-field
duncandewhurst Jul 19, 2021
1517d2c
Merge pull request #1326 from open-contracting/928-add-links-field
jpmckinney Jul 20, 2021
a67bd1b
Replace "tender submission" etc with "bid submission"
JachymHercher Jul 29, 2021
09e47dc
Update changelog.md
JachymHercher Jul 29, 2021
292929c
Change order of date and duration in contract
JachymHercher Jul 29, 2021
4c2a195
Update changelog.md
JachymHercher Jul 29, 2021
1b38eb7
build: Run manage.py pre-commit
jpmckinney Jul 29, 2021
fe134a5
Merge pull request #1354 from open-contracting/1349-field-order-acros…
jpmckinney Jul 29, 2021
3a0d2bb
Merge branch '1.2-dev' into 1230-replace-submit-tender-with-submit-bid
jpmckinney Jul 29, 2021
0ed875d
changelog: Tidy
jpmckinney Jul 29, 2021
6af8a84
Merge pull request #1353 from open-contracting/1230-replace-submit-te…
jpmckinney Jul 29, 2021
b2e2eb9
Merge 1.1-dev into 1.2-dev
jpmckinney Jul 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions docs/examples/merging/example02-field-record.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
},
"publishedDate": "",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-k50g02-13-9-368828-planning.json",
"https://standard.open-contracting.org/examples/releases/ocds-k50g02-13-9-368828-tender.json"
],
"records": [
{
"ocid": "ocds-k50g02-13-9-368828",
Expand Down
4 changes: 0 additions & 4 deletions docs/examples/merging/example02-object-record.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
},
"publishedDate": "",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-k50g02-11-13-651832-tenderUpdate.json",
"https://standard.open-contracting.org/examples/releases/ocds-k50g02-11-13-651832-tender.json"
],
"records": [
{
"ocid": "ocds-k50g02-11-13-651832",
Expand Down
4 changes: 0 additions & 4 deletions docs/examples/merging/example03-record.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
},
"publishedDate": "",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-23g63a01-200502-awardAmendment.json",
"https://standard.open-contracting.org/examples/releases/ocds-23g63a01-200502-award.json"
],
"records": [
{
"ocid": "ocds-23g63a01-200502",
Expand Down
7 changes: 0 additions & 7 deletions docs/examples/merging/merged-tender.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award2.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00002",
Expand Down
7 changes: 0 additions & 7 deletions docs/examples/merging/merged.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award2.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00002",
Expand Down
7 changes: 0 additions & 7 deletions docs/examples/merging/versioned.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award1.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-award2.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-update.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00002-01-tender-amendment.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00002",
Expand Down
1 change: 0 additions & 1 deletion docs/examples/organizational-units/moldova-tender.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
"roles": [
"payer",
"procuringEntity",
"funder",
"buyer"
],
"details": {
Expand Down
9 changes: 0 additions & 9 deletions docs/examples/record-embedded-releases.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
{
"extensions": [],
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json#ocds-213czf-000-00001-01-planning",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json#ocds-213czf-000-00001-02-tender",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderAmendment.json#ocds-213czf-000-00001-03-tenderAmendment",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderAmendment.json#ocds-213czf-000-00001-03-tenderUpdate",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json#ocds-213czf-000-00001-04-award",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json#ocds-213czf-000-00001-05-contract",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json#ocds-213czf-000-00001-06-implementation"
],
"publishedDate": "2014-02-02T13:02:00Z",
"publisher": {
"name": "Open Data Services Co-operative Limited",
Expand Down
9 changes: 0 additions & 9 deletions docs/examples/record.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
{
"extensions": [],
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json#ocds-213czf-000-00001-01-planning",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json#ocds-213czf-000-00001-02-tender",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderAmendment.json#ocds-213czf-000-00001-03-tenderAmendment",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderAmendment.json#ocds-213czf-000-00001-03-tenderUpdate",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json#ocds-213czf-000-00001-04-award",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json#ocds-213czf-000-00001-05-contract",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json#ocds-213czf-000-00001-06-implementation"
],
"publishedDate": "2014-02-02T13:02:00Z",
"publisher": {
"name": "Open Data Services Co-operative Limited",
Expand Down
6 changes: 0 additions & 6 deletions docs/examples/records/award.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderUpdate.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00001",
Expand Down
7 changes: 0 additions & 7 deletions docs/examples/records/contract.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderUpdate.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00001",
Expand Down
9 changes: 0 additions & 9 deletions docs/examples/records/contractAmendment.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderUpdate.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-06-implementation.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-07-contractAmendment.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00001",
Expand Down
8 changes: 0 additions & 8 deletions docs/examples/records/implementation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderUpdate.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-04-award.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-05-contract.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-06-implementation.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00001",
Expand Down
3 changes: 0 additions & 3 deletions docs/examples/records/planning.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00001",
Expand Down
4 changes: 0 additions & 4 deletions docs/examples/records/tender.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00001",
Expand Down
5 changes: 0 additions & 5 deletions docs/examples/records/tenderUpdate.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
"license": "http://opendatacommons.org/licenses/pddl/1.0/",
"publicationPolicy": "https://github.com/open-contracting/sample-data/",
"version": "1.1",
"packages": [
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-01-planning.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-02-tender.json",
"https://standard.open-contracting.org/examples/releases/ocds-213czf-000-00001-03-tenderUpdate.json"
],
"records": [
{
"ocid": "ocds-213czf-000-00001",
Expand Down
14 changes: 7 additions & 7 deletions docs/getting_started/releases_and_records.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ There are major events that mark the progress from one stage to another, like an

Releases are **immutable**. Each change is documented in a **new** release, rather than by updating an existing one. The collection of releases for a particular process makes its change history.

**Records** are JSON documents that act as an index of all releases for a single contracting process. While releases are never updated, records are updated each time there is a change. A record is updated by adding a new release to this index.
**Records** are JSON documents that act as an index of releases for a single contracting process. While releases are never updated, records can be updated each time there is a change. A record is updated by adding a new release to this index.

![Contracting Process with releases and a record](../_static/png/changehistory_process_record.png)

Expand All @@ -29,7 +29,7 @@ Records can also contain:

These structures are designed to help users to access:

* The current state of the contracting process
* The current state of the contracting process
* The detailed history of changes for individual fields

In accounting terms, releases are analogous to individual transactions in an account. A record represents both the ledger of all transactions and the closing balance. The ledger is the releases list, and the closing balance is the compiled release.
Expand All @@ -51,7 +51,7 @@ Each release contains an [ocid](../schema/identifiers.md#contracting-process-ide

A release also needs a release identifier, unique in the scope of the contracting process. A release id can be built in several ways. Publishers can use any generation strategy, as long as the ids don’t collide within the same process.

The [easy releases](../guidance/build/easy_releases) section introduces two strategies that can be used in any scenario.
The [easy releases](../guidance/build/easy_releases) section introduces two strategies that can be used in any scenario.

#### Packaging

Expand All @@ -66,7 +66,7 @@ Each release also provides one or more tags. Tags provide information about the
For example:

* When an invitation to tender is published, the publisher uses the 'tender' tag . The release includes the relevant details in the `tender` section. It can also contain information about the budget in the planning section.
* When a contract is awarded, the publisher uses the 'award' tag. The release includes the relevant details in the `award` section. It can also update the tender section with the list of tenderers that submitted a bid.
* When a contract is awarded, the publisher uses the 'award' tag. The release includes the relevant details in the `award` section. It can also update the tender section with the list of tenderers that submitted a bid.

The [release tag codelist](../schema/codelists.md#release-tag) contains the list of all tags provided by OCDS. Note that it is allowed to use more than one tag in the same release. For example, a release with new data in the `tender` and `award` sections can use the 'tender' and 'award' tags together.

Expand All @@ -79,9 +79,9 @@ It might be more appropriate to repeat data when processes have fewer releases.
````{admonition} Example
:class: hint

The following example shows releases with minimal changes on each update.
The following example shows releases with minimal changes on each update.

1. The first release presents tender data.
1. The first release presents tender data.
1. The second introduces a new document in the `tender` section with the 'tenderUpdate' tag. Note that the release ignores all the nonmandatory fields. The tender document present in the previous release is also ignored.
1. The third release presents award data, and ignores the tender section.

Expand Down Expand Up @@ -160,4 +160,4 @@ Records are published wrapped in a record package. The `uri` field in the packag

The following shows how to update a record as releases are published over time.

![Record updates](../_static/change_history_animation.gif)
![Record updates](../_static/change_history_animation.gif)
Loading