Commit Graph

  • aa4c45ee4d Added to_string (with ugly macro) and tests Macr0Nerd 2019-04-25 22:12:15 -05:00
  • 293cd6b794 Added to_string and added basic tests Macr0Nerd 2019-04-25 22:12:15 -05:00
  • ee4028b8e4 Merge branch 'feature/fastcov' into develop Niels Lohmann 2019-04-06 09:15:43 +02:00
  • cf6b6692aa Merge branch 'develop' into feature/fastcov Niels Lohmann 2019-04-06 09:03:35 +02:00
  • f0bc16d899 🔨 overworked coverage targets Niels Lohmann 2019-04-06 09:02:17 +02:00
  • b4b06d89b5 ⬆️ updated fastcov Niels Lohmann 2019-04-06 00:24:19 +02:00
  • e65cff2a8f 🔨 small cleanup Niels Lohmann 2019-04-05 23:31:04 +02:00
  • 63fe1cbbcf 📝 updated README Niels Lohmann 2019-04-05 18:29:57 +02:00
  • 0bdadb12c7 Merge branch 'feature/circleci' into develop Niels Lohmann 2019-04-05 17:50:48 +02:00
  • 0a1ddd6882 ⬆️ updated fastcov Niels Lohmann 2019-04-05 07:54:46 +02:00
  • 4676f759e8 ⬆️ updated fastcov Niels Lohmann 2019-04-04 09:50:27 +02:00
  • da279234d5 Merge branch 'develop' into feature/fastcov Niels Lohmann 2019-04-04 09:03:11 +02:00
  • f05614b240 🏗️ adding anonymous namespace Niels Lohmann 2019-04-04 08:56:36 +02:00
  • 0da99027b7 🚨 silenced a warning Niels Lohmann 2019-04-03 17:44:09 +02:00
  • 1f03395e2c Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-04-03 17:28:50 +02:00
  • 2f9095ddab 🔨 relaxed requirements to coverage Niels Lohmann 2019-04-03 17:28:47 +02:00
  • ee8732c359 Merge pull request #1555 from theodelrieu/fix/1511 Niels Lohmann 2019-04-03 17:24:25 +02:00
  • d1ef75316e Merge pull request #1439 from onqtam/doctest Niels Lohmann 2019-04-03 17:01:48 +02:00
  • d66abda4ee tests: fix coverage Théo DELRIEU 2019-04-03 12:34:15 +02:00
  • e6e6805c6c add built-in array support in get_to Théo DELRIEU 2019-04-01 13:32:06 +02:00
  • 2806b201a8 make sure values are overwritten in from_json overloads Théo DELRIEU 2019-04-01 13:09:38 +02:00
  • da5b7833a0 fixing the remaining of the pedantic gcc/clang target warnings onqtam 2019-03-31 13:57:44 +03:00
  • 64873fb5b8 Merge branch 'develop' into doctest Viktor Kirilov 2019-03-30 23:23:33 +02:00
  • 80daa19331 👷 Ninja seems not to work Niels Lohmann 2019-03-30 17:39:50 +01:00
  • 0a57c51a69 👷 adding concurrency Niels Lohmann 2019-03-30 17:32:52 +01:00
  • a5e00f2cf7 👷 fixed path Niels Lohmann 2019-03-30 17:19:27 +01:00
  • 5ebe722045 👷 full workflow Niels Lohmann 2019-03-30 17:14:50 +01:00
  • ecf4d5e91d 👷 trying CircleCI Niels Lohmann 2019-03-30 17:05:43 +01:00
  • 53001414c7 🔨 using --exclude-gcov to exclude files Niels Lohmann 2019-03-30 17:00:30 +01:00
  • b12287b362 ⚗️ trying fastcov Niels Lohmann 2019-03-30 09:12:32 +01:00
  • b21c04c938 🔥 removed unsupported flag Niels Lohmann 2019-03-29 17:34:58 +01:00
  • c7878173f9 🔨 minor changes to maintainer targets Niels Lohmann 2019-03-29 13:10:11 +01:00
  • b52c3638f5 Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang Niels Lohmann 2019-03-29 09:14:25 +01:00
  • d21d298397 🎨 fixed indentation Niels Lohmann 2019-03-28 14:23:26 +01:00
  • 23635704c3 ⬆️ added script to update cpplint Niels Lohmann 2019-03-28 14:23:07 +01:00
  • 191aa0fd6f 🔧 overworked maintaner targets Niels Lohmann 2019-03-28 14:22:48 +01:00
  • 5ccdaf643f Remove C++17 extension warning from clang; #1535 Watal M. Iwasaki 2019-03-28 14:38:58 +09:00
  • b4def6dcba tabs instead of spaces... onqtam 2019-03-27 01:13:10 +02:00
  • a0000c3235 finished the last of the warnings onqtam 2019-03-27 01:09:47 +02:00
  • 5d511a6e96 fixed a bunch of warnings from the Makefile from the root of the repo onqtam 2019-03-27 00:58:53 +02:00
  • 82af0ecdc1 Merge branch 'develop' into doctest Viktor Kirilov 2019-03-26 23:32:32 +02:00
  • d79c16801a Merge branch 'feature/doozer' into develop Niels Lohmann 2019-03-26 10:49:56 +01:00
  • 24d91cf36f 📝 added Doozer to README Niels Lohmann 2019-03-26 10:49:14 +01:00
  • 0991824584 👷 version output Niels Lohmann 2019-03-26 10:41:05 +01:00
  • 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 +02:00
  • 9d2f0391e0 👷 fixed timeout Niels Lohmann 2019-03-25 12:30:45 +01:00
  • af9da22b87 👷 adding xenial-armhf Niels Lohmann 2019-03-25 07:15:03 +01:00
  • 0a67b51fce 👷 forgot path to ctest Niels Lohmann 2019-03-25 07:03:41 +01:00
  • e27b282033 👷 skip certificate check Niels Lohmann 2019-03-25 06:45:35 +01:00
  • cde0b24389 👷 fixed required packages Niels Lohmann 2019-03-25 06:43:14 +01:00
  • f091fe31bc 👷 increased timeout Niels Lohmann 2019-03-25 06:39:41 +01:00
  • 28dfbedda7 👷 fixed timeout Niels Lohmann 2019-03-24 18:14:59 +01:00
  • ff51a32be1 updated doctest to version 2.3.1 released today onqtam 2019-03-24 17:28:52 +02:00
  • 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest onqtam 2019-03-24 17:21:44 +02:00
  • dcbc028b5b 👷 fixed syntax Niels Lohmann 2019-03-24 09:02:46 +01:00
  • 842d42b135 👷 unified paths Niels Lohmann 2019-03-24 09:02:06 +01:00
  • 1e86976cfe 👷 fixed paths Niels Lohmann 2019-03-24 08:53:30 +01:00
  • 30211477b7 👷 fixed package name Niels Lohmann 2019-03-24 08:36:01 +01:00
  • 5e1cae0a7d 👷 install g++ Niels Lohmann 2019-03-24 08:24:50 +01:00
  • c871c9a01c 👷 install correct g++ Niels Lohmann 2019-03-24 06:51:10 +01:00
  • 63d619e21f 👷 need to install g++ Niels Lohmann 2019-03-24 00:48:59 +01:00
  • c94b764a6e 👷 fixed installation Niels Lohmann 2019-03-24 00:43:01 +01:00
  • 65cdccfa8a 👷 fixed syntax error Niels Lohmann 2019-03-24 00:36:46 +01:00
  • a72ac18514 👷 use recent cmake Niels Lohmann 2019-03-24 00:36:05 +01:00
  • 4327ae0bef 👷 need more recent cmake for CentOS Niels Lohmann 2019-03-24 00:15:57 +01:00
  • fabf953305 👷 fixed a typo Niels Lohmann 2019-03-24 00:12:36 +01:00
  • 6e3e2ee2e4 👷 fixed buildenv values Niels Lohmann 2019-03-24 00:11:20 +01:00
  • bc5089e803 👷 add test output to avoid timeout Niels Lohmann 2019-03-24 00:02:41 +01:00
  • 7dd3e6384b 👷 added Fedora and CentOS Niels Lohmann 2019-03-23 23:42:29 +01:00
  • 490c6e926e 👷 using raspbian Niels Lohmann 2019-03-23 23:27:39 +01:00
  • 2fcca259b0 👷 added cmake Niels Lohmann 2019-03-23 23:21:17 +01:00
  • 72dd6f349e 👷 trying doozer Niels Lohmann 2019-03-23 23:18:27 +01:00
  • baaa2a4d0f 🏁 trying to use constructors from std::allocator #1536 Niels Lohmann 2019-03-21 14:09:29 +01:00
  • 1126c9ca74 Merge branch 'release/3.6.1' into develop v3.6.1 Niels Lohmann 2019-03-20 21:03:43 +01:00
  • 295732a817 Merge branch 'release/3.6.1' 3.6.1 Niels Lohmann 2019-03-20 21:03:30 +01:00
  • efa1b9a7bb 🔖 set version to 3.6.1 Niels Lohmann 2019-03-20 20:50:05 +01:00
  • b33093d610 🐛 fixed regression #1530 Niels Lohmann 2019-03-20 14:40:23 +01:00
  • 9d6ab9014f 🏁 fixed a compilation error in MSVC #1531 Niels Lohmann 2019-03-20 14:13:29 +01:00
  • c790b9f8c0 🐛 fixed regression #1530 Niels Lohmann 2019-03-20 12:41:08 +01:00
  • 483a086562 ⚗️ added funding link Niels Lohmann 2019-03-20 11:42:24 +01:00
  • d2a08ddafd Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2019-03-20 11:06:55 +01:00
  • 7c55510f76 🚨 fixed some warnings #1527 Niels Lohmann 2019-03-20 11:06:39 +01:00
  • 3ac5fa31c5 💬 update issue templates Niels Lohmann 2019-03-20 01:27:37 +01:00
  • 51e1564c9e Merge branch 'release/3.6.0' into develop v3.6.0 Niels Lohmann 2019-03-20 00:38:29 +01:00
  • 944267f522 Merge branch 'release/3.6.0' Niels Lohmann 2019-03-20 00:38:16 +01:00
  • 0abf0f80c9 🔖 set version to 3.6.0 Niels Lohmann 2019-03-20 00:22:12 +01:00
  • b37392b7ac 🔖 set version to 3.6.0 Niels Lohmann 2019-03-20 00:19:07 +01:00
  • 002addabd8 🚨 fixed a warning Niels Lohmann 2019-03-19 23:10:21 +01:00
  • a6f9b4e36d 👥 added contributors Niels Lohmann 2019-03-19 17:18:33 +01:00
  • 18cc7ddd62 📝 completed documentation index page Niels Lohmann 2019-03-19 16:03:02 +01:00
  • e07e8e7912 📝 updated documentation Niels Lohmann 2019-03-19 15:40:23 +01:00
  • 710f26f95c 📝 added documentation Niels Lohmann 2019-03-19 10:06:35 +01:00
  • b224c52376 🎨 cleanup Niels Lohmann 2019-03-19 09:17:14 +01:00
  • 37a72dac48 💚 forgot two semicolons Niels Lohmann 2019-03-18 17:23:34 +01:00
  • 155d196bfa Update CMakeLists.txt Viktor Kirilov 2019-03-18 17:58:35 +02:00
  • 365944b0bc Merge branch 'develop' into doctest Viktor Kirilov 2019-03-18 16:59:36 +02:00
  • 8d3f4f21bc 🔨 clean up Niels Lohmann 2019-03-18 13:53:48 +01:00
  • 9fc093c9e0 👷 added targets for infer and oclint Niels Lohmann 2019-03-18 00:19:28 +01:00
  • 22c733e6fe 📝 added documentation Niels Lohmann 2019-03-17 22:25:18 +01:00
  • 56f6d1d68e 💚 fix CI and #1521 Niels Lohmann 2019-03-17 15:20:22 +01:00