summaryrefslogtreecommitdiff
path: root/json/tests/draft3
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'c9b74362198d21cea59794c414f0877452ab9fa7'Julian Berman2021-11-031-0/+20
|\ | | | | | | | | * commit 'c9b74362198d21cea59794c414f0877452ab9fa7': Squashed 'json/' changes from 329efe59c..9263b5250
* \ Merge commit 'cf886386cc0996df6743b425f74675a6d8a1a9ca'Julian Berman2021-10-0711-18/+18
|\ \ | |/ | | | | | | * commit 'cf886386cc0996df6743b425f74675a6d8a1a9ca': Squashed 'json/' changes from 20c1bb1d9..54440eab4
* | Merge commit '401a857bd7a71931e66e04eb086c4026f4c19846'Julian Berman2021-07-131-80/+80
|\ \ | |/ | | | | | | * commit '401a857bd7a71931e66e04eb086c4026f4c19846': Squashed 'json/' changes from 17fa9589..6327a3bc
* | Merge commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02'Julian Berman2021-06-291-5/+5
|\ \ | |/ | | | | | | * commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02': Squashed 'json/' changes from 1326f36e..17fa9589
* | Merge commit '4e76fb6ae3c1f77d12bca82e4f92691dd57cac15'Julian Berman2021-06-261-0/+36
|\ \ | |/ | | | | | | * commit '4e76fb6ae3c1f77d12bca82e4f92691dd57cac15': Squashed 'json/' changes from 0aefbb3d..1326f36e
* | Merge commit '6d455c83e3fd953a9e762e596c52ce1fc4bf8740'Julian Berman2021-06-241-0/+135
|\ \ | |/ | | | | | | * commit '6d455c83e3fd953a9e762e596c52ce1fc4bf8740': Squashed 'json/' changes from 09fd353f..0aefbb3d
* | Merge commit 'c19f0b4ee66ce10217185fa8d2c8b7a2784e3a31'Julian Berman2021-04-283-3/+33
|\ \ | |/ | | | | | | * commit 'c19f0b4ee66ce10217185fa8d2c8b7a2784e3a31': Squashed 'json/' changes from 15ec577f..09fd353f
* | Merge commit '037b4438fc54e52584cf8fb5e469cf3413751a1f' into mainJulian Berman2020-11-172-0/+55
|\ \ | |/ | | | | | | * commit '037b4438fc54e52584cf8fb5e469cf3413751a1f': Squashed 'json/' changes from 96742ba3..3627cc11
* | Merge commit '1a4ea00149e70383506f24648bfb52a2278fe3f7' into masterJulian Berman2020-09-051-6/+8
|\ \ | |/ | | | | | | * commit '1a4ea00149e70383506f24648bfb52a2278fe3f7': Squashed 'json/' changes from fce9e9b3..21555a85
* | Merge commit 'b3ebd208e200797c1235c614c779f015addf1d99' into masterJulian Berman2020-08-142-0/+25
|\ \ | |/ | | | | | | * commit 'b3ebd208e200797c1235c614c779f015addf1d99': Squashed 'json/' changes from 86f52b87..fce9e9b3
* | Merge commit 'a57d8540bd272d913d57a37b45db3d9fe21a476b' into masterJulian Berman2020-08-132-1/+11
|\ \ | |/ | | | | | | * commit 'a57d8540bd272d913d57a37b45db3d9fe21a476b': Squashed 'json/' changes from ea415537..86f52b87
* | Merge commit '95874db4df84775af2429ddea7afd006523cef08'Julian Berman2020-07-251-0/+35
|\ \ | |/ | | | | | | * commit '95874db4df84775af2429ddea7afd006523cef08': Squashed 'json/' changes from 40601f6..ea41553
* | Merge commit '72d5a27256bb3029671c2ec635be05834151dd50'Julian Berman2020-06-202-0/+65
|\ \ | |/ | | | | | | * commit '72d5a27256bb3029671c2ec635be05834151dd50': Squashed 'json/' changes from 57001d26b..fc05651cc
* | Merge commit 'ba8f9ae3bb8a191c660231aab30a3cd4a67e7bcb'Julian Berman2020-06-112-1/+17
|\ \ | |/ | | | | | | * commit 'ba8f9ae3bb8a191c660231aab30a3cd4a67e7bcb': Squashed 'json/' changes from 817b724b7..57001d26b
* | Merge commit '4a4930a09fa25251ad0f02395f3c6aa0fd7e3a82'Julian Berman2020-06-0915-236/+340
|\ \ | |/ | | | | | | * commit '4a4930a09fa25251ad0f02395f3c6aa0fd7e3a82': Squashed 'json/' changes from 9d0e0eb..817b724
* | Merge commit 'cc583dfc91cd036d98fdd75ccdb48c16d0d0e945'Julian Berman2020-05-071-0/+5
|\ \ | |/ | | | | | | * commit 'cc583dfc91cd036d98fdd75ccdb48c16d0d0e945': Squashed 'json/' changes from 361620ecf..9d0e0eb31
* | Merge commit 'f40e3aa7cd52d4da653f86f40fe3aeb55d872975'Julian Berman2020-05-023-78/+82
|\ \ | |/ | | | | | | * commit 'f40e3aa7cd52d4da653f86f40fe3aeb55d872975': Squashed 'json/' changes from 71f55b36b..361620ecf
* | Merge commit 'ef1a0784695ad7eef68b8aefe75dbf42add91f58'Julian Berman2020-04-282-0/+78
|\ \ | |/ | | | | | | * commit 'ef1a0784695ad7eef68b8aefe75dbf42add91f58': Squashed 'json/' changes from d17e1ba2..2576db4d
* | Merge commit 'e0a2a712a90b92e95604c2bf0e8a3d6c748053d3'Julian Berman2020-04-253-4/+211
|\ \ | |/ | | | | | | * commit 'e0a2a712a90b92e95604c2bf0e8a3d6c748053d3': Squashed 'json/' changes from 8e2a05a9..d17e1ba2
* | Merge commit 'da5b73d6273fcb8c2aa59fe057f41f4d5f910f07'Julian Berman2020-03-231-1/+1
|\ \ | |/ | | | | | | * commit 'da5b73d6273fcb8c2aa59fe057f41f4d5f910f07': Squashed 'json/' changes from 33791274..8e2a05a9
* | Merge commit 'b24968d1f6212690cb5d220665cdd741ae59c901'Julian Berman2020-03-211-1/+1
|\ \ | |/ | | | | | | * commit 'b24968d1f6212690cb5d220665cdd741ae59c901': Squashed 'json/' changes from b70c5626..33791274
* | Merge commit 'f7930d774c893cfae814a214d9b2ba0c01957928'Julian Berman2020-02-224-1/+88
|\ \ | |/ | | | | | | * commit 'f7930d774c893cfae814a214d9b2ba0c01957928': Squashed 'json/' changes from a863dbab..d52866b3
* | Merge commit '8012a786ff8ab4f57c8e128f458c4061540f1983'Julian Berman2019-10-071-0/+0
|\ \ | |/ | | | | | | * commit '8012a786ff8ab4f57c8e128f458c4061540f1983': Squashed 'json/' changes from 2d554504..4e6c78b4
* | Merge commit '05fe96aa3669635a6f01359bf80a312002b4d7cd'Julian Berman2019-10-021-0/+84
|\ \ | |/ | | | | | | * commit '05fe96aa3669635a6f01359bf80a312002b4d7cd': Squashed 'json/' changes from 2903943b..586515ef
* | Merge commit 'a5a5a45cfa7ac901462ca8afcab544f3c2de9e1d'Julian Berman2019-09-221-0/+362
|\ \ | |/ | | | | | | * commit 'a5a5a45cfa7ac901462ca8afcab544f3c2de9e1d': Squashed 'json/' changes from 6b673312..2903943b
* | Merge commit 'eb60af03a05771bdfa07256b54b71aef8c055a3b'Julian Berman2019-03-311-0/+31
|\ \ | |/ | | | | | | * commit 'eb60af03a05771bdfa07256b54b71aef8c055a3b': Squashed 'json/' changes from 3c3881a..15ba997
* | Merge commit 'd2eb79f489f2647e2fc43fa341bb3ba7d307f4a6'Julian Berman2019-01-041-0/+16
|\ \ | |/ | | | | | | * commit 'd2eb79f489f2647e2fc43fa341bb3ba7d307f4a6': Squashed 'json/' changes from 8c3d56d..8982b0b
* | Merge commit '621e253fb34d9d55c08728d290e965287df06daf'Julian Berman2018-09-021-6/+6
|\ \ | |/ | | | | | | * commit '621e253fb34d9d55c08728d290e965287df06daf': Squashed 'json/' changes from e64ebf9..002ce0f
* | Merge commit '86baa128d16324ed62a2cc5cdf5db276d8e0d734'Julian Berman2018-05-122-0/+24
|\ \ | |/ | | | | | | * commit '86baa128d16324ed62a2cc5cdf5db276d8e0d734': Squashed 'json/' changes from cb2b906..2ca50c0
* | Merge commit 'be19a54e7a4716103177401fb57baf5ac61407df'Julian Berman2017-11-054-5/+35
|\ \ | |/ | | | | | | * commit 'be19a54e7a4716103177401fb57baf5ac61407df': Squashed 'json/' changes from 27f8c84..9567c58
* | Merge commit '8bff7e3c726f3adcb9f16a54fa5f510028c4c151'Julian Berman2017-06-103-2/+55
|\ \ | |/ | | | | | | * commit '8bff7e3c726f3adcb9f16a54fa5f510028c4c151': Squashed 'json/' changes from 3481a79..27f8c84
* | Temporarily remove these until I resolve upstream.v2.5.0Julian Berman2015-06-051-5/+0
| | | | | | | | These tests aren't self consistent.
* | Merge commit '7afa6f02eb14cbe2f5003f2836c4f16761857355'Julian Berman2015-06-053-3/+34
|\ \ | |/ | | | | | | * commit '7afa6f02eb14cbe2f5003f2836c4f16761857355': Squashed 'json/' changes from 0b657e8..3481a79
* | Merge commit 'e886fd27a6a276c784f4e8af99412950208f3f7b' into ↵perf_cache_resolvingJulian Berman2015-03-221-0/+19
|\ \ | |/ | | | | | | | | | | perf_cache_resolving * commit 'e886fd27a6a276c784f4e8af99412950208f3f7b': Squashed 'json/' changes from 9208016..0b657e8
* | Merge commit '45cf1fb8a6a0b7ea1ab8de8ea9fc7addb0ffd149'Julian Berman2014-12-071-0/+49
|\ \ | |/ | | | | | | * commit '45cf1fb8a6a0b7ea1ab8de8ea9fc7addb0ffd149': Squashed 'json/' changes from 3cef243..9208016
* | Merge commit '43075285ed7271d9caaa02caa1747ead3cbb27ef'Julian Berman2014-10-051-0/+47
|\ \ | |/ | | | | | | * commit '43075285ed7271d9caaa02caa1747ead3cbb27ef': Squashed 'json/' changes from abdd47f..3cef243
* | Merge commit 'ed332a1819789daad35de5faeb0986624f808c79'Julian Berman2014-06-011-0/+11
|\ \ | |/ | | | | | | * commit 'ed332a1819789daad35de5faeb0986624f808c79': Squashed 'json/' changes from ddef9b0..abdd47f
| * Squashed 'json/' changes from ddef9b0..abdd47fJulian Berman2014-06-0126-2164/+0
|/ | | | | | | abdd47f Add a test for large int comparisons. git-subtree-dir: json git-subtree-split: abdd47f9dff99a116c8ce09505f2e8f61433dbe8
* Squashed 'json/' changes from 0ba6722..ddef9b0Julian Berman2014-04-132-0/+10
| | | | | | | | | | ddef9b0 Add a note to the README about running sanity checks. f93cc55 Shorten the descriptions slightly. dd9a876 Merge remote-tracking branch 'fge/develop' into develop bc84af3 Add string length tests for supplementary Unicode code points git-subtree-dir: json git-subtree-split: ddef9b0415461ca948f3c0605e2eb2cc40981b95
* Merge commit 'd97c81177b325010d2a67ad45642f4ff2bf25425'Julian Berman2014-02-191-0/+32
| | | | | * commit 'd97c81177b325010d2a67ad45642f4ff2bf25425': Squashed 'json/' changes from 468fa78..0ba6722
* Merge commit '5f8aae8efc5a92c4b5f8c631f51c8b04a7141ea3'Julian Berman2013-10-271-0/+5
| | | | | * commit '5f8aae8efc5a92c4b5f8c631f51c8b04a7141ea3': Squashed 'json/' changes from b6f129e..468fa78
* Merge commit '7b74ec8aa8f2b3414cb70ffa0e5a8fe3d1e24bcd'Julian Berman2013-09-221-0/+6
| | | | | * commit '7b74ec8aa8f2b3414cb70ffa0e5a8fe3d1e24bcd': Squashed 'json/' changes from 9dc2c40..b6f129e
* Merge commit '0a93c5da6f8db71ded773af1d5609c5f2e6ba241'Julian Berman2013-06-171-0/+5
|
* Update JSON Schema Test SuiteJulian Berman2013-05-201-1/+1
| | | | Merge commit '69b18993aa7e2c630745db80df6392a2f758a52e'
* Merge commit '8c1729a55baef2c79b2784f87b48e41d8aa4669e'Julian Berman2013-04-271-1/+22
|
* Remove test suite changes that slipped through.Julian Berman2013-02-241-8/+16
|
* Merge remote-tracking branch 'remotes/origin/master' into draft4Chase Sterling2013-02-224-2/+129
|\
| * Merge commit '9fbaf7ea41abaeed40742ab1f8b3519c3e5954bb' as 'json'Julian Berman2013-02-2226-0/+2085
| |
| * Switching to actual subtree.Julian Berman2013-02-2225-1972/+0
| |
| * Update the test suite.Julian Berman2013-02-156-7/+80
| |