Commit graph

  • f5a53de845
    👷 running sanitizer job in parallel Niels Lohmann 2017-08-16 09:21:20 +0200
  • 21726d8d8f
    👷 run sanitizer after tests Niels Lohmann 2017-08-16 08:11:02 +0200
  • df572aca79
    👷 set sanitizer to clang4 Niels Lohmann 2017-08-16 07:42:57 +0200
  • 4391bf5615
    Merge branch 'feature/update' into develop Niels Lohmann 2017-08-16 07:39:30 +0200
  • 1e360bb32b
    🔨 preparation for #505 Niels Lohmann 2017-08-16 07:39:11 +0200
  • 002410410f
    Merge branch 'develop' into feature/update Niels Lohmann 2017-08-15 21:42:58 +0200
  • 72afe53fa0
    📝 updated documentation for update() function #661 Niels Lohmann 2017-08-15 21:42:50 +0200
  • 76123fab76
    📝 added note wrt. #667 Niels Lohmann 2017-08-15 20:49:18 +0200
  • fdff42bc3d
    👷 forgot to install Cmake on OSX Niels Lohmann 2017-08-15 20:30:01 +0200
  • 039e2f03bc
    Merge branch 'develop' into feature/update Niels Lohmann 2017-08-15 19:54:22 +0200
  • 7f4722a75d
    Merge branch 'feature/travis_clang' into develop Niels Lohmann 2017-08-15 19:52:47 +0200
  • 08805f7f14
    🔨 cleanup Niels Lohmann 2017-08-13 20:57:27 +0200
  • 988077e046
    Merge branch 'develop' into feature/travis_clang Niels Lohmann 2017-08-13 20:27:27 +0200
  • 7d19aed567
    🔨 cleanup Niels Lohmann 2017-08-13 19:02:58 +0200
  • 569c00eb18
    👷 changed c++17 to c++1z Niels Lohmann 2017-08-10 23:41:12 +0200
  • 6151b056eb
    🔨 cleanup Niels Lohmann 2017-08-10 23:40:30 +0200
  • bade3b3e6c
    👷 cleanup Niels Lohmann 2017-08-10 21:17:40 +0200
  • 76b195d7d1
    👷 fix for coverity + clang-5.0 Niels Lohmann 2017-08-10 20:54:59 +0200
  • cd34358e7c
    👷 removing clang from source Niels Lohmann 2017-08-10 20:37:23 +0200
  • 5eb9f5fd4f
    👷 clang-3.4 Niels Lohmann 2017-08-10 20:31:59 +0200
  • f49356e703
    👷 clang-3.4 Niels Lohmann 2017-08-10 20:26:49 +0200
  • e0f8eb1710
    👷 clang-4.0 Niels Lohmann 2017-08-10 20:21:41 +0200
  • 6dc89e47fc
    👷 clang-3.9 Niels Lohmann 2017-08-10 20:16:35 +0200
  • 8de710bbe7
    👷 added source for gcc Niels Lohmann 2017-08-10 20:12:27 +0200
  • 195d773bc5
    👷 added gcc Niels Lohmann 2017-08-10 20:09:39 +0200
  • e7f2d2646a
    👷 removed gcc Niels Lohmann 2017-08-10 20:06:47 +0200
  • 6b20f6d1ef
    👷 clang-3.8 Niels Lohmann 2017-08-10 20:04:36 +0200
  • 82cd8c8d02
    👷 another try Niels Lohmann 2017-08-10 19:59:00 +0200
  • f256587c4f
    👷 clang-3.4 Niels Lohmann 2017-08-10 19:56:09 +0200
  • c06b5c5c10
    👷 clang-3.5 Niels Lohmann 2017-08-10 19:50:36 +0200
  • 3283352db3
    👷 using clang++ Niels Lohmann 2017-08-10 19:45:33 +0200
  • c20dd7522f
    👷 another try Niels Lohmann 2017-08-10 19:40:09 +0200
  • 94dfecd487
    👷 removed g++ Niels Lohmann 2017-08-10 19:31:43 +0200
  • 8963aae57d
    👷 clang-3.6 Niels Lohmann 2017-08-10 19:24:36 +0200
  • 5aceb0e029
    👷 clang-3.6 Niels Lohmann 2017-08-10 19:23:55 +0200
  • e7a7e4f81f
    👷 fixed compiler Niels Lohmann 2017-08-10 19:18:45 +0200
  • e333562633
    👷 different source Niels Lohmann 2017-08-10 19:15:16 +0200
  • eb6de822bb
    👷 clang-3.7 Niels Lohmann 2017-08-10 19:12:04 +0200
  • c1642affaa
    👷 clang-3.8 Niels Lohmann 2017-08-10 19:03:35 +0200
  • a46afd4008 Merge pull request #679 from traits/patch-1 Niels Lohmann 2017-08-10 11:39:13 +0200
  • 54c67dcfec Update json.hpp traits 2017-08-10 09:05:00 +0200
  • 99ea12f304
    📝 acknowledgements for #674, #678, #682, #685, and #686 Niels Lohmann 2017-08-10 06:50:34 +0200
  • d26b3f1fe5 Merge pull request #686 from WebProdPP/patch-1 Niels Lohmann 2017-08-10 06:44:59 +0200
  • 345846b514 Merge pull request #685 from daixtrose/patch-1 Niels Lohmann 2017-08-09 15:32:33 +0200
  • c9509ccf97 Update json.hpp WebProdPP 2017-08-09 16:13:43 +0300
  • 86b3d06a93 remove duplicate word Markus Werle 2017-08-09 11:56:48 +0200
  • 6e5b895f87 Merge pull request #682 from kbthomp1/fix-intel-osx Niels Lohmann 2017-08-09 10:16:03 +0200
  • 4b55f0ebd6 To fix compilation issue for intel OSX compiler Kyle Thompson 2017-08-08 18:43:03 -0400
  • c90bf5e0f1
    👷 removed failing builders Niels Lohmann 2017-08-08 21:26:15 +0200
  • dd008545d1
    Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-08-08 19:15:49 +0200
  • 054b0250be
    👷 trying to install g++ to make clang work Niels Lohmann 2017-08-08 19:14:22 +0200
  • ab44a50d98 Digraph warning traits 2017-08-07 14:23:48 +0200
  • b32a6b8c75 Merge pull request #678 from DmitryKuk/develop Niels Lohmann 2017-08-05 13:42:43 +0200
  • 19437c15de massage -> message DmitryKuk 2017-08-05 10:43:08 +0300
  • e523312fa2
    improved test coverage Niels Lohmann 2017-08-03 17:47:42 +0200
  • d2c3592908
    added test cases for update #661 Niels Lohmann 2017-08-02 22:44:58 +0200
  • d1e13d5128
    🎉 first draft for #661 Niels Lohmann 2017-08-02 22:12:41 +0200
  • 0ea0d7d860 Merge pull request #674 from wincent/patch-1 Niels Lohmann 2017-08-01 20:21:04 +0200
  • efdfd3aa5b
    replaced by-value call #673 Niels Lohmann 2017-08-01 19:37:25 +0200
  • 391303521a Fix "not constraint" grammar in docs Greg Hurrell 2017-08-01 08:56:28 -0700
  • 76ecb2bd60 Merge pull request #671 from dan-42/develop Niels Lohmann 2017-08-01 07:15:55 +0200
  • db0b9732d4 DOC: add sort mentioning about support in hunter dan-42 2017-07-31 23:20:37 +0200
  • e60002a1b3
    🔨 fixed GCC warnings in #663 Niels Lohmann 2017-07-31 23:17:14 +0200
  • 966989a3f5 CONFIG: pin cmake to enable only C++ dan-42 2017-07-31 09:49:26 +0200
  • 850d856aae
    🔨 cleanup after #663 Niels Lohmann 2017-07-30 20:30:05 +0200
  • 3d67ec40a6
    Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-07-30 20:01:35 +0200
  • 85c768084b
    🔨 using emplace Niels Lohmann 2017-07-30 20:01:31 +0200
  • 67fb517ccd Merge pull request #669 from dan-42/change_installed_cmake_include_path Niels Lohmann 2017-07-30 20:01:03 +0200
  • 80e95844f6 Merge pull request #663 from himikof/move-construction Niels Lohmann 2017-07-30 20:00:46 +0200
  • aad55219f8 Merge branch 'develop' into move-construction Niels Lohmann 2017-07-30 19:49:24 +0200
  • 96dd4ffa19
    🔨 simplified a call Niels Lohmann 2017-07-30 18:30:34 +0200
  • 7737a29518
    🔨 small parser performance improvements Niels Lohmann 2017-07-30 13:25:36 +0200
  • f434942371 REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse dan-42 2017-07-29 11:59:09 +0200
  • c819a2d732
    🔨 refactored some scanner internals Niels Lohmann 2017-07-28 19:18:50 +0200
  • 5851daa576
    binary formats can be stored in std::string, std::ofstreams or std::ostringstream #477 Niels Lohmann 2017-07-28 00:21:55 +0200
  • c136b6f200 Merge pull request #666 from effolkronium/develop Niels Lohmann 2017-07-27 20:48:56 +0200
  • 7d51214045
    implemented exception-free parser #458 #582 Niels Lohmann 2017-07-27 20:33:11 +0200
  • a27dd3a6f6 enable_testing only if JSON_BuildTests is ON Ilya Polishchuk 2017-07-27 17:50:24 +0300
  • 669ebf51bc
    🔨 fixed an error in MSVC Niels Lohmann 2017-07-27 06:04:35 +0200
  • 3d589fd032
    🔨 fixed compilation error Niels Lohmann 2017-07-26 23:59:56 +0200
  • e6aa700360
    🔨 cleanup Niels Lohmann 2017-07-26 23:44:55 +0200
  • 93bb71232d Move from rvalues eagerly to work around MSVC problem Nikita Ofitserov 2017-07-25 12:17:32 +0300
  • 897879bccb Make detail::json_ref do less work by deferring moves/copies Nikita Ofitserov 2017-07-24 12:29:06 +0300
  • 0f4978e503 Fix an actually invalid test Nikita Ofitserov 2017-07-24 01:02:03 +0300
  • 4414f94cd5
    🔨 using input/output adapters for CBOR and MessagePack Niels Lohmann 2017-07-23 23:02:24 +0200
  • f5cae64e52 Update tests while fixing possible UB Nikita Ofitserov 2017-07-23 23:59:34 +0300
  • 09cda57309 Support moving from rvalues in an std::initializer_list Nikita Ofitserov 2017-07-23 23:57:17 +0300
  • cf3ca3b78c Optimize json construction from rvalue string_t/array_t/object_t Nikita Ofitserov 2017-07-23 23:50:59 +0300
  • 7b3cbfff23 Add some tests for std::move from std::initializer_list Nikita Ofitserov 2017-07-23 23:47:15 +0300
  • 9b1c058810
    🔨 reorganized interfaces for parse/accept functions #623 Niels Lohmann 2017-07-23 18:11:34 +0200
  • 18e0430bfe
    🔨 adding destroy function to discard values Niels Lohmann 2017-07-22 22:57:22 +0200
  • 5b5f0090a1
    🔨 trying to fix the sanitizer error Niels Lohmann 2017-07-22 16:41:42 +0200
  • d53ef95067
    🔨 fixed some warnings Niels Lohmann 2017-07-22 15:33:31 +0200
  • c7a69ae03e
    started working on parser with provded result reference #418 Niels Lohmann 2017-07-22 15:18:38 +0200
  • f513c46749
    🔨 further cleanup Niels Lohmann 2017-07-22 13:35:04 +0200
  • 024fec8a9b
    🔨 more cleanup using clang-tidy Niels Lohmann 2017-07-21 18:26:07 +0200
  • a09193e967
    🔨 cleanup Niels Lohmann 2017-07-20 23:01:16 +0200
  • 21d23982ca
    🐛 fix for #656 Niels Lohmann 2017-07-17 07:53:02 +0200
  • 8a9133c6b2 Merge pull request #652 from olegendo/develop Niels Lohmann 2017-07-15 11:39:27 +0200
  • f1fabd1ba2 📄 added code of conduct Niels Lohmann 2017-07-13 19:16:41 +0200