Restore missing history #327
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It is now called "mod".
* Get rid of the "color" and "style" format attributes. * Specify the different instance types which can be validated by attributes. * Specify that if an instance is not of a type which the format attribute can validate, the validation MUST succeed. * "regex" is an ECMA 262 regular expression, remove "/perl5" since these dialects are not compatible (perl5 supports lookbehinds, ECMA 262 doesn't). * Remove paragraph allowing other format attributes to be specified.
- Use a common addError in checkObj. - Print out schema and value if given.
Keywords are split into three types: * keywords validating only a certain type of instances; * keywords validating all instance types; * keywords not participating in instance validation.
- avoid "undefined" when top level is an array. - replace '.' in properties with '\.'.
- Use a common addError in checkObj. - Print out schema and value if given.
Now that the "integer" type is being reintroduced, we can redefine "type" as it was in draft v3.
It is now called "mod".
* Get rid of the "color" and "style" format attributes. * Specify the different instance types which can be validated by attributes. * Specify that if an instance is not of a type which the format attribute can validate, the validation MUST succeed. * "regex" is an ECMA 262 regular expression, remove "/perl5" since these dialects are not compatible (perl5 supports lookbehinds, ECMA 262 doesn't). * Remove paragraph allowing other format attributes to be specified.
Keywords are split into three types: * keywords validating only a certain type of instances; * keywords validating all instance types; * keywords not participating in instance validation.
Conflicts: draft-zyp-json-schema-04.xml
Conflicts: lib/validate.js
Conflicts: lib/validate.js package.json
Shortlog as follows:
Camilo Aguilar (1):
Fixes error message
Dave Longley (6):
Add support for uniqueItems.
Fix inverted comparison.
Add missing schema and value to type error.
Add support for uniqueItems.
Fix inverted comparison.
Add missing schema and value to type error.
David I. Lehn (6):
Fix property path handling.
Add value and schema to errors.
Add more verbose handling.
Fix property path handling.
Add value and schema to errors.
Add more verbose handling.
Enrico Marino (1):
Replaced "maxDecimal" attribute with "divisibleBy" attribute
Francis Galiegue (5):
draft-04/schema: modify the "type" property definition
draft-04/schema: cosmetic: fix whitespaces
draft-04/schema: catch up with "divisibleBy" rename
Re-introduce "format" keyword, with some differences
Separate core schema keywords into different sections
Gary Court (1):
* Restored "integer" type. * Renamed "divisibleBy" to "mod".
Kris Zyp (2):
Better wording of items and their array indices
bump version
Stacia Hartleben (1):
Replaced obsolete optional with required fixed package.json
nickl- (5):
Merge branch 'master' of https://github.com/digitalbazaar/json-schema
Merge branch 'master' of https://github.com/fge/json-schema
Merge branch 'master' of https://github.com/c4milo/json-schema
Merge branch 'master' of https://github.com/onirame/json-schema
Merge branch 'master' of https://github.com/stacia/json-schema
Modified Readme introduction to new collaborated effort.
I think a CNAME file is needed for json-schema.org to point to this pages setup.
* Tabs are 4 in length, expanded to spaces. * 100 chars maximum per line.
Both "disallow" and "type", when arrays, must have at least one element. Unify style in the document: * spaces, not tabs; * tabs are 4 characters; * no space between an object member and a semicolon; * spaces after the opening bracket/before the closing bracket; * spaces after the opening accolade/before the closing accolade.
Only minor modifications (security section in validation spec)
Fortunately the first submission attempt failed!
|
This seems fantastic to me! I'm a bit hesitant to unilaterally accept it: @awwright and/or @Relequestual what do you think? I don't see a downside here, and having a full history is definitely a good thing. |
epoberezkin
approved these changes
Aug 21, 2017
handrews
approved these changes
Aug 21, 2017
|
Thanks, @epoberezkin, two reviews and I say let's merge (and hopefully no one objects b/c I already did it :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes not changes and requires no changes to process going forward, but it brings over all of the relevant commits from https://github.com/json-schema/json-schema. As a result, anyone trying to connect history between the repositories can, it far easier for anyone looking for the historical sources to be able to find them, historical contributors attribution is restored, and there is redundancy in case IETF were to stop hosting expired drafts or otherwise be unavailable.
I think I made good decisions on how to merge things in history, but of course there were decisions to be made meaning other ways this could have been done.
Notable decisions include:
I added new commits for the drafts 0 to 2 files that did not exist in either repository
I added new commits, merging from the appropriate place in history, that organize the historical version in the structure of the current repository for easy comparison.
I made an effort to allow linearizing of history if desired using
git replace. Specifically,would accurately join the disparate branches at the proper places in historical. (This does not include the commits I added that organize the old drafts, those only exist via merging). Once the commits hashes are known, one could then add an addition replace to hide this merge, if desired. (Note: if the ability to hide these merges is desired, best results would come from creating an empty commit on master before and after this merge.)
Relevant issue #205