j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 476b2e09be
         💚 added regression tests for #972 and #977 Niels Lohmann 2018-03-06 20:13:31 +0100
  • 62030615a0
         Merge pull request #986 from theodelrieu/fix/basic_json_conversion Niels Lohmann 2018-03-06 19:27:39 +0100
  • 5beab80553
         🔨 using the SAX-DOM parser Niels Lohmann 2018-03-06 18:17:07 +0100
  • faf2546a15
         🔨 simplified SAX-DOM parser Niels Lohmann 2018-03-06 07:19:05 +0100
  • 5b9d03cfdb
         🔨 added SAX-DOM-Parser Niels Lohmann 2018-03-05 21:06:00 +0100
  • 9d27429527
         🔨 added error messages to SAX interface Niels Lohmann 2018-03-05 16:46:35 +0100
  • 86991d5204
         Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-05 16:16:43 +0100
  • fdecbf6e1e
         Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition Niels Lohmann 2018-03-05 15:57:57 +0100
  • fd30ad8a14 did make amalgamate Mike Bogdanov 2018-03-02 11:47:35 +0300
  • 2a2ed799b1 pvs_studio fix. misprinted condition Mike Bogdanov 2018-03-02 11:12:44 +0300
  • 8d104e6fe3
         💚 fixed test case Niels Lohmann 2018-02-28 22:40:48 +0100
  • 5773e164bb
         🚨 fixed a linter warning Niels Lohmann 2018-02-28 19:59:54 +0100
  • 8711ec6034
         support construction from other basic_json types Théo DELRIEU 2018-02-27 12:11:04 +0100
  • c22f2d41f3
         missing CHECK_NOTHROW in unit-udt Théo DELRIEU 2018-02-27 11:09:53 +0100
  • 3ff9455332
         🔨 added a SAX-DOM-Parser Niels Lohmann 2018-02-26 23:39:23 +0100
  • 21352c4d8e
         ♻️ refactored SAX parser Niels Lohmann 2018-02-26 20:08:12 +0100
  • 981e226ca2
         Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-02-26 20:07:52 +0100
  • 1f3d2a3be7
         📝 overworked README Niels Lohmann 2018-02-26 17:37:24 +0100
  • 13ca723c38
         Merge pull request #981 from wla80/develop Niels Lohmann 2018-02-26 16:51:51 +0100
  • 05d3bf1699 Make integration section concise Wilson 2018-02-23 15:29:42 -0800
  • 8d6b3d44d6
         👌 fixed some compiler warnings Niels Lohmann 2018-02-25 18:35:16 +0100
  • 8c7f46f7d0
         🔨 removed a logic error and improved coverage Niels Lohmann 2018-02-25 17:10:30 +0100
  • 922f7a3d0e
         ✅ added more tests for SAX parsing Niels Lohmann 2018-02-25 14:21:30 +0100
  • ac230e8b4b
         🔨 fixed test cases to be more robust Niels Lohmann 2018-02-25 10:44:47 +0100
  • 374ebacc51
         ✨ added a SAX parser #971 Niels Lohmann 2018-02-24 18:04:07 +0100
  • 8968adcd53
         Merge branch 'release/3.1.1' into develop Niels Lohmann 2018-02-13 19:36:35 +0100
  • c8ea63a31b
         Merge branch 'release/3.1.1' Niels Lohmann 2018-02-13 19:36:20 +0100
  • 8424d10e45
         🔖 set version to 3.1.1 Niels Lohmann 2018-02-13 15:59:32 +0100
  • 938c861a09
         🔖 set version to 3.1.1 Niels Lohmann 2018-02-12 22:59:36 +0100
  • 94b7a8da66
         💄 fixed indentation Niels Lohmann 2018-02-12 20:46:14 +0100
  • 20b5f4d89c
         Merge pull request #969 from theodelrieu/fix/924 Niels Lohmann 2018-02-12 18:17:59 +0100
  • 01d6118828
         Fix constraints on from_json(CompatibleArrayType) Théo DELRIEU 2018-02-12 10:47:17 +0100
  • b02e3bb0b6
         Merge pull request #957 from theodelrieu/fix_coveralls Niels Lohmann 2018-02-12 15:02:21 +0100
  • 41db7cd818
         Make the coveralls job use the multiple header version Théo DELRIEU 2018-02-10 21:26:15 +0100
  • 447f5421eb
         🔨 overworked release target Niels Lohmann 2018-02-11 16:50:01 +0100
  • 61f0bfb15c
         🔨 enforce using Python 2 for the wandbox script Niels Lohmann 2018-02-11 14:46:15 +0100
  • 548f488941
         🔨 overworked Makefile Niels Lohmann 2018-02-10 14:46:39 +0100
  • 865ff00de0
         📝 updated documentation wrt. objects #963 Niels Lohmann 2018-02-09 23:37:20 +0100
  • addbbbe136
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-02-09 23:32:37 +0100
  • 0a64982e86
         📝 cleanup after #954 Niels Lohmann 2018-02-09 23:32:28 +0100
  • e5d538c5ea
         Merge pull request #954 from pfultz2/patch-1 Niels Lohmann 2018-02-09 23:28:54 +0100
  • 2dda87c3b7
         Merge branch 'feature/coverage_multi' into develop Niels Lohmann 2018-02-09 23:01:56 +0100
  • 5731695d7b
         Clarify dev version and add space after the word flag. Paul Fultz II 2018-02-09 15:45:20 -0600
  • 74675dd69c
         ⏪ back to the original version Niels Lohmann 2018-02-09 22:40:52 +0100
  • 50863c5a09
         Latest updates based on feedback Paul Fultz II 2018-02-09 15:35:46 -0600
  • ab05df3a48
         🔨 another try Niels Lohmann 2018-02-09 22:27:08 +0100
  • b455154cc9
         🔨 another try Niels Lohmann 2018-02-09 22:18:51 +0100
  • 1e8f4d6ab3
         🔨 more trying Niels Lohmann 2018-02-09 22:11:05 +0100
  • 316634e129
         🔨 added quotes around parameters Niels Lohmann 2018-02-09 21:54:32 +0100
  • 0111f3187e
         🔨 working on #953 Niels Lohmann 2018-02-09 21:30:15 +0100
  • 83db7876c5
         🏁 removing test case that fails on MSVC #962 Niels Lohmann 2018-02-09 18:32:12 +0100
  • 33a9b00ce6
         🐛 fix for #962 Niels Lohmann 2018-02-06 22:38:53 +0100
  • 8b457ace25
         🐛 fixing CBOR's indefinity length strings #961 Niels Lohmann 2018-02-06 20:43:03 +0100
  • 556e30f759
         Merge pull request #955 from patrikhuber/patch-1 Niels Lohmann 2018-02-06 20:18:14 +0100
  • ee76436592
         Change to angle brackets Patrik Huber 2018-02-06 11:29:37 +0000
  • 737cffe0cb
         🔨 fixed directory for lcov coverage Niels Lohmann 2018-02-04 20:58:50 +0100
  • ae688016f6
         Changed links from master to develop branch Patrik Huber 2018-02-04 12:41:46 +0000
  • 2b7b39c72d
         🚀 added release target #956 Niels Lohmann 2018-02-04 13:29:23 +0100
  • 44b40d7c6a
         Fix links in README.md Patrik Huber 2018-02-03 15:48:02 +0000
  • 3402260983
         Add a note about installing the library with cget Paul Fultz II 2018-02-02 11:13:13 -0600
  • 3a887dc9fe
         👷 fixed coveralls Niels Lohmann 2018-02-02 07:56:30 +0100
  • 5c2a0a511e
         👷 fixed coveralls Niels Lohmann 2018-02-02 07:31:57 +0100
  • b779666916
         👷 re-added homebrew tests Niels Lohmann 2018-02-02 00:20:04 +0100
  • 97309f0da9
         Merge branch 'release/3.1.0' into develop Niels Lohmann 2018-02-02 00:06:17 +0100
  • 15acf260ca
         Merge branch 'release/3.1.0' Niels Lohmann 2018-02-02 00:05:55 +0100
  • a8fcfd9880
         👷 fixed travis file Niels Lohmann 2018-02-01 22:34:14 +0100
  • f5c03999d0
         🔨 fixed benchmark compilation Niels Lohmann 2018-02-01 22:26:26 +0100
  • 0258484626
         🔖 set version to 3.1.0 Niels Lohmann 2018-02-01 22:20:26 +0100
  • ce7d0ebf5d
         Merge pull request #944 from theodelrieu/fix/cmake_install Niels Lohmann 2018-02-01 18:39:07 +0100
  • 14cd019861
         fix cmake install directory (for real this time) Théo DELRIEU 2018-01-29 11:21:11 +0100
  • 9958dde3da
         Merge pull request #950 from kaidokert/develop Niels Lohmann 2018-02-01 09:29:53 +0100
  • aed4a080bf Templatize std::string in binary_reader #941 Kaido 2018-01-31 23:01:01 -0800
  • e8bf1f62f7
         ✨ added define for library version #948 #943 Niels Lohmann 2018-01-31 22:36:18 +0100
  • 552d153842
         📝 added more statistics on binary formats Niels Lohmann 2018-01-31 21:54:38 +0100
  • 60e2d28eb7
         🐛 fix for #947 Niels Lohmann 2018-01-31 20:53:13 +0100
  • 51c774f208
         📝 added documentation for binary formats Niels Lohmann 2018-01-31 17:23:11 +0100
  • 57e6fddd90
         🚨 fixed warnings Niels Lohmann 2018-01-30 23:57:49 +0100
  • f7131715b1
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-01-30 23:20:39 +0100
  • ce273af9b6
         📝 added documentation for binary formats Niels Lohmann 2018-01-30 23:20:36 +0100
  • ae235139b9
         Merge pull request #940 from kaidokert/develop Niels Lohmann 2018-01-29 22:04:26 +0100
  • 8049442c2a
         🔨 rename yytext to token_buffer (fixes #933) Niels Lohmann 2018-01-29 21:56:13 +0100
  • d0c9e5fffc Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938 Kaido 2018-01-28 14:42:13 -0800
  • b3bd3b726b
         📝 added link to OSS-Fuzz project repository Niels Lohmann 2018-01-28 21:02:02 +0100
  • 52e9449563
         📝 added more functions to overview Niels Lohmann 2018-01-28 20:44:45 +0100
  • cb4a9c85cb
         🔨 excluded code from coverage Niels Lohmann 2018-01-28 17:55:40 +0100
  • 1483d39c91
         🔨 moved class json_pointer into separate file #920 Niels Lohmann 2018-01-28 15:36:56 +0100
  • e95578f884
         📝 documented JSON Merge Patch (RFC 7386) Niels Lohmann 2018-01-28 14:36:17 +0100
  • 102c474397
         🔨 clean up Niels Lohmann 2018-01-28 14:13:02 +0100
  • 6855bbb902
         🔨 split "parsing" directory to "input" and "output" Niels Lohmann 2018-01-28 13:15:03 +0100
  • 05f49fa401
         ✅ added roundtrip tests for UBJSON Niels Lohmann 2018-01-27 18:47:32 +0100
  • f0b26c8f38
         ✅ added fuzzer for UBJSON input Niels Lohmann 2018-01-27 18:38:11 +0100
  • b0a68f540f
         ✅ added roundtrip tests for UBJSON Niels Lohmann 2018-01-27 18:37:55 +0100
  • 1be3935e9d
         📝 cleanup after #936 Niels Lohmann 2018-01-27 17:43:44 +0100
  • 7aace7c976
         Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning Niels Lohmann 2018-01-27 16:51:52 +0100
  • 0e2211df0e
         Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd Niels Lohmann 2018-01-25 17:11:21 +0100
  • 95cf1fefaa Removed compiler warning about unused variable 'kMinExp'. zerodefect 2018-01-25 12:51:48 +0000
  • 355c1e946b
         👷 added task to check amalgamation #906 Niels Lohmann 2018-01-23 18:00:12 +0100
  • dbfd7e532b
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-01-23 16:33:10 +0100
  • 3c68a796df
         🔥 deprecated iterator_wrapper #874 Niels Lohmann 2018-01-23 16:33:08 +0100
  • f05c3edc21
         Merge pull request #930 from Pipeliner/develop Niels Lohmann 2018-01-23 07:32:23 +0100