summaryrefslogtreecommitdiff
path: root/json
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'b695cd7efa3e40fc41721792b4a692436b9eca39'Julian Berman2023-04-2533-56/+1239
|\ | | | | | | | | * commit 'b695cd7efa3e40fc41721792b4a692436b9eca39': Squashed 'json/' changes from 0788c226a..6afa9b38d
* \ Merge commit 'c8c0bdd52999e4e1a6a38ceca814d0943f3e7962'Julian Berman2023-03-284-0/+80
|\ \ | |/ | | | | | | * commit 'c8c0bdd52999e4e1a6a38ceca814d0943f3e7962': Squashed 'json/' changes from 19947eaa1..0788c226a
* | Merge commit '5e16d74500493ef164b595daec622c4ba199644e'Julian Berman2023-03-1438-26/+833
|\ \ | |/ | | | | | | * commit '5e16d74500493ef164b595daec622c4ba199644e': Squashed 'json/' changes from f57d3e0cc..19947eaa1
* | Merge commit 'dae554c22c8dce3bd084e3e503060b92a4839385'Julian Berman2023-01-205-5/+269
|\ \ | |/ | | | | | | * commit 'dae554c22c8dce3bd084e3e503060b92a4839385': Squashed 'json/' changes from d21ed578a..f57d3e0cc
| * Squashed 'json/' changes from d21ed578a..f57d3e0ccJulian Berman2023-01-20521-75984/+0
|/ | | | | | | | | f57d3e0cc Merge pull request #631 from json-schema-org/if-then-else-ref 3b8c281ff Ensure $ids are collected within if/then/else schemas. 02905b21b Fix a sloppy bug in the sanity checks in CI. git-subtree-dir: json git-subtree-split: f57d3e0ccb365a198fabe060aae2407af6adcff9
* Squashed 'json/' changes from 6b3cac42b..d21ed578aJulian Berman2022-12-212-25/+357
| | | | | | | | d21ed578a Merge pull request #628 from json-schema-org/catch-unknown-keywords 42b4c3645 Ensure we don't use unknown keywords unless intended. git-subtree-dir: json git-subtree-split: d21ed578aeb13b55dfe3604db53adb4750e1abc3
* Merge commit 'ade1faa768471bb95b14533f20a504fe8fc326c9'Julian Berman2022-12-1920-53/+901
|\ | | | | | | | | * commit 'ade1faa768471bb95b14533f20a504fe8fc326c9': Squashed 'json/' changes from 78c888273..6b3cac42b
* \ Merge commit '97954adeb0fbb3d4499580d897de507d3ab0d919'Julian Berman2022-11-2838-160/+539
|\ \ | |/ | | | | | | * commit '97954adeb0fbb3d4499580d897de507d3ab0d919': Squashed 'json/' changes from 9251ebff1..78c888273
* | Merge commit '62e69b2c3be9e30c50bea2e595eb2afcd13666ec'Julian Berman2022-11-114-8/+8
|\ \ | |/ | | | | | | * commit '62e69b2c3be9e30c50bea2e595eb2afcd13666ec': Squashed 'json/' changes from 0fa89d2ab..9251ebff1
* | Merge commit '79e3a85ed15c55d5141a502d025fe76ea82f9287'Julian Berman2022-11-118-3/+168
|\ \ | |/ | | | | | | * commit '79e3a85ed15c55d5141a502d025fe76ea82f9287': Squashed 'json/' changes from ed0b855e7..0fa89d2ab
* | Merge commit 'f5f839a5995c8005373214271989daae3537d70e'Julian Berman2022-09-0810-0/+399
|\ \ | |/ | | | | | | * commit 'f5f839a5995c8005373214271989daae3537d70e': Squashed 'json/' changes from 6eaf7dff4..ed0b855e7
* | Merge commit '65802a7ebcd0b661c829307354ab0c24e1e05031'Julian Berman2022-08-31272-584/+3192
|\ \ | |/ | | | | | | * commit '65802a7ebcd0b661c829307354ab0c24e1e05031': Squashed 'json/' changes from 4cfead7ba..6eaf7dff4
* | Merge commit 'af8abbb870562f38fa8f760f0462645277dc0e89'Julian Berman2022-08-171-1/+5
|\ \ | |/ | | | | | | * commit 'af8abbb870562f38fa8f760f0462645277dc0e89': Squashed 'json/' changes from 14d05dcea..4cfead7ba
* | Merge commit '5d6a9931ff0d606b273c36a20bd0444a2a61ea24'Julian Berman2022-08-172-6/+37
|\ \ | |/ | | | | | | * commit '5d6a9931ff0d606b273c36a20bd0444a2a61ea24': Squashed 'json/' changes from b3c8672a3..14d05dcea
* | Merge commit '74e91ee79990c28d937d54a6d2f9d18fd338af20'Julian Berman2022-08-168-0/+113
|\ \ | |/ | | | | | | * commit '74e91ee79990c28d937d54a6d2f9d18fd338af20': Squashed 'json/' changes from 597b1fb0d..b3c8672a3
* | Merge commit '297cb8c4830ef4080d6ccf7ef7e0c0a4eb94342c'Julian Berman2022-08-0812-0/+600
|\ \ | |/ | | | | | | * commit '297cb8c4830ef4080d6ccf7ef7e0c0a4eb94342c': Squashed 'json/' changes from 0015d5242..597b1fb0d
* | Merge commit '9e7387d89098b43062b9cbab177cd15aad965f6a'Julian Berman2022-08-064-14/+14
|\ \ | |/ | | | | | | * commit '9e7387d89098b43062b9cbab177cd15aad965f6a': Squashed 'json/' changes from 91ecacf60..0015d5242
* | Merge commit 'b9ff8c481f054bff83dad4c5b4da0efc221175f2'Julian Berman2022-08-0661-191/+198
|\ \ | |/ | | | | | | * commit 'b9ff8c481f054bff83dad4c5b4da0efc221175f2': Squashed 'json/' changes from f82764080..91ecacf60
* | Merge commit '7a5fd08611cb2fb07b8200860a4e352eb33ae7bf'Julian Berman2022-08-0660-266/+242
|\ \ | |/ | | | | | | * commit '7a5fd08611cb2fb07b8200860a4e352eb33ae7bf': Squashed 'json/' changes from 2782d7c29..f82764080
| * Squashed 'json/' changes from 2782d7c29..f82764080Julian Berman2022-08-06453-70522/+0
|/ | | | | | | | | | | | | | | | | | | | f82764080 Merge pull request #579 from json-schema-org/sanity-check-strengthening e5d5e0a2a Also prevent 'tests that' from descriptions. eaf06b1e8 Remove the last few 'shoulds' from items descriptions. b7da24fba Kill more shoulds from ECMA and ref tests. 85899fdf4 More description cleanup for Bengali non-ASCII tests. b84b900f3 Remove 'should' from a format test which anyhow needed a clearer description. 721397c1f Prevent tests from using 'should' in sanity check. 68f380c6f Fix the last non-unique case descriptions. 6383ef638 Remove mistakenly duplicated anyOf tests in draft{4,6,7}. a5b459fa0 Make sure bignum cases have unique descriptions. b82b18cdf Assert case descriptions are also unique in sanity checks. d3d082219 Also check case description length in sanity checks. 5e7804c52 Use subtests when running sanity checks. 8ade92340 Fix two last clashing $ids in draft-next too. git-subtree-dir: json git-subtree-split: f8276408005489aa134ec857f5fd3f0fb3ec5954
* Squashed 'json/' changes from 685ac631d..2782d7c29Julian Berman2022-08-051-3/+3
| | | | | | | 2782d7c29 Fix two last clashing $ids in draft-next too. git-subtree-dir: json git-subtree-split: 2782d7c296f9f828e09c8a2878b0035b2c371a2a
* Merge commit 'ecc464314583f989ca4f3d9da87d60543b8b5189'Julian Berman2022-07-315-0/+912
|\ | | | | | | | | * commit 'ecc464314583f989ca4f3d9da87d60543b8b5189': Squashed 'json/' changes from fd9bcfbdb..685ac631d
* \ Merge commit '999ff68a38729aaebe8b5b772b789b97dc145820'Julian Berman2022-07-257-0/+134
|\ \ | |/ | | | | | | * commit '999ff68a38729aaebe8b5b772b789b97dc145820': Squashed 'json/' changes from 69acf529..fd9bcfbd
* | Merge commit 'c09578b4249e70cc9148d012055b1071f2ad19a9'v4.7.0Julian Berman2022-07-1149-62/+852
|\ \ | |/ | | | | | | * commit 'c09578b4249e70cc9148d012055b1071f2ad19a9': Squashed 'json/' changes from b7d13f4b..69acf529
* | Merge commit '10104f7250d99f6c5225a5aa6ad0975fdbf7d555'Julian Berman2022-07-024-2/+67
|\ \ | |/ | | | | | | * commit '10104f7250d99f6c5225a5aa6ad0975fdbf7d555': Squashed 'json/' changes from 1047a1aa..b7d13f4b
* | Merge commit 'cfff411af7d1e9b42b10ba36e5b8765f3eb1028b'Julian Berman2022-06-304-165/+41
|\ \ | |/ | | | | | | * commit 'cfff411af7d1e9b42b10ba36e5b8765f3eb1028b': Squashed 'json/' changes from 39d1d24d..1047a1aa
* | Merge commit '09edc31951f508ce164b9e74e3cd1a13d1d3a9f0'Julian Berman2022-06-307-27/+138
|\ \ | |/ | | | | | | * commit '09edc31951f508ce164b9e74e3cd1a13d1d3a9f0': Squashed 'json/' changes from d3f5cd43..39d1d24d
* | Merge commit '118726fe2085ea58d9b3c1bd4764b389e8df8842'Julian Berman2022-06-284-1518/+0
|\ \ | |/ | | | | | | * commit '118726fe2085ea58d9b3c1bd4764b389e8df8842': Squashed 'json/' changes from f0f619d19..d3f5cd439
* | Merge commit '095a009acc1938caf9596085d5581e7196021f66'Julian Berman2022-06-2555-59/+2065
|\ \ | |/ | | | | | | * commit '095a009acc1938caf9596085d5581e7196021f66': Squashed 'json/' changes from cf78d97d0..f0f619d19
* | Merge commit 'aeecae37b17b430c328d3c3e15bec90d30c8848b'Julian Berman2022-06-2112-75/+301
|\ \ | |/ | | | | | | * commit 'aeecae37b17b430c328d3c3e15bec90d30c8848b': Squashed 'json/' changes from d40b3e62f..cf78d97d0
* | Merge commit '4f9cd0eecf415da02a108d12bb3d4772d9837b65'Julian Berman2022-06-164-0/+1518
|\ \ | |/ | | | | | | * commit '4f9cd0eecf415da02a108d12bb3d4772d9837b65': Squashed 'json/' changes from e42e8417b..d40b3e62f
* | Merge commit 'fdf82687138a183afe24b8d892c5ccf3db221b03'Julian Berman2022-06-162-0/+22
|\ \ | |/ | | | | | | * commit 'fdf82687138a183afe24b8d892c5ccf3db221b03': Squashed 'json/' changes from 387d690ae..e42e8417b
* | Merge commit '7d135823a7c055e61b41e86294ef503cbf8da8a0'Julian Berman2022-05-187-1/+220
|\ \ | |/ | | | | | | * commit '7d135823a7c055e61b41e86294ef503cbf8da8a0': Squashed 'json/' changes from 060caae0d..387d690ae
* | Merge commit '19d2c1a183eeb2b2f4b07e05545b9e670babf986'Julian Berman2022-04-299-148/+114
|\ \ | |/ | | | | | | * commit '19d2c1a183eeb2b2f4b07e05545b9e670babf986': Squashed 'json/' changes from 3731ed32a..060caae0d
* | Merge commit 'aaf8e3125211f6fcda17b0a47e54a74c362202b7'Julian Berman2022-01-126-4/+227
|\ \ | |/ | | | | | | * commit 'aaf8e3125211f6fcda17b0a47e54a74c362202b7': Squashed 'json/' changes from 20fb14bde..3731ed32a
* | Merge commit '2f004cab9e731cc979b42fddfd1368818f73c4f6'Julian Berman2022-01-049-35/+31
|\ \ | |/ | | | | | | * commit '2f004cab9e731cc979b42fddfd1368818f73c4f6': Squashed 'json/' changes from 9263b5250..20fb14bde
* | Merge commit 'c9b74362198d21cea59794c414f0877452ab9fa7'Julian Berman2021-11-037-0/+140
|\ \ | |/ | | | | | | * commit 'c9b74362198d21cea59794c414f0877452ab9fa7': Squashed 'json/' changes from 329efe59c..9263b5250
* | Merge commit 'ddef3b4a06be6f66dc1384e31a408ee7658bac1a'Julian Berman2021-10-204-3/+52
|\ \ | |/ | | | | | | * commit 'ddef3b4a06be6f66dc1384e31a408ee7658bac1a': Squashed 'json/' changes from ba3a90534..329efe59c
* | Merge commit '4ecbea58e0828696f7714abba624e2160518fddd'Julian Berman2021-10-1985-22/+680
|\ \ | |/ | | | | | | * commit '4ecbea58e0828696f7714abba624e2160518fddd': Squashed 'json/' changes from 54440eab4..ba3a90534
* | Merge commit 'cf886386cc0996df6743b425f74675a6d8a1a9ca'Julian Berman2021-10-07129-1289/+5355
|\ \ | |/ | | | | | | * commit 'cf886386cc0996df6743b425f74675a6d8a1a9ca': Squashed 'json/' changes from 20c1bb1d9..54440eab4
* | Merge commit 'b5e545b0e0a3a614562293fd7755cd8d2283e8d2'Julian Berman2021-08-2429-0/+225
|\ \ | |/ | | | | | | * commit 'b5e545b0e0a3a614562293fd7755cd8d2283e8d2': Squashed 'json/' changes from ab0b1ae71..20c1bb1d9
* | Merge commit '6cf6ff85b7cf595609a10267a85d354202e3b2f0'Julian Berman2021-08-2417-431/+679
|\ \ | |/ | | | | | | * commit '6cf6ff85b7cf595609a10267a85d354202e3b2f0': Squashed 'json/' changes from eb619047f..ab0b1ae71
* | Merge commit '2591383efc85ba04e52e09aa73376f515baa4a49'Julian Berman2021-08-183-1/+76
|\ \ | |/ | | | | | | * commit '2591383efc85ba04e52e09aa73376f515baa4a49': Squashed 'json/' changes from 878b0ad5f..eb619047f
* | Merge commit '0fe6d845792049d67e25b452ca056689783358eb'Julian Berman2021-08-186-6/+6
|\ \ | |/ | | | | | | * commit '0fe6d845792049d67e25b452ca056689783358eb': Squashed 'json/' changes from bb2a20d3e..878b0ad5f
* | Merge commit 'f29c81f3d812a0d82428c90f3623dc5fb5331b2c'Julian Berman2021-08-063-0/+45
|\ \ | |/ | | | | | | * commit 'f29c81f3d812a0d82428c90f3623dc5fb5331b2c': Squashed 'json/' changes from f9acc454..bb2a20d3
* | Merge commit '528eb6f3d00e32a0c71a0bb10c1e443d102d5120' into draft2020-12Julian Berman2021-08-041-0/+15
|\ \ | |/ | | | | | | * commit '528eb6f3d00e32a0c71a0bb10c1e443d102d5120': Squashed 'json/' changes from fd0aa9f8..f9acc454
* | Merge commit '22e5c949401c3a0cd650a4fb28c6e91574a7ec47'Julian Berman2021-07-195-2/+434
|\ \ | |/ | | | | | | * commit '22e5c949401c3a0cd650a4fb28c6e91574a7ec47': Squashed 'json/' changes from 6327a3bc..fd0aa9f8
* | Merge commit '401a857bd7a71931e66e04eb086c4026f4c19846'Julian Berman2021-07-1319-866/+1668
|\ \ | |/ | | | | | | * commit '401a857bd7a71931e66e04eb086c4026f4c19846': Squashed 'json/' changes from 17fa9589..6327a3bc
* | Merge commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02'Julian Berman2021-06-296-10/+90
|\ \ | |/ | | | | | | * commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02': Squashed 'json/' changes from 1326f36e..17fa9589
* | Merge commit '4e76fb6ae3c1f77d12bca82e4f92691dd57cac15'Julian Berman2021-06-266-2/+150
|\ \ | |/ | | | | | | * commit '4e76fb6ae3c1f77d12bca82e4f92691dd57cac15': Squashed 'json/' changes from 0aefbb3d..1326f36e
View Lorry Controller Status