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

Commit graph

  • f1768a540a
         Merge branch 'release/3.3.0' into develop Niels Lohmann 2018-10-05 12:59:41 +0200
  • aafad2be1f
         Merge branch 'release/3.3.0' Niels Lohmann 2018-10-05 12:59:28 +0200
  • cdfe6ceda6
         🔖 set version to 3.3.0 Niels Lohmann 2018-10-05 11:20:10 +0200
  • b968faa882
         🔖 set version to 3.3.0 Niels Lohmann 2018-10-05 10:59:33 +0200
  • cd518fbbab
         📝 small update to pass test suite Niels Lohmann 2018-10-05 08:58:38 +0200
  • e8427061a0 Thirdparty benchmark: Fix Clang detection. Gregorio Litenstein 2018-10-05 02:01:43 -0300
  • b911654857
         📝 updated contributor list Niels Lohmann 2018-10-04 22:30:18 +0200
  • bb55885215
         💄 cleaned code Niels Lohmann 2018-10-04 20:42:19 +0200
  • 5c7d27c338
         Merge pull request #1272 from antonioborondo/fix_warning Niels Lohmann 2018-10-04 20:33:26 +0200
  • b6fdad9acd Remove anonymous namespace Antonio Borondo 2018-10-03 13:51:49 +0100
  • 7c385a4844 Fix error: 'wide_string_input_helper' was not declared in this scope Antonio Borondo 2018-10-03 12:41:34 +0100
  • 9ba3f79667 Fix error: explicit specialization in non-namespace scope Antonio Borondo 2018-10-03 12:26:24 +0100
  • 8d1585f065 Change implementation to use templates Antonio Borondo 2018-10-03 11:44:02 +0100
  • ad3c216bb5 Generate header Antonio Borondo 2018-10-03 10:56:46 +0100
  • 0231059290 Fix warning Antonio Borondo 2018-10-03 11:13:35 +0100
  • 9f18e17063
         Merge pull request #1270 from chuckatkins/add-more-cmake-docs Niels Lohmann 2018-10-03 10:11:27 +0200
  • 53ec0a16f3
         Merge pull request #1271 from chuckatkins/cleanup-deprecated-warnings Niels Lohmann 2018-10-02 22:07:18 +0200
  • 4c617611e2 docs: Add additional CMake documentation Chuck Atkins 2018-10-01 14:09:31 -0400
  • 829571ab5c Turn off additional deprecation warnings for GCC. Chuck Atkins 2018-10-01 10:34:23 -0400
  • c8231eff75
         Merge pull request #1260 from chuckatkins/fix-cmake-target-alias Niels Lohmann 2018-10-01 17:44:50 +0200
  • 02e653bdf7 docs: add a note in the readme about using the CMake imported target Chuck Atkins 2018-09-27 08:21:19 -0400
  • 564506a885 cmake: add import config tests Chuck Atkins 2018-09-26 10:46:34 -0400
  • 1729db85c1 cmake: fix package config to deal with versioning and namespaces Chuck Atkins 2018-09-26 13:08:49 -0400
  • 910a895027
         Merge pull request #1238 from theodelrieu/fix/1237 Niels Lohmann 2018-09-29 14:50:54 +0200
  • 1fae82b7a7
         Merge branch 'develop' into fix/1237 Niels Lohmann 2018-09-29 14:50:36 +0200
  • 22e55349a6
         📝 added Wandbox link #1227 Niels Lohmann 2018-09-29 14:33:39 +0200
  • 70e587c3da
         📝 added Wandbox link #1227 Niels Lohmann 2018-09-29 14:33:21 +0200
  • d26f39466e
         Merge pull request #1231 from theodelrieu/feature/get_with_parameter Niels Lohmann 2018-09-29 14:30:04 +0200
  • c61a9071ae
         🚨 fixed a compilation issue with ICPC #755 Niels Lohmann 2018-09-29 11:50:14 +0200
  • e8730e5e82 BSON: Reworked binary_reader::get_bson_cstr() Julian Becker 2018-09-29 11:50:01 +0200
  • b59a58406e
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-09-29 11:48:52 +0200
  • 4e54c9a13d
         🚨 fixed a compilation issue with ICPC #755 Niels Lohmann 2018-09-29 11:48:49 +0200
  • 0a09db9cc2 BSON: Extend binary_reader::get_number to be able to hanlde little endian input to get rid of binary_reader::get_number_little_endian Julian Becker 2018-09-29 11:33:01 +0200
  • 95432c34f9
         Merge pull request #1262 from knilch0r/patch-1 Niels Lohmann 2018-09-29 10:58:10 +0200
  • 8c1387cfb3
         unit-testsuites.cpp: fix hangup if file not found knilch 2018-09-28 11:33:23 +0200
  • 521fe49fec
         Add basic_json::get_to function. Théo DELRIEU 2018-09-10 12:56:24 +0200
  • 680a4ab672
         Merge pull request #1257 from henryiii/gcc48 Niels Lohmann 2018-09-28 10:05:17 +0200
  • 7a37ba0c02 Adding 4.8 test to travis Henry Fredrick Schreiner 2018-09-25 18:15:29 +0200
  • ef358ae695 BSON: Fixed hangup in case of incomplete bson input and improved test coverage Julian Becker 2018-09-25 20:34:25 +0200
  • 99b7c7c8ef Patch nlohmann/json for GCC 4.8 Chris Harris 2018-09-20 11:19:33 -0400
  • bce4816275 BSON: Added test case for the different input/output_adapters Julian Becker 2018-09-24 23:35:19 +0200
  • 763705c2a7 Fix: Add missing begin() and end() member functions to alt_string Julian Becker 2018-09-24 19:29:39 +0200
  • e184b6ecf2
         Merge pull request #1252 from koponomarenko/fix-meson-build Niels Lohmann 2018-09-22 14:49:03 +0200
  • 88b055c2df
         Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround Niels Lohmann 2018-09-22 14:14:56 +0200
  • 8799759b85 Add version and license to meson.build Kostiantyn Ponomarenko 2018-09-20 21:54:10 +0300
  • 4e52277b70
         Fix issue #1237 Théo DELRIEU 2018-09-12 17:01:27 +0200
  • e4bc98d036
         Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility Niels Lohmann 2018-09-19 20:46:51 +0200
  • 4d780b091b Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently. David Guthrie 2018-09-18 16:38:59 -0400
  • 3b1a5cafad Use a version check to provide backwards comatible imported target names. Chuck Atkins 2018-09-18 13:59:19 -0400
  • 99939d6340
         📝 added lgtm.com badge Niels Lohmann 2018-09-18 19:27:52 +0200
  • 4e2f35d4c2
         👷 adding Xcode 10 worker Niels Lohmann 2018-09-18 19:22:30 +0200
  • 7fa3b8865c
         Merge pull request #1221 from rivertam/better-error-305 Niels Lohmann 2018-09-18 12:49:07 +0200
  • 8f07ab6392 Replace "key-style argument" with "string argument" Ben Berman 2018-09-17 15:36:38 -0400
  • df33a90774 BSON: Bugfix for non-empty arrays Julian Becker 2018-09-15 14:08:38 +0200
  • cf485c2907 BSON: Support for arrays Julian Becker 2018-09-15 13:54:08 +0200
  • 120d1d77d4 BSON: test case for a more complex document Julian Becker 2018-09-15 13:40:20 +0200
  • 5ce7d6bdd7 BSON: support objects with objects as members Julian Becker 2018-09-15 13:03:42 +0200
  • 83b427ad67 BSON: unsigned integers Julian Becker 2018-09-15 12:11:21 +0200
  • c0d8921a67 BSON: support objects with int64 members Julian Becker 2018-09-15 12:00:53 +0200
  • 7ee361f7ad BSON: support objects with int32 members Julian Becker 2018-09-15 11:54:17 +0200
  • c5ef023171 BSON: support objects with null members Julian Becker 2018-09-15 11:38:26 +0200
  • 6c447de076 BSON: Support objects with string members Julian Becker 2018-09-15 11:33:24 +0200
  • 0c0f2e44b5 BSON: support doubles Julian Becker 2018-09-15 03:23:54 +0200
  • 9a0dddc5d2 BSON: Object with single boolean Julian Becker 2018-09-15 03:08:50 +0200
  • 5f5836ce1c BSON: Support empty objects Julian Becker 2018-09-15 00:43:39 +0200
  • f06c8fd8e3 BSON: serialization of non-objects is not supported Julian Becker 2018-09-14 22:58:22 +0200
  • 186c747a19
         Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix Niels Lohmann 2018-09-10 20:52:11 +0200
  • 6b5334c167 Move lambda out of unevaluated context mandreyel 2018-09-10 10:02:38 +0200
  • ebb3c03293
         🎨 cleanup after #1228 Niels Lohmann 2018-09-09 18:19:33 +0200
  • d3428b35c5
         Merge pull request #1228 from theodelrieu/remove_static_asserts Niels Lohmann 2018-09-09 18:12:43 +0200
  • aea648bb7a
         remove now-useless traits. check for is_basic_json where needed Théo DELRIEU 2018-09-07 12:42:49 +0200
  • 4b4bbceebf
         make from_json SFINAE-correct Théo DELRIEU 2018-09-06 16:54:42 +0200
  • f7971f04a5
         make to_json SFINAE-correct Théo DELRIEU 2018-09-06 16:08:01 +0200
  • f7c8a2145a
         refactor from/to_json(CompatibleArrayType) Théo DELRIEU 2018-09-05 17:59:10 +0200
  • 628f76729e
         do not check for compatible_object_type in compatible_array_type Théo DELRIEU 2018-09-05 17:26:32 +0200
  • 29f72966c3
         refactor is_compatible_type, remove conjunction & co Théo DELRIEU 2018-09-05 17:01:52 +0200
  • 77967e6548
         refactor is_compatible_integer_type Théo DELRIEU 2018-09-05 16:56:45 +0200
  • 13760857ff
         refactor is_compatible_array_type Théo DELRIEU 2018-09-05 16:49:27 +0200
  • 924e95c6e8
         refactor is_compatible_string_type Théo DELRIEU 2018-09-05 16:42:55 +0200
  • e84195ab7b
         refactor is_compatible_object_type Théo DELRIEU 2018-09-05 16:35:30 +0200
  • b59c3367c9
         use detected instead of has_* traits Théo DELRIEU 2018-09-05 16:02:13 +0200
  • 1ea8cd128c
         fix void_t for older compilers Théo DELRIEU 2018-09-07 12:15:35 +0200
  • eb30ff0615
         🚨 fixed a compiler warning #1224 Niels Lohmann 2018-09-06 07:25:19 +0200
  • ad053ef09c Fix tests for improved error 305(hopefully) Ben Berman 2018-08-30 13:19:09 -0400
  • bbdfe7dea6 Improve error messages for error 305 Ben Berman 2018-08-30 12:35:51 -0400
  • d713727f22
         Merge pull request #1202 from dennisfischer/develop Niels Lohmann 2018-08-25 10:56:30 +0200
  • 04597c3a66
         Merge pull request #1214 from devsisters/fix-1213 Niels Lohmann 2018-08-24 17:54:28 +0200
  • aada309f61
         Fix #1213 Hyeon Kim 2018-08-24 21:52:24 +0900
  • 359f98d140
         Merge branch 'release/3.2.0' into develop Niels Lohmann 2018-08-20 19:36:25 +0200
  • 8c20571136
         Merge branch 'release/3.2.0' Niels Lohmann 2018-08-20 19:36:10 +0200
  • dfe607c6ff Export package to allow builds without installing Dennis Fischer 2018-08-20 09:23:12 +0200
  • 9f3857ef6f
         🔖 set version to 3.2.0 Niels Lohmann 2018-08-18 18:46:15 +0200
  • 7608a64e1e
         🔨 fixed amalgamation Niels Lohmann 2018-08-18 18:14:12 +0200
  • a7b02bdce0
         🔖 preparing 3.2.0 release Niels Lohmann 2018-08-18 17:48:49 +0200
  • c6a482b16c
         📝 added example for sax_parse Niels Lohmann 2018-08-18 15:42:18 +0200
  • 5ad52f4167
         ⬆️ Catch 1.12.0 Niels Lohmann 2018-08-18 12:02:12 +0200
  • 3811daa8a3
         📝 release preparation Niels Lohmann 2018-08-18 12:00:14 +0200
  • 6899fa304c
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2018-08-18 08:15:06 +0200
  • 57faaf42ca
         🚨 fixed a compiler warning Niels Lohmann 2018-08-18 08:15:03 +0200
  • f78ac4fbd3
         Merge pull request #1200 from thyu/develop Niels Lohmann 2018-08-18 08:14:04 +0200