Commit graph

  • ecf4d5e91d
    👷 trying CircleCI Niels Lohmann 2019-03-30 17:05:43 +0100
  • 53001414c7
    🔨 using --exclude-gcov to exclude files Niels Lohmann 2019-03-30 17:00:30 +0100
  • b12287b362
    ⚗️ trying fastcov Niels Lohmann 2019-03-30 09:12:32 +0100
  • b21c04c938
    🔥 removed unsupported flag Niels Lohmann 2019-03-29 17:34:58 +0100
  • c7878173f9
    🔨 minor changes to maintainer targets Niels Lohmann 2019-03-29 13:10:11 +0100
  • b52c3638f5
    Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang Niels Lohmann 2019-03-29 09:14:25 +0100
  • d21d298397
    🎨 fixed indentation Niels Lohmann 2019-03-28 14:23:26 +0100
  • 23635704c3
    ⬆️ added script to update cpplint Niels Lohmann 2019-03-28 14:23:07 +0100
  • 191aa0fd6f
    🔧 overworked maintaner targets Niels Lohmann 2019-03-28 14:22:48 +0100
  • 5ccdaf643f Remove C++17 extension warning from clang; #1535 Watal M. Iwasaki 2019-03-28 14:38:58 +0900
  • b4def6dcba tabs instead of spaces... onqtam 2019-03-27 01:13:10 +0200
  • a0000c3235 finished the last of the warnings onqtam 2019-03-27 01:09:47 +0200
  • 5d511a6e96 fixed a bunch of warnings from the Makefile from the root of the repo onqtam 2019-03-27 00:58:53 +0200
  • 82af0ecdc1
    Merge branch 'develop' into doctest Viktor Kirilov 2019-03-26 23:32:32 +0200
  • d79c16801a
    Merge branch 'feature/doozer' into develop Niels Lohmann 2019-03-26 10:49:56 +0100
  • 24d91cf36f
    📝 added Doozer to README Niels Lohmann 2019-03-26 10:49:14 +0100
  • 0991824584
    👷 version output Niels Lohmann 2019-03-26 10:41:05 +0100
  • 0caf986505 reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support onqtam 2019-03-25 22:04:37 +0200
  • 9d2f0391e0
    👷 fixed timeout Niels Lohmann 2019-03-25 12:30:45 +0100
  • af9da22b87
    👷 adding xenial-armhf Niels Lohmann 2019-03-25 07:15:03 +0100
  • 0a67b51fce
    👷 forgot path to ctest Niels Lohmann 2019-03-25 07:03:41 +0100
  • e27b282033
    👷 skip certificate check Niels Lohmann 2019-03-25 06:45:35 +0100
  • cde0b24389
    👷 fixed required packages Niels Lohmann 2019-03-25 06:43:14 +0100
  • f091fe31bc
    👷 increased timeout Niels Lohmann 2019-03-25 06:39:41 +0100
  • 28dfbedda7
    👷 fixed timeout Niels Lohmann 2019-03-24 18:14:59 +0100
  • ff51a32be1 updated doctest to version 2.3.1 released today onqtam 2019-03-24 17:28:52 +0200
  • 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest onqtam 2019-03-24 17:21:44 +0200
  • dcbc028b5b
    👷 fixed syntax Niels Lohmann 2019-03-24 09:02:46 +0100
  • 842d42b135
    👷 unified paths Niels Lohmann 2019-03-24 09:02:06 +0100
  • 1e86976cfe
    👷 fixed paths Niels Lohmann 2019-03-24 08:53:30 +0100
  • 30211477b7
    👷 fixed package name Niels Lohmann 2019-03-24 08:36:01 +0100
  • 5e1cae0a7d
    👷 install g++ Niels Lohmann 2019-03-24 08:24:50 +0100
  • c871c9a01c
    👷 install correct g++ Niels Lohmann 2019-03-24 06:51:10 +0100
  • 63d619e21f
    👷 need to install g++ Niels Lohmann 2019-03-24 00:48:59 +0100
  • c94b764a6e
    👷 fixed installation Niels Lohmann 2019-03-24 00:43:01 +0100
  • 65cdccfa8a
    👷 fixed syntax error Niels Lohmann 2019-03-24 00:36:46 +0100
  • a72ac18514
    👷 use recent cmake Niels Lohmann 2019-03-24 00:36:05 +0100
  • 4327ae0bef
    👷 need more recent cmake for CentOS Niels Lohmann 2019-03-24 00:15:57 +0100
  • fabf953305
    👷 fixed a typo Niels Lohmann 2019-03-24 00:12:36 +0100
  • 6e3e2ee2e4
    👷 fixed buildenv values Niels Lohmann 2019-03-24 00:11:20 +0100
  • bc5089e803
    👷 add test output to avoid timeout Niels Lohmann 2019-03-24 00:02:41 +0100
  • 7dd3e6384b
    👷 added Fedora and CentOS Niels Lohmann 2019-03-23 23:42:29 +0100
  • 490c6e926e
    👷 using raspbian Niels Lohmann 2019-03-23 23:27:39 +0100
  • 2fcca259b0
    👷 added cmake Niels Lohmann 2019-03-23 23:21:17 +0100
  • 72dd6f349e
    👷 trying doozer Niels Lohmann 2019-03-23 23:18:27 +0100
  • baaa2a4d0f
    🏁 trying to use constructors from std::allocator #1536 Niels Lohmann 2019-03-21 14:09:29 +0100
  • 1126c9ca74
    Merge branch 'release/3.6.1' into develop Niels Lohmann 2019-03-20 21:03:43 +0100
  • 295732a817
    Merge branch 'release/3.6.1' Niels Lohmann 2019-03-20 21:03:30 +0100
  • efa1b9a7bb
    🔖 set version to 3.6.1 Niels Lohmann 2019-03-20 20:50:05 +0100
  • b33093d610
    🐛 fixed regression #1530 Niels Lohmann 2019-03-20 14:40:23 +0100
  • 9d6ab9014f
    🏁 fixed a compilation error in MSVC #1531 Niels Lohmann 2019-03-20 14:13:29 +0100
  • c790b9f8c0
    🐛 fixed regression #1530 Niels Lohmann 2019-03-20 12:41:08 +0100
  • 483a086562
    ⚗️ added funding link Niels Lohmann 2019-03-20 11:42:24 +0100
  • d2a08ddafd
    Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-20 11:06:55 +0100
  • 7c55510f76
    🚨 fixed some warnings #1527 Niels Lohmann 2019-03-20 11:06:39 +0100
  • 3ac5fa31c5
    💬 update issue templates Niels Lohmann 2019-03-20 01:27:37 +0100
  • 51e1564c9e
    Merge branch 'release/3.6.0' into develop Niels Lohmann 2019-03-20 00:38:29 +0100
  • 944267f522
    Merge branch 'release/3.6.0' Niels Lohmann 2019-03-20 00:38:16 +0100
  • 0abf0f80c9
    🔖 set version to 3.6.0 Niels Lohmann 2019-03-20 00:22:12 +0100
  • b37392b7ac
    🔖 set version to 3.6.0 Niels Lohmann 2019-03-20 00:19:07 +0100
  • 002addabd8
    🚨 fixed a warning Niels Lohmann 2019-03-19 23:10:21 +0100
  • a6f9b4e36d
    👥 added contributors Niels Lohmann 2019-03-19 17:18:33 +0100
  • 18cc7ddd62
    📝 completed documentation index page Niels Lohmann 2019-03-19 16:03:02 +0100
  • e07e8e7912
    📝 updated documentation Niels Lohmann 2019-03-19 15:40:23 +0100
  • 710f26f95c
    📝 added documentation Niels Lohmann 2019-03-19 10:06:35 +0100
  • b224c52376
    🎨 cleanup Niels Lohmann 2019-03-19 09:17:14 +0100
  • 37a72dac48
    💚 forgot two semicolons Niels Lohmann 2019-03-18 17:23:34 +0100
  • 155d196bfa
    Update CMakeLists.txt Viktor Kirilov 2019-03-18 17:58:35 +0200
  • 365944b0bc
    Merge branch 'develop' into doctest Viktor Kirilov 2019-03-18 16:59:36 +0200
  • 8d3f4f21bc
    🔨 clean up Niels Lohmann 2019-03-18 13:53:48 +0100
  • 9fc093c9e0
    👷 added targets for infer and oclint Niels Lohmann 2019-03-18 00:19:28 +0100
  • 22c733e6fe
    📝 added documentation Niels Lohmann 2019-03-17 22:25:18 +0100
  • 56f6d1d68e
    💚 fix CI and #1521 Niels Lohmann 2019-03-17 15:20:22 +0100
  • df0f7f2b5d
    👷 overworked clang-tidy target Niels Lohmann 2019-03-17 12:02:23 +0100
  • 9f26dac9b3
    ⬆️ updated Doxyfile Niels Lohmann 2019-03-17 12:02:05 +0100
  • b8451c236f
    🚨 fixed warnings Niels Lohmann 2019-03-17 12:01:49 +0100
  • d6c4cd3b6d
    🚨 adding targets for static analyzers Niels Lohmann 2019-03-17 00:30:08 +0100
  • baf8b4be7c
    adding cpplint Niels Lohmann 2019-03-17 00:28:14 +0100
  • 34f8b4f711
    🚨 fixed more warnings Niels Lohmann 2019-03-17 00:27:44 +0100
  • 02b3494711
    🔥 removing unstable macOS builds on Traivs Niels Lohmann 2019-03-16 08:28:44 +0100
  • b02ee16721
    🚨 fixed warnings Niels Lohmann 2019-03-15 15:55:52 +0100
  • 8d6c033f80
    Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-15 14:55:15 +0100
  • 27011e3718
    🚨 fixed warnings Niels Lohmann 2019-03-15 14:55:13 +0100
  • 9dc3552931
    Merge pull request #1514 from naszta/macrofix Niels Lohmann 2019-03-15 12:46:42 +0100
  • 0067ea8f9e Change macros to numeric_limits #1483 Ferenc Nasztanovics 2019-03-13 23:42:46 +0100
  • 0c65ba960e
    Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-13 22:14:57 +0100
  • 546e2cbf5e
    🚨 fixed some warnings Niels Lohmann 2019-03-13 22:14:53 +0100
  • c6fc902184
    Merge pull request #1489 from andreas-schwab/develop Niels Lohmann 2019-03-13 11:57:58 +0100
  • d39842e68f
    Merge pull request #1330 from ax3l/topic-installEmbed Niels Lohmann 2019-03-13 11:13:09 +0100
  • 670f42b561
    🔥 removing Xcode 6.4 builder Niels Lohmann 2019-03-11 22:59:22 +0100
  • c983b67112
    Merge pull request #1469 from garethsb-sony/json_pointer-append Niels Lohmann 2019-03-11 22:47:08 +0100
  • c11bead2ae
    👷 removing more retired Travis images Niels Lohmann 2019-03-11 21:22:30 +0100
  • 3cd1dac653
    🚨 fix MSVC warning #1502 Niels Lohmann 2019-03-11 15:33:23 +0100
  • cabe2357b8
    Merge pull request #1492 from stac47/fix_gcc9_allocator Niels Lohmann 2019-03-11 15:21:54 +0100
  • 16d9cdce45
    📝 updated documentation of CI Niels Lohmann 2019-03-11 15:19:50 +0100
  • e3729ba0a5
    💚 fix compiler selection Niels Lohmann 2019-03-11 07:44:40 +0100
  • e5c7fd488d
    👷 trying new Travis workers Niels Lohmann 2019-03-10 22:56:14 +0100
  • 5047c7a217
    🐛 added missing include #1500 Niels Lohmann 2019-03-10 22:26:57 +0100
  • 8eb7db7277
    Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if Niels Lohmann 2019-03-10 22:08:16 +0100
  • 393410e61a
    Merge pull request #1495 from njlr/patch-1 Niels Lohmann 2019-03-10 22:03:49 +0100