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

dev -> master merge for 1.0.0-beta.2 #153

Merged
merged 82 commits into from
Jun 8, 2021
Merged

dev -> master merge for 1.0.0-beta.2 #153

merged 82 commits into from
Jun 8, 2021

Conversation

philvarner
Copy link
Collaborator

Related Issue(s): n/a

Proposed Changes:

  1. merge dev to master for 1.0.0-beta2

PR Checklist:

n/a

  • This PR is made against the dev branch (all proposed changes except releases should be against dev, not master).
  • This PR has no breaking changes.
  • I have added my changes to the CHANGELOG or a CHANGELOG entry is not required.

m-mohr and others added 30 commits January 2, 2021 15:50
Clarification on multiple bounding boxes in an extent
git-subtree-dir: stac-spec
git-subtree-split: ebd1675
* remove deactivation from item ids

* update changelog

* make same doc change in openapi fragment

* ... and in the POST
philvarner and others added 19 commits May 20, 2021 00:27
…about cross-collection use of 'collection' in filter
typo; escaping * in MD; stac_version in ItemCollection; fixing reference
update stac_version references to 1.0.0 and stac api references to 1.0.0-beta.2
789e90f Merge pull request #1139 from radiantearth/dev
76d1560 Merge pull request #1140 from radiantearth/stability-note-update
1995967 removed stability note and moved key info for 1.0.0
e5ec604 Merge pull request #1135 from radiantearth/versions-to-1_0_0
ca90fa4 Merge branch 'dev' into versions-to-1_0_0
5d017a4 Merge pull request #1138 from radiantearth/itemcollection-heuristic
c40ced1 Merge pull request #1137 from radiantearth/python_ci_validation
036f291 CHANGELOG entry added
2e60c61 Remove ci job from workflow
1b2fefb Removed ItemCollection from STAC detection heuristic, may get invalid soon. #141
9badaa7 Comment out python ci validation
d584c28 updated versions and changelog to 1.0.0
517c5fb Merge pull request #1134 from radiantearth/updated_uml
59434f3 updated UML allowing collection children in catalogs
ef679f4 update UML to remove summaries from catalogs
c197acb Merge pull request #1133 from radiantearth/title-rec
45d0789 Merge pull request #1131 from jbants/dev
24ec4a2 added best practice to include title, updated examples
8b14d60 Added clarity around CI tests
d811ae2 Ci validation (#2)
4ecbabc Merge pull request #1128 from radiantearth/dev
7363844 Merge pull request #1129 from radiantearth/changelog-fixes
8f35589 minor changelog fixes
09f0019 Merge pull request #1119 from radiantearth/version-rc4
21e12d5 Updated CHANGELOG
e7d008f Merge remote-tracking branch 'origin/dev' into version-rc4
00243b3 Update date in changelog
f45da2c Merge remote-tracking branch 'origin/dev' into version-rc4
a553f11 Merge pull request #1127 from radiantearth/issue-1125
ba9df2e Update collection-spec.md
b43d16b Merge pull request #1123 from lossyrob/clarification/rde/collection-extension
90a2cbd line break for linting
bf02447 updates from PR review
0a6da1a Collection: Open intervals for temporal extents #1125
c9323e4 line break for linting
b24066e update from PR review
ea3ee26 reorg and edits
59a8cf4 Update CHANGELOG
cd08d4a Fix TOC ordering in extensions
d87813d Clarify when to include extensions in stac_extensions
507a813 update version numbers
bb7cb80 merged dev
7be086c Merge pull request #1122 from radiantearth/catalog-summaries-removal
9fa29ce Update catalog-spec/json-schema/catalog.json
9fb18e7 Merge pull request #1121 from radiantearth/remove-core-ext-schema
42753fc Catalogs don't support summaries any more
7406ed7 Merge remote-tracking branch 'origin/dev' into remove-core-ext-schema
50d12f6 JSON Schemas don't allow "shortcuts" for core extensions any longer
56205ea updated version numbers / changelog
08fe31d Merge pull request #1116 from jjrom/dev
4b77ef8 updated changelog
3f9d9ac Merge pull request #1114 from radiantearth/emmanuelmathot-patch-1
34a7c0e fixed schema to reflect intent, update language
2f81fcc Allow empty catalogs
5c48425 add missing projection declaration
f81324f Merge pull request #1113 from radiantearth/dev
2f0a35a Merge pull request #1112 from radiantearth/version-changes-rc3
094b90d fixed linking issue
d6103b8 update versions, changelog edits
b398536 Merge pull request #1111 from radiantearth/foundations-overview
06aea1c less characters in a line
dfeaf64 more fixes from PR feedback
17c1493 updates from PR review
3a3cc09 updated changelog with pr link
20f7e71 new overview section
311a9a3 Merge pull request #1110 from radiantearth/bp-clarification
431e0af Update best-practices.md
c5d96a8 Merge pull request #1109 from radiantearth/catalog-json-schema
c397767 best practices: some clarifications #1108
9abb6e6 Catalog: Require child / item in JSON Schema #1100
89923bf Merge pull request #1107 from fredliporace/summaries
13bec82 Update collection-spec/collection-spec.md
6181a35 Merge branch 'dev' into summaries
31e9f91 Apply suggestions from code review
5b5a8bd Merge pull request #1093 from radiantearth/json-schema-summaries
a6f838a Merge pull request #1101 from radiantearth/root-parent
3e3677c fix from PR review
e5060dc Update collection-spec/collection-spec.md
4e4a7f7 Filled out 3rd option for summaries
d6062ff Merge pull request #1105 from radiantearth/gsd-tweaks
91a435e Merge pull request #1104 from radiantearth/no-scientific-1093
7762cca Fixing .md link
16b4b42 Changelog for issue #1106
457a5d5 Rephrase summaries; exception for summary schema; typo
476e179 Update CHANGELOG.md
ab58068 Update CHANGELOG.md
6fb42d9 update changelog
5890f7e clarifications on using gsd as an asset field
7d3a94a Merge branch 'dev' into json-schema-summaries
0d8916f remove scientific extension
ee2ca2e Merge pull request #1102 from bradh/common_metadata_2021-04-25
ea23b29 minor editorial cleanup for common-metadata
314cfa1 include parent and root rel types, even for same file
d42e3c1 Merge pull request #1092 from radiantearth/preview-rel-type
59ad837 Merge branch 'dev' into preview-rel-type
b8d8b5e Merge pull request #1099 from radiantearth/utc
14fec94 More emphasis on UTC requirement
1f3b72b All timestamps in UTC #1095
dfb2300 Merge pull request #1091 from radiantearth/clarify-root
b74d5b8 Better integrate example
e257928 Couple of changes for better alignment between the specs + list formatting
54d7be4 updates from review comments
b388c25 Merge branch 'dev' into clarify-root
091af68 Merge pull request #1097 from bradh/patch-1
59df72d Some more details
233b757 Minor change to Collection usage wording
eb7b9d2 Attempt to provide the main text
ee8022b Example (WIP), more details
40ab954 Update collection-spec/collection-spec.md
6755d41 First try at supporting JSON Schema in summaries #1045
6b24f7c put note up top
60bf0bc more updates
5a994b7 Update overview.md
04664cb Add preview relation type #1090
2be5e04 got rid of old changes that snuck in
d0336de updates to make clear root can be catalog or collection
bb15ca6 Merge pull request #1080 from radiantearth/fix_examples
16e80e9 Update examples/collection.json
1f9c4b0 Merge pull request #1086 from radiantearth/markdown
2daab18 Fix CI
77577a1 Merge branch 'dev' into fix_examples
2142d4b Merge pull request #1078 from radiantearth/rephrase-stac-extensions
6405e0d Merge branch 'dev' into fix_examples
9b438b6 Merge branch 'dev' into rephrase-stac-extensions
9f866c0 Merge branch 'dev' into markdown
40dfb8b Merge pull request #1085 from radiantearth/extent-clarification
6a5a153 Merge pull request #1087 from radiantearth/validate
93765a5 Made requirement for collection fields / rels clearer
82d3a22 Merge pull request #1089 from radiantearth/fix-collectionless-item
840a4cf Remove collection field
9c6be4b Collectionless item has collection field & link #1081
6c8df30 Item: Validate that collection property is set if link with collection rel type is available #1088
90f8d37 Update STAC Node Validator and fix examples
6f57298 Fix Markdown
be40027 Clarification on multiple bounding boxes in an extent. #1064 opengeospatial/ogcapi-features#520
6b1bd4c fix complete
8617240 Update catalog-spec/catalog-spec.md
21ecb16 Update collection-spec/collection-spec.md
53686bd simple item has no title
50d4862 stac_extensions for summarized fields
1ad7d1b updated changelog
a8354e1 datetime extent in collection
0684c3a align spatio-temporal extents
bcb5d96 removed duplicate the
d73b43f Clarified that stac_extensions should also list extensions that are used in Collection summaries

git-subtree-dir: stac-spec
git-subtree-split: 789e90f
@philvarner philvarner changed the title Dev dev -> master merge for 1.0.0-beta.2 Jun 7, 2021
@philvarner
Copy link
Collaborator Author

Apparently I can't merge anyway, as there are branch protection rules -- @cholmes @matthewhanson

@philvarner
Copy link
Collaborator Author

@cholmes you actually need to merge it -- I'm not an authorized user

@cholmes cholmes merged commit 1615434 into master Jun 8, 2021
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.

7 participants