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.

Sign up for GitHub

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

Jump to bottom

Merge 1.1-dev into 1.2-dev #1088

Merged
merged 51 commits into from
Oct 14, 2020
Merged

Merge 1.1-dev into 1.2-dev #1088

merged 51 commits into from
Oct 14, 2020

Conversation

jpmckinney
Copy link
Member

No description provided.

jpmckinney and others added 30 commits May 29, 2019 19:47
@jpmckinney
Merge pull request #873 from open-contracting/1.1-dev
37af115 
OCDS 1.1.4 - Bug Fix Release
@jpmckinney
Merge pull request #884 from open-contracting/1.1-dev
f7ad602 
Merge #875 from 1.1-dev onto 1.1
@jpmckinney
Merge pull request #934 from open-contracting/1.1-dev
ae6e990 
Merge 1.1-dev into 1.1
@yolile
Add personal identifiers example
160302e 
Signed-off-by: Yohanna Lisnichuk <[email protected]>
@yolile
Update Personal identifiers example
5b7f09d 
Signed-off-by: Yohanna Lisnichuk <[email protected]>
@jpmckinney
Merge branch '1.1-dev' into example-personal-identifiers
fe8f3cc
@jpmckinney
Fix indentation of example
4c1f42c
@yolile
Merge branch '1.1-dev' of github.com:open-contracting/standard into e…
4fa77fa 
…xample-personal-identifiers

Signed-off-by: Yohanna Lisnichuk <[email protected]>
@yolile
Merge branch '1.1-dev' of github.com:open-contracting/standard into e…
9d9e2a2 
…xample-personal-identifiers

Signed-off-by: Yohanna Lisnichuk <[email protected]>
@yolile
Improve personal identifiers guidance
d772817 
Signed-off-by: Yohanna Lisnichuk <[email protected]>
@duncandewhurst
add localization docs
adf8dcf
@jpmckinney
Merge pull request #1039 from open-contracting/1.1-dev
c244abd 
Merge 1.1-dev into 1.1
@jpmckinney
Merge pull request #1056 from open-contracting/1.1-dev
af0d0d4 
Merge 1.1-dev into 1.1
@duncandewhurst
update mapping template screen, minor copy-edits
b0979ad
@duncandewhurst
correct screenshot link, crop screenshot
5549b58
@jpmckinney
Fix links
8c7e055
@jpmckinney
Merge branch '1.1-dev' into add-localization-docs
6124423
@duncandewhurst
add guidance on reusing tools
c93c40a
@duncandewhurst
Merge branch '1.1' into example-personal-identifiers
1b5ee6c
@duncandewhurst
copy-edit for grammar and clarity, add to TOC
42b77d2
@duncandewhurst
fix typo, update BODS link, add link from reference section
0ffd3fe
@jpmckinney
Merge pull request #1043 from open-contracting/add-localization-docs
8f5e5b4 
add localization docs
@jpmckinney
Expand BODS acronym
d77ee65
@jpmckinney
Merge pull request #952 from open-contracting/example-personal-identi…
c2e0cd2 
…fiers

Add personal identifiers example
@duncandewhurst @jpmckinney
Update docs/guidance/build/data_collection_tools.md
4631f3a 
Co-authored-by: James McKinney <[email protected]>
@duncandewhurst @jpmckinney
Update docs/guidance/build/data_collection_tools.md
cc05562 
Co-authored-by: James McKinney <[email protected]>
@duncandewhurst @jpmckinney
Update docs/guidance/design.md
58b7405 
Co-authored-by: James McKinney <[email protected]>
@duncandewhurst @jpmckinney
Update docs/guidance/map.md
647033c 
Co-authored-by: James McKinney <[email protected]>
@duncandewhurst
link to guidance on formats, access methods and publishing
004745d
@duncandewhurst
add emphasis to list items
9aa990a
duncandewhurst and others added 21 commits September 21, 2020 12:42
@duncandewhurst
expand guidance on combining data, minor copy edits
1ad00bc
@duncandewhurst @jpmckinney
Update docs/guidance/build.md
92ad1e5 
Co-authored-by: James McKinney <[email protected]>
@duncandewhurst @jpmckinney
Update docs/guidance/build.md
d6f684c 
Co-authored-by: James McKinney <[email protected]>
@odscrachel
Adding link PartIII spreadsheet blog to guidance
b9b5c98
@jpmckinney
Add space after punctuation and use Arabic instead of Roman numerals
587397f
@duncandewhurst
clarify guidance on combining spreadsheets
957249b
@duncandewhurst
Merge branch '1.1-dev' into data-collection-guidance
d8b254f
@jpmckinney
Remove separators argument (it is already set to this value if indent…
87643aa 
… is not None)
@jpmckinney
Add whitespace in setup.cfg
e321cce
@odscrachel
Merge pull request #1080 from open-contracting/spreadsheet_blog_link
834297d 
Adding link PartIII spreadsheet blog to guidance
@duncandewhurst
Merge pull request #1061 from open-contracting/data-collection-guidance
7b59d0d 
Data collection guidance
@jpmckinney
Merge pull request #1081 from open-contracting/lint
cb13418 
Lint programming files
@odscrachel
Updating indicator resource link as per #1009
df4f6a7
@odscrachel
Adding publication plan subheading to design stage
b8cfc7f
@odscrachel
Merge pull request #1082 from open-contracting/indicators_link_update
04d2979 
Updating indicator resource link as per #1009
@odscrachel
Merge pull request #1083 from open-contracting/pubplan_subheading
b47d924 
Adding publication plan subheading to design stage
@odscrachel
Adding publication plan links to other stages
36f77a1
@odscrachel
Merge pull request #1085 from open-contracting/publink_other_stages
9eb2bad 
Adding publication plan links to other stages
@jpmckinney
Use standard.open-contracting.org instead of staging.standard.open-co…
28a45bc 
…ntracting.org
@jpmckinney
Merge pull request #1087 from open-contracting/new-staging
290a0c4 
Use standard.open-contracting.org instead of staging.standard.open-contracting.org
@jpmckinney
Merge branch '1.1-dev' into merge-1.1
7a972eb
@jpmckinney jpmckinney added this to the 1.2.0 milestone Oct 14, 2020
@jpmckinney jpmckinney merged commit a7f6812 into 1.2-dev Oct 14, 2020
@jpmckinney jpmckinney deleted the merge-1.1 branch October 14, 2020 14:38
@jpmckinney jpmckinney removed this from the 1.2.0 milestone Jun 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
OCDS 1.2
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jpmckinney @yolile @duncandewhurst @odscrachel