Commit graph

  • 86b0732a10
    📝 added public key used for commits and releases Niels Lohmann 2018-05-03 18:11:42 +0200
  • ed69e50ad2
    📄 added SPDX-License-Identifier Niels Lohmann 2018-05-03 17:41:45 +0200
  • 5bc4ff9da3
    Merge branch 'feature/wstring' into develop Niels Lohmann 2018-04-29 17:29:57 +0200
  • fa3e42f826
    Merge branch 'develop' into feature/wstring Niels Lohmann 2018-04-29 13:16:12 +0200
  • b5d1755dfb
    🔥 removed commented-out test cases #1060 Niels Lohmann 2018-04-22 15:41:42 +0200
  • 0ab8fab338
    Merge pull request #1058 from dns13/patch-1 Niels Lohmann 2018-04-17 23:26:00 +0530
  • 65b4d8251b
    Fix typo in single_include, too Jan Schöppach 2018-04-17 13:02:36 +0200
  • 53fb230098
    Fix typo Jan Schöppach 2018-04-17 12:08:44 +0200
  • 46ec2fddf8
    📝 updated THANKS list Niels Lohmann 2018-04-10 18:13:37 +0200
  • b8bfd1140d
    Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements Niels Lohmann 2018-04-10 17:57:21 +0200
  • 33a2154f8d Enable target namespaces and build dir project config Chuck Atkins 2018-04-09 11:32:18 -0400
  • 29362c6ace
    Merge pull request #1047 from jammehcow/patch-1 Niels Lohmann 2018-04-10 08:39:58 +0200
  • c02a3155d4
    👷 added Xcode 9.3 builder Niels Lohmann 2018-04-10 08:39:28 +0200
  • 8d8f890771
    💩 first try on #1045 Niels Lohmann 2018-04-10 08:29:07 +0200
  • 7f20e9ddc7
    Fixed incorrect version number in README James Upjohn 2018-04-10 17:16:44 +1200
  • 031b88d315 Make the CMake install dir user-configurable Chuck Atkins 2018-04-09 11:31:25 -0400
  • aaee18ce90 Added test for string conversion with string_view Guillaume Racicot 2018-04-09 11:15:33 -0400
  • 7c503c64b7
    Merge pull request #1043 from coryan/patch-1 Niels Lohmann 2018-04-09 08:19:56 +0200
  • 4286b16b71
    Fix trivial typo in comment. Carlos O'Ryan 2018-04-08 15:46:25 -0400
  • cf91b4f2bb
    Merge branch 'develop' into feature/wstring Niels Lohmann 2018-04-08 11:36:58 +0200
  • f924df1835
    Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-04-08 11:36:44 +0200
  • acf10d9af7
    Merge pull request #1041 from ax3l/topic-spack Niels Lohmann 2018-04-08 11:32:35 +0200
  • e1ea8369ad
    Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-04-08 09:31:59 +0200
  • 40f279c59d
    Merge branch 'feature/issue1021' into develop Niels Lohmann 2018-04-08 09:28:37 +0200
  • 18a0271a95
    Merge branch 'develop' into feature/issue1021 Niels Lohmann 2018-04-08 09:21:43 +0200
  • 1ae9896387
    Package Manager: Spack Axel Huebl 2018-04-07 16:43:01 +0200
  • 83b143382e
    Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin Niels Lohmann 2018-04-07 15:14:59 +0200
  • e439a1a9a7
    CMake: 3.8+ is Sufficient Axel Huebl 2018-04-07 13:15:44 +0200
  • 495436a5d5
    Merge pull request #1026 from ktonon/develop Niels Lohmann 2018-04-03 17:34:42 +0200
  • a35d414c39 Update CMake to latest on Travis Kevin Tonon 2018-04-03 08:28:07 -0400
  • 08a7233d1b
    🚑 fixed commit 1e08654 Niels Lohmann 2018-04-02 22:38:44 +0200
  • 1e08654f99
    🔨 cleanup Niels Lohmann 2018-04-02 22:25:17 +0200
  • aa89c5e048
    🔨 removing unget_character() function from input adapters #834 Niels Lohmann 2018-04-02 21:10:48 +0200
  • 6678eb2b4a
    improved test coverage #1031 Niels Lohmann 2018-04-02 15:38:49 +0200
  • 16c5bfeaad
    👌 fixed compiler warnings #1031 Niels Lohmann 2018-04-02 13:01:56 +0200
  • 727dd4664b
    🔨 trying to make tests run with MSVC #1031 Niels Lohmann 2018-04-02 12:27:07 +0200
  • ab89ae4e50
    🔨 trying to make tests run with MSVC #1031 Niels Lohmann 2018-04-02 11:34:36 +0200
  • eb06d0531a
    🚧 added input adapter for wide strings #1031 Niels Lohmann 2018-04-01 19:12:36 +0200
  • ba6edd5634
    🔨 cleanup Niels Lohmann 2018-03-30 00:38:18 +0200
  • 850671b9f1
    🔨 using a vector<bool> for the parser hierarchy Niels Lohmann 2018-03-29 18:45:43 +0200
  • 4efa8cdb4c
    💚 fixed Valgrind options #1030 Niels Lohmann 2018-03-29 17:19:21 +0200
  • 830c93fd09
    📝 fixed example for operator> #1029 Niels Lohmann 2018-03-29 17:07:55 +0200
  • c78dbc366c Added test for conversion to string_view Guillaume Racicot 2018-03-29 01:03:57 -0400
  • 53d8d57921 Amalgamate single include Guillaume Racicot 2018-03-29 01:03:36 -0400
  • 5f723bbec6
    🔨 realized callback parser wirh SAX interface #971 Niels Lohmann 2018-03-28 23:39:39 +0200
  • 896a9db461
    🔨 improved code #1021 Niels Lohmann 2018-03-28 19:37:21 +0200
  • 73cc5089e3 Using target_compile_features to specify C++ 11 standard Kevin Tonon 2018-03-27 12:51:30 -0400
  • a9baab76c2
    🚑 fix for #1021 Niels Lohmann 2018-03-28 18:20:55 +0200
  • 4f6b2b6429
    🔨 changed SAX interface Niels Lohmann 2018-03-21 20:12:06 +0100
  • 2537677e4c
    improved test coverage Niels Lohmann 2018-03-20 23:40:01 +0100
  • 9e1abb4842
    improved coverage Niels Lohmann 2018-03-20 22:39:08 +0100
  • 1e38ffc014
    more tests Niels Lohmann 2018-03-20 20:04:11 +0100
  • 25f56ff207
    📝 updated documentation Niels Lohmann 2018-03-20 19:22:18 +0100
  • 99ecca55c4
    improved test coverage Niels Lohmann 2018-03-20 18:49:10 +0100
  • 9e07e9b4ec
    implemented non-throwing binary reader Niels Lohmann 2018-03-19 22:48:13 +0100
  • a271ee5f16
    ♻️ proper use of SAX parser for binary formats Niels Lohmann 2018-03-18 23:00:45 +0100
  • 943d641054
    🔨 some refactoring Niels Lohmann 2018-03-18 16:07:21 +0100
  • 22929fe189
    🚧 started a SAX/DOM/callback parser Niels Lohmann 2018-03-18 15:13:53 +0100
  • 375b05a17d
    🔨 cleanup Niels Lohmann 2018-03-17 23:31:18 +0100
  • 606a25195f
    improved test coverage Niels Lohmann 2018-03-17 19:15:59 +0100
  • c87ffad45c
    ♻️ implemented a non-recursive parser Niels Lohmann 2018-03-17 14:46:50 +0100
  • 2a5506ed98 Amalgamated headers Guillaume Racicot 2018-03-16 13:16:10 -0400
  • 8165707990 basic_json now supports getting many type of strings Guillaume Racicot 2018-03-15 15:35:00 -0400
  • 27cf05af8d
    Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-14 22:02:19 +0100
  • d2dd27dc3b
    Merge branch 'release/3.1.2' into develop Niels Lohmann 2018-03-14 21:48:03 +0100
  • 183390c10b
    Merge branch 'release/3.1.2' Niels Lohmann 2018-03-14 21:47:50 +0100
  • 8a6c8cb0f7
    🔖 set version to 3.1.2 Niels Lohmann 2018-03-14 21:32:03 +0100
  • afef474c0d
    🔖 set version to 3.1.2 Niels Lohmann 2018-03-14 21:09:27 +0100
  • a52e8355b8
    oops Niels Lohmann 2018-03-14 17:32:48 +0100
  • 21410d50af
    🏁 moved /Wall to CMake Niels Lohmann 2018-03-14 17:21:31 +0100
  • 829ed74d66
    🏁 experimenting with /Wall Niels Lohmann 2018-03-14 07:38:22 +0100
  • 1262d474eb
    🏁 fixed an MSVC warning Niels Lohmann 2018-03-14 07:32:28 +0100
  • 282bafae4f
    🔨 fixed compilation error Niels Lohmann 2018-03-14 07:18:42 +0100
  • abac6a0e84
    Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-13 23:58:17 +0100
  • 919d1fef8f
    Merge pull request #1009 from nlohmann/user_string_parser Niels Lohmann 2018-03-13 14:52:59 +0100
  • 8557151d90
    ♻️ adjusting lexer/parser in symmetry to #1006 Niels Lohmann 2018-03-12 19:15:11 +0100
  • b56ac86471
    📝 thanks for #1006 Niels Lohmann 2018-03-12 18:44:19 +0100
  • 0cab3b2c8e
    Merge pull request #1006 from agrianius/dump-template Niels Lohmann 2018-03-12 18:41:59 +0100
  • 3d4f6a2940
    🔨 cleaner exception interface Niels Lohmann 2018-03-11 22:47:25 +0100
  • ad47b0fbde
    ♻️ refactored binary readers to use a SAX parser Niels Lohmann 2018-03-11 18:47:38 +0100
  • 392c033805 test refactoring Vitaliy Manushkin 2018-03-11 00:29:04 +0300
  • 51349537fc add unit test: checking dump to alternative string type Vitaliy Manushkin 2018-03-10 23:59:10 +0300
  • 830f3e5290 forward alternative string class from output_adapter to output_string_adapter Vitaliy Manushkin 2018-03-10 23:58:16 +0300
  • ed6b1464f9 dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code) Vitaliy Manushkin 2018-03-10 17:36:51 +0300
  • faccc37d0d dump to alternate implementation of string, as defined in basic_json template Vitaliy Manushkin 2018-03-10 17:19:28 +0300
  • 149d2fd09c
    💚 improved test coverage Niels Lohmann 2018-03-10 11:24:00 +0100
  • 6399cd3039
    Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-10 11:07:36 +0100
  • 6151dfaed7
    👌 made changes proposed in #1001 Niels Lohmann 2018-03-10 11:02:58 +0100
  • 35e43df625
    Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-09 21:56:30 +0100
  • 9918523077
    📝 cleanup after #1001 Niels Lohmann 2018-03-09 21:31:46 +0100
  • e737de8941
    Merge pull request #1001 from nlohmann/leak Niels Lohmann 2018-03-09 21:23:00 +0100
  • aa8fc2a41c
    🚑 hopefully fixed the memory leak Niels Lohmann 2018-03-08 17:11:15 +0100
  • 7c1a788893
    Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-08 07:39:37 +0100
  • cf60e18c89
    🔥 removing failing test (work on this in branch "leak") Niels Lohmann 2018-03-08 07:39:21 +0100
  • 97559bb1b2
    🔨 trying to fix the leak Niels Lohmann 2018-03-08 07:36:56 +0100
  • 38345fd06c
    👌 fixed some more warnings Niels Lohmann 2018-03-07 22:51:22 +0100
  • 8b379948d0
    🔥 replaced acceptor with SAX parser Niels Lohmann 2018-03-07 22:40:48 +0100
  • 303a0c5843
    Merge branch 'develop' into feature/sax2 Niels Lohmann 2018-03-07 22:26:01 +0100
  • d183d34b96
    💚 added another test case Niels Lohmann 2018-03-07 22:25:25 +0100
  • d2d65bb25b
    ♻️ refined SFINAE to fix some warnings Niels Lohmann 2018-03-07 22:01:44 +0100