j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 184e9c6aa7
         Merge pull request #885 from TinyTinni/develop Niels Lohmann 2017-12-23 11:09:46 +0100
  • d1cda6888e includes CTest module resp. BUILD_TESTING option Matthias Möller 2017-12-20 17:54:45 +0100
  • 88ddb12afc
         📝 fix for #883 Niels Lohmann 2017-12-18 19:46:53 +0100
  • e54b6ace94
         Merge pull request #882 from erengy/fix-msvc-c4819 Niels Lohmann 2017-12-17 19:52:57 +0100
  • ab0e8b2f3a
         Fix MSVC warning C4819 Eren Okka 2017-12-17 18:02:55 +0300
  • 1ca6ec1dc0
         Merge pull request #880 from nlohmann/coverity_scan Niels Lohmann 2017-12-17 11:24:40 +0100
  • 1856f38c85
         📝 removed paragraph on version 3.0.0 Niels Lohmann 2017-12-17 11:22:35 +0100
  • afebb6a3bb
         Merge branch 'release/3.0.0' into develop Niels Lohmann 2017-12-17 11:04:53 +0100
  • 9f81beb5e2
         Merge branch 'release/3.0.0' Niels Lohmann 2017-12-17 11:04:04 +0100
  • 106f9f5436
         ⬆️ updated git-update-ghpages script Niels Lohmann 2017-12-17 10:20:30 +0100
  • 9eb5e2c271
         🔖 set version to 3.0.0 Niels Lohmann 2017-12-17 08:40:19 +0100
  • 9e3c4ad11f
         🔖 set version to 3.0.0 Niels Lohmann 2017-12-17 08:31:18 +0100
  • 314e4e7699
         📝 improved documentation for dump and iterator_wrapper Niels Lohmann 2017-12-16 23:58:10 +0100
  • 9a51fb4da2
         🚨 fixed some warnings Niels Lohmann 2017-12-16 22:19:30 +0100
  • 7bf007f2bc
         Merge pull request #879 from nlohmann/feature/algorithms Niels Lohmann 2017-12-16 12:41:07 +0100
  • 980795b644
         ✏️ fixed typos Niels Lohmann 2017-12-16 12:37:44 +0100
  • f3bd755cab
         ➖ removing <iomanip> header Niels Lohmann 2017-12-16 12:37:25 +0100
  • 4c871c58f8
         ✅ re-added tests for algorithms Niels Lohmann 2017-12-16 11:16:34 +0100
  • c23f5dcea6
         📝 fixed year Niels Lohmann 2017-12-15 23:49:37 +0100
  • 2e1b1061cd
         Merge pull request #875 from nlohmann/feature/spelling Niels Lohmann 2017-12-14 22:31:19 +0100
  • 261caec2de
         👥 added contributor image Niels Lohmann 2017-12-14 22:29:39 +0100
  • f80827d068
         Merge pull request #873 from nlohmann/feature/issue872 Niels Lohmann 2017-12-14 09:35:48 +0100
  • 9a70c60fa5
         Revert "⬆️ updated to Catch 2.0.1" Niels Lohmann 2017-12-14 07:49:16 +0100
  • fb8482db76
         👌 fixed some issues from the last commit #875 Niels Lohmann 2017-12-13 23:44:53 +0100
  • c6e7eae394
         ✨ implemented JSON Merge Patch (RFC 7396) Niels Lohmann 2017-12-13 23:36:22 +0100
  • 920f64c01c
         ⬆️ updated to Catch 2.0.1 Niels Lohmann 2017-12-13 22:18:05 +0100
  • 293748a9a9
         📝 overworked README Niels Lohmann 2017-12-13 22:17:02 +0100
  • e8d9963abe
         👌 cosmetic changes and overworked spelling Niels Lohmann 2017-12-13 22:15:53 +0100
  • a9a4ff61c6
         🚨 remove C4996 warnings #872 Niels Lohmann 2017-12-13 17:01:39 +0100
  • f7ae143a93
         Merge pull request #870 from nlohmann/feature/issue838 Niels Lohmann 2017-12-13 06:34:11 +0100
  • 8419bfbbd2
         ✅ improved test coverage Niels Lohmann 2017-12-12 20:44:57 +0100
  • 569d275f65
         💥 throwing an exception in case dump encounters a non-UTF-8 string #838 Niels Lohmann 2017-12-11 22:38:05 +0100
  • 383743c6c0
         Merge pull request #868 from nlohmann/feature/issue867 Niels Lohmann 2017-12-11 08:55:26 +0100
  • 7de009edd1
         ✏️ fixing typos #869 Niels Lohmann 2017-12-10 13:07:47 +0100
  • 772bb3cc20
         📝 fixing documentation #867 Niels Lohmann 2017-12-10 12:32:20 +0100
  • 0693945230
         Merge pull request #860 from bogemic/std_iterator_conformance_cpp17 Niels Lohmann 2017-12-08 07:55:47 +0100
  • 64d6daa76e iter_impl template conformance with C++17 Mike Bogdanov 2017-12-07 11:28:28 +0300
  • 7c2d4f1852
         👷 added Xcode 9.1 and 9.2 Niels Lohmann 2017-12-06 22:32:03 +0100
  • 9e2f185ac6
         💄 reformatted code after PRs Niels Lohmann 2017-12-06 22:21:11 +0100
  • c5e731774a
         Merge pull request #856 from bogemic/std_allocator_conformance_cpp17 Niels Lohmann 2017-12-06 21:52:52 +0100
  • 25d205c16d
         📝 clarified difference between serialization and string value retrieval #853 Niels Lohmann 2017-12-06 21:42:36 +0100
  • fa76f2efd7
         Merge pull request #855 from theodelrieu/fix/cmake_include_directories Niels Lohmann 2017-12-06 20:47:38 +0100
  • 8890b935fd fixed merge conflicts Mike Bogdanov 2017-12-06 12:24:50 +0300
  • daba1b6a0b fixed conformance with C++17, some members of allocator are depricated and should be used via allocator_traits Mike Bogdanov 2017-12-05 14:27:08 +0300
  • 0e3a0b730b
         Merge pull request #854 from theodelrieu/fix/force_msvc_stacktrace Niels Lohmann 2017-12-05 19:36:31 +0100
  • 541ee62a05
         cmake: use BUILD_INTERFACE/INSTALL_INTERFACE in target_include_directories Théo DELRIEU 2017-12-05 11:27:03 +0100
  • c9a02cbc59
         to/from_json: add a MSVC-specific static_assert to force a stacktrace Théo DELRIEU 2017-12-05 10:52:55 +0100
  • f4c01601fa
         Merge pull request #844 from TinyTinni/develop Niels Lohmann 2017-12-04 21:43:22 +0100
  • 24fe572d98 missing new line Matthias Möller 2017-11-30 13:37:58 +0100
  • 8e9a8792a9 moved natis to root dir Matthias Möller 2017-11-30 13:26:45 +0100
  • af775ddbb8 add compiler & cmake version check Matthias Möller 2017-11-28 23:43:39 +0100
  • 48d7a32daa add .natvis for MSVC debug view Matthias Möller 2017-11-26 10:31:33 +0100
  • 5b4855dea2 fix targetname Matthias Möller 2017-11-26 10:29:51 +0100
  • cc937deaf6
         🚑 the last commit contained a bug #821 Niels Lohmann 2017-11-26 10:15:23 +0100
  • 430f03512c
         🚨 fixed some warnings #821 Niels Lohmann 2017-11-25 22:06:18 +0100
  • ea5aed0769
         Merge branch 'feature/to_array' into develop Niels Lohmann 2017-11-25 19:41:11 +0100
  • de75cf89f7
         ✅ improved test coverage Niels Lohmann 2017-11-25 19:41:02 +0100
  • 52ca35b2b0
         Merge pull request #829 from jowr/patch-1 Niels Lohmann 2017-11-18 13:35:21 +0100
  • 7b8ddadd83
         removed hunter badge Jorrit Wronski 2017-11-16 21:01:27 +0100
  • b5ddd99adf
         Updated hunter package links Jorrit Wronski 2017-11-15 08:48:11 +0100
  • 4c4f60f438
         📝 fixes #820 Niels Lohmann 2017-11-06 20:35:05 +0100
  • 1af5601a2a
         Merge pull request #811 from Itja/patch-1 Niels Lohmann 2017-10-31 18:23:42 +0100
  • e423aea64a
         Typos README Itja 2017-10-31 16:31:14 +0100
  • 5696660eba
         🔨 another try to fix #714 Niels Lohmann 2017-10-31 15:04:14 +0100
  • c4d6626745
         🚀 installed Request Info Bot Niels Lohmann 2017-10-30 16:04:34 +0100
  • 6d2981db82
         📝 overworked templates Niels Lohmann 2017-10-29 16:32:23 +0100
  • 87df1d6708
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-10-29 11:55:04 +0100
  • fa1425b87c
         🚀 installed Sentiment Bot Niels Lohmann 2017-10-29 11:54:53 +0100
  • 73d0095154
         Merge pull request #807 from theodelrieu/fix/805 Niels Lohmann 2017-10-28 15:33:22 +0200
  • 4b46abf97c
         add forwarding references to json_ref constructor Théo DELRIEU 2017-10-28 14:22:57 +0200
  • 8e067c0c3c
         🔨 set bidirectional iterator tag #593 Niels Lohmann 2017-10-28 09:41:35 +0200
  • cea3f24ff9
         📝 comment to address #561 Niels Lohmann 2017-10-27 16:39:52 +0200
  • 61cc07ff38
         📝 some documentation Niels Lohmann 2017-10-27 16:07:04 +0200
  • 734e2b73cf
         🔨 cleanup Niels Lohmann 2017-10-27 11:49:24 +0200
  • 7820b5eccb
         📝 thanks for #795 Niels Lohmann 2017-10-27 11:49:17 +0200
  • 77f8e2f987 Merge pull request #795 from jseward/develop Niels Lohmann 2017-10-27 11:47:23 +0200
  • c215b77936
         🚀 installed Stale Bot Niels Lohmann 2017-10-25 11:37:33 +0200
  • 992c836b30 Add missing spaces Jamie Seward 2017-10-24 00:14:25 -0700
  • 715c98b404 Remove extra spaces Jamie Seward 2017-10-24 00:06:22 -0700
  • 6c9a401ebc Remove old non-perfect forwarding find and count Jamie Seward 2017-10-24 00:01:56 -0700
  • 16ffdbcb20 Remove c++17 support flag in cmake Jamie Seward 2017-10-23 23:50:06 -0700
  • 73b1629a15 Remove tabs for spaces Jamie Seward 2017-10-23 23:45:39 -0700
  • 1b1bd0e3e6
         ⏪ #714 is still not fixed Niels Lohmann 2017-10-23 12:01:50 +0200
  • 33c6511dd0 Remove JSON_HAS_STRING_VIEW Jamie Seward 2017-10-23 00:43:26 -0700
  • 89650c99dd
         🚧 checking if #714 is now fixed with MSVC Niels Lohmann 2017-10-22 11:16:33 +0200
  • b0c380b0f8
         📝 cleanup after the last PRs Niels Lohmann 2017-10-22 09:12:35 +0200
  • be4fba7baf
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-10-22 08:53:46 +0200
  • f193427e91
         🔨 some simplifications Niels Lohmann 2017-10-22 08:53:43 +0200
  • 24b6e028a9
         ✅ improved test coverage Niels Lohmann 2017-10-22 08:53:27 +0200
  • 3094640446 Merge pull request #764 from pjkundert/develop-simplify-istream Niels Lohmann 2017-10-22 08:52:28 +0200
  • ef40673acb Merge branch 'develop' into develop-simplify-istream Niels Lohmann 2017-10-22 08:52:15 +0200
  • d468f8c4e6 Use consistent logic to determine if string_view exists Jamie Seward 2017-10-21 16:36:05 -0700
  • 59cde1ad6e Fix for _HAS_CXX17 == 0 Jamie Seward 2017-10-21 16:29:37 -0700
  • 1a66679929 Add string_view support Jamie Seward 2017-10-21 15:20:13 -0700
  • 33df3250c3 Merge pull request #793 from sonulohani/develop Niels Lohmann 2017-10-21 10:58:27 +0200
  • 92da334862 Error : 'identifier "size_t" is undefined' in linux Sonu Lohani 2017-10-21 12:52:44 +0530
  • 2e281ba64b Merge pull request #788 from jseward/develop Niels Lohmann 2017-10-18 15:04:24 +0200
  • a99fcb4e7d Add comments and newline Jamie Seward 2017-10-17 22:53:35 -0700
  • 917d9d8bc3 Fix Visual Studio 2017 warnings Jamie Seward 2017-10-16 23:23:55 -0700
  • 7c8f0a4186 Merge pull request #785 from jseward/develop Niels Lohmann 2017-10-16 19:48:17 +0200