Commit graph

  • 9bc2a7fa25
    👷 add Code Inspector via GitHub Action Niels Lohmann 2020-06-03 13:39:56 +0200
  • c24218afe8
    Merge remote-tracking branch 'origin/develop' into develop Niels Lohmann 2020-06-03 13:38:15 +0200
  • 2c4be7d65c
    Merge pull request #2152 from TotalCaesar659/patch-1 Niels Lohmann 2020-06-03 12:31:33 +0200
  • 2ad847f21b
    🔨 fix doxygen link Niels Lohmann 2020-06-03 12:30:42 +0200
  • fdf5a63dfd
    🔨 fix Doxygen link Niels Lohmann 2020-06-03 12:30:10 +0200
  • 309acb445a
    Merge pull request #2153 from dota17/issue#1972 Niels Lohmann 2020-06-03 12:26:17 +0200
  • eca4b8785c fix test case in PR#1006 chenguoping 2020-06-02 15:44:26 +0800
  • fff1499963 add comment about PR#1006 chenguoping 2020-06-02 15:43:57 +0800
  • 8cd39578e3 add test case chenguoping 2020-06-01 11:34:03 +0800
  • 5ea205f570
    👷 install clang Niels Lohmann 2020-05-30 18:17:54 +0200
  • 5f10d5d156
    👷 install clang Niels Lohmann 2020-05-30 18:15:13 +0200
  • 7c0c522b96
    👷 install clang Niels Lohmann 2020-05-30 18:11:54 +0200
  • 522ec5d7bd
    👷 install clang Niels Lohmann 2020-05-30 18:06:52 +0200
  • 7e5c2a480a
    👷 install clang Niels Lohmann 2020-05-30 18:04:07 +0200
  • 9c971c2d2f
    👷 install clang Niels Lohmann 2020-05-30 17:40:27 +0200
  • 4ba8c95794
    👷 install clang Niels Lohmann 2020-05-30 13:41:18 +0200
  • fbd3e8f677
    👷 install clang Niels Lohmann 2020-05-30 13:35:19 +0200
  • 0309025b45
    👷 set full path Niels Lohmann 2020-05-30 13:28:44 +0200
  • 9191926fff
    👷 use Makefiles Niels Lohmann 2020-05-30 13:23:13 +0200
  • 42ef2a5adb
    👷 use Clang compiler Niels Lohmann 2020-05-30 13:15:56 +0200
  • 2182935397
    👷 add Clang/Windows step Niels Lohmann 2020-05-30 13:07:23 +0200
  • 4350c5ed97 fix bug in issue#1972 chenguoping 2020-05-30 17:15:56 +0800
  • 0aa13599f0
    Update URLs to HTTPS TotalCaesar659 2020-05-30 06:02:25 +0300
  • 0da131d717 minor readme correction Francois Chabot 2020-05-28 17:12:26 -0400
  • b715a70673 changed macro order to satisfy clang Francois Chabot 2020-05-28 12:26:29 -0400
  • 7646253940 fix inconsistent fwd declaration Francois Chabot 2020-05-28 12:20:02 -0400
  • ce3143a038 use correct deprecation macro Francois Chabot 2020-05-28 12:16:10 -0400
  • d575534471 brought back the from_*(ptr, len) syntax with a deprecation warning Francois Chabot 2020-05-28 12:13:43 -0400
  • 248f310215 cleaned up custom iterator example Francois Chabot 2020-05-28 10:14:55 -0400
  • 897061c434 amalgamate Francois Chabot 2020-05-28 10:11:19 -0400
  • 7ceb06baac Merge branch '1813-user-input' of https://github.com/FrancoisChabot/json into 1813-user-input Francois Chabot 2020-05-28 09:30:07 -0400
  • dcf6175978 use the correct convention for boolean operators Francois Chabot 2020-05-28 09:29:38 -0400
  • 23c8ab95da
    👥 update contributor list Niels Lohmann 2020-05-28 14:24:08 +0200
  • 53ef076715
    🔧 add more warning flags from GCC 10 Niels Lohmann 2020-05-28 13:46:56 +0200
  • 2edb5cb999
    👷 fix -DJSON_BuildTests=On parameter placement Niels Lohmann 2020-05-28 13:46:47 +0200
  • 61832afe15
    Merge pull request #2144 from XyFreak/gcc10_type_limits Niels Lohmann 2020-05-28 12:59:57 +0200
  • 5ff4d7b7ff
    Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2020-05-28 12:54:13 +0200
  • fcda998ee2
    🔧 add more warning flags from GCC 10 Niels Lohmann 2020-05-28 12:53:22 +0200
  • d3caf93ab0
    Merge branch 'develop' into 1813-user-input Francois Chabot 2020-05-28 03:40:34 -0400
  • bfcd32c099 removed clang-format Francois Chabot 2020-05-28 03:16:24 -0400
  • 3a91a05db6 added custom input to readme Francois Chabot 2020-05-28 03:13:39 -0400
  • a4f1cf4d00 better parse documentation Francois Chabot 2020-05-28 02:50:58 -0400
  • 76b49f9ee6 misc formatting fixes Francois Chabot 2020-05-28 02:29:53 -0400
  • 9ec0e4c25b
    Merge pull request #2140 from nlohmann/issue1715 Niels Lohmann 2020-05-28 07:52:26 +0200
  • a01759af0f
    Merge pull request #2143 from quentin-dev/develop Niels Lohmann 2020-05-28 07:50:27 +0200
  • 377995f495 forcefully exclude arrays from being interpreted as pointers Francois Chabot 2020-05-27 18:21:38 -0400
  • b9416a26aa correct ADL lookup of arrays on Mac and Windows Francois Chabot 2020-05-27 13:21:23 -0400
  • f1969e60a3 reamalgamate Francois Chabot 2020-05-27 12:56:26 -0400
  • 5684d9a498 unified input API Francois Chabot 2020-05-27 12:40:04 -0400
  • e44418ea26
    readme: fix typo in CMake FetchContent example Quentin Barbarat 2020-05-27 13:51:13 +0200
  • bb9619ef8b
    📝 request more details in question template Niels Lohmann 2020-05-27 13:22:34 +0200
  • 325e8ab8ab
    🔧 explicitly switch on tests in CI Niels Lohmann 2020-05-27 13:22:14 +0200
  • 23051df2c7 Cast character to unsigned for comparison Tobias Kux 2020-05-27 13:15:31 +0200
  • ed5c28d00c
    👥 update contributor list Niels Lohmann 2020-05-27 13:07:24 +0200
  • d70d06ae41
    Merge pull request #2137 from dota17/MSC_VER Niels Lohmann 2020-05-27 08:49:19 +0200
  • e3d9b3d755
    📝 add documentation of parser callbacks Niels Lohmann 2020-05-26 14:16:13 +0200
  • ace594da6a
    Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs Niels Lohmann 2020-05-26 13:17:55 +0200
  • 3c60a66c4c
    Merge pull request #2104 from dota17/issue#2086 Niels Lohmann 2020-05-26 13:15:06 +0200
  • 27fe50dc92
    📝 add example for contains #2133 Niels Lohmann 2020-05-26 12:46:04 +0200
  • 25aab7ee41
    Merge pull request #2136 from aokellermann/CircleCI_GCC_BleedingEdge Niels Lohmann 2020-05-26 12:39:42 +0200
  • eb50fbf926 fix issue 2112 chenguoping 2020-05-26 16:43:16 +0800
  • 49000cd77d Update documentation to reflect addition of Arch Linux CI testing. Antony Kellermann 2020-05-25 20:46:39 -0400
  • 5a72cfa0c3 Add base and base-devel to list of arch linux programs to install. Antony Kellermann 2020-05-25 20:43:15 -0400
  • 1d57ddd2d4 Add -y flag to pacman to sync repos. Antony Kellermann 2020-05-25 20:24:54 -0400
  • 41a84b1202 Add workflows for CircleCI so that build_stable and build_bleeding_edge jobs can run concurrently. Antony Kellermann 2020-05-25 20:17:02 -0400
  • eff2f51071 Add build_bleeding_edge job to CircleCI, mimicking the original job except using the latest Arch Linux docker image. Antony Kellermann 2020-05-25 20:14:49 -0400
  • bf4a090075 Rename build job to build_stable to be more descriptive. Antony Kellermann 2020-05-25 20:12:54 -0400
  • 413df0fd88
    📝 add more content to iterator page Niels Lohmann 2020-05-25 14:03:11 +0200
  • 95a3c76643
    📝 make examples collapsible Niels Lohmann 2020-05-24 22:45:38 +0200
  • ddf92606ab
    📝 add PlantUML Niels Lohmann 2020-05-24 21:05:35 +0200
  • 3400af21cd
    📝 add release page Niels Lohmann 2020-05-24 13:40:43 +0200
  • a8f0cd15df
    📝 add mkdocs Niels Lohmann 2020-05-24 13:03:04 +0200
  • c92a696852
    📝 update documentation Niels Lohmann 2020-05-22 18:21:37 +0200
  • 88292d9499
    🚨 remove redundant assertions Niels Lohmann 2020-05-22 14:19:07 +0200
  • 225fa58f16
    🚧 add fix from #1715 Niels Lohmann 2020-05-20 22:20:40 +0200
  • a82c80e9af
    Merge pull request #2125 from nlohmann/binary_type Niels Lohmann 2020-05-20 18:58:29 +0200
  • ae29456b3f
    🚸 overwork report templates Niels Lohmann 2020-05-20 18:57:21 +0200
  • a861bdb81f
    Merge pull request #2121 from gistrec/fix_compilation_error_msvc Niels Lohmann 2020-05-19 13:55:37 +0200
  • 4d39644bd0
    💚 fix build Niels Lohmann 2020-05-19 13:45:52 +0200
  • 21b1680ea1
    🚚 rename binary_array() to binary() Niels Lohmann 2020-05-19 13:30:22 +0200
  • 86b053e916
    Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type Niels Lohmann 2020-05-19 13:10:35 +0200
  • 952a87a4f4
    🚚 move byte container outside detail namespace Niels Lohmann 2020-05-19 13:08:18 +0200
  • 79347b484b
    improve test coverage Niels Lohmann 2020-05-19 12:40:32 +0200
  • 5cfa8a586e
    👷 run workflows on pull requests Niels Lohmann 2020-05-18 14:01:54 +0200
  • b7ff40029a
    💥 change serialization of binary values Niels Lohmann 2020-05-18 13:53:20 +0200
  • 9eb19bcc27
    add more tests for binary type Niels Lohmann 2020-05-18 12:33:26 +0200
  • 9e765f5aed Fixed std::numeric_limit::max() call gistrec 2020-05-18 10:25:38 +0000
  • 3f0cf26f7a changes to the single header were applied gistrec 2020-05-18 10:17:45 +0000
  • 454480f581 fixed a compilation error in MSVC gistrec 2020-05-18 14:57:04 +0700
  • 5dec7166ea
    Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type Niels Lohmann 2020-05-18 09:13:22 +0200
  • 16d78a82e0
    👷 add link to GitHub workflows Niels Lohmann 2020-05-18 09:12:18 +0200
  • c237aa3a68
    Merge pull request #2119 from nlohmann/release_cleanup Niels Lohmann 2020-05-18 09:07:36 +0200
  • 904642f261
    ♻️ rename internal_binary_t with binary_t Niels Lohmann 2020-05-17 22:50:27 +0200
  • 1ce8a5be87
    Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup Niels Lohmann 2020-05-17 14:11:49 +0200
  • dead99eb0e
    🔨 overwork binary subtypes Niels Lohmann 2020-05-17 13:51:59 +0200
  • ab6e76dd05
    Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type Niels Lohmann 2020-05-17 12:27:58 +0200
  • 3799b3f8dd
    Merge pull request #2116 from nlohmann/issue2113 Niels Lohmann 2020-05-17 12:19:06 +0200
  • 6154d50a9f
    Merge pull request #2115 from nlohmann/issue2089 Niels Lohmann 2020-05-17 12:17:17 +0200
  • 28e20bd9e4
    🚨 fix warnings #2113 Niels Lohmann 2020-05-16 14:26:17 +0200
  • ad32f576bd
    Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup Niels Lohmann 2020-05-16 13:22:23 +0200