haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,563 Commits
16 Branches
56 Tags
222 MiB
Commit Graph

489 Commits (e4675887a6444fcc5db52edbcf439fdaf3b1069e)

Author SHA1 Message Date
Niels Lohmann 1ecb7884d1
👥 update contributor list 2020-06-14 15:22:08 +02:00
Niels Lohmann 7444c7fa25
Merge pull request #2145 from FrancoisChabot/1813-user-input 
Fix Issue#1813: user defined input adapters
 2020-06-05 14:30:39 +02:00
Niels Lohmann 9212590764
👥 update contributor list 2020-06-03 13:56:01 +02:00
Niels Lohmann c24218afe8
Merge remote-tracking branch 'origin/develop' into develop 2020-06-03 13:38:15 +02:00
Niels Lohmann 2ad847f21b
🔨 fix doxygen link 2020-06-03 12:30:42 +02:00
Niels Lohmann fdf5a63dfd
🔨 fix Doxygen link 2020-06-03 12:30:10 +02:00
TotalCaesar659 0aa13599f0
Update URLs to HTTPS 2020-05-30 06:02:25 +03:00
Francois Chabot 0da131d717 minor readme correction 2020-05-28 17:12:26 -04:00
Francois Chabot 248f310215 cleaned up custom iterator example 2020-05-28 10:14:55 -04:00
Niels Lohmann 23c8ab95da
👥 update contributor list 2020-05-28 14:24:08 +02:00
Niels Lohmann 5ff4d7b7ff
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-05-28 12:54:13 +02:00
Francois Chabot d3caf93ab0
Merge branch 'develop' into 1813-user-input 2020-05-28 03:40:34 -04:00
Francois Chabot 3a91a05db6 added custom input to readme 2020-05-28 03:13:39 -04:00
Quentin Barbarat e44418ea26
readme: fix typo in CMake FetchContent example 2020-05-27 13:51:13 +02:00
Niels Lohmann 325e8ab8ab
🔧 explicitly switch on tests in CI 2020-05-27 13:22:14 +02:00
Niels Lohmann ed5c28d00c
👥 update contributor list 2020-05-27 13:07:24 +02:00
Niels Lohmann 27fe50dc92
📝 add example for contains #2133 
Closes #2133.
 2020-05-26 12:46:04 +02:00
Antony Kellermann 49000cd77d Update documentation to reflect addition of Arch Linux CI testing. 2020-05-25 20:46:39 -04:00
Niels Lohmann 5dec7166ea
Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-18 09:13:22 +02:00
Niels Lohmann 16d78a82e0
👷 add link to GitHub workflows 2020-05-18 09:12:18 +02:00
Niels Lohmann 904642f261
♻️ rename internal_binary_t with binary_t 2020-05-17 22:50:27 +02:00
Niels Lohmann fc267af909
📝 update CI list 2020-05-14 17:53:00 +02:00
Niels Lohmann 33ae93beed
📝 update CI list 2020-05-14 07:55:01 +02:00
Niels Lohmann ec68bb3387
📝 update CI list 2020-05-13 20:18:56 +02:00
Niels Lohmann 6778ad8b0a
📝 update year 2020-05-12 22:26:55 +02:00
Niels Lohmann 7dbe5cf904
📝 update badges 2020-05-12 21:43:33 +02:00
Niels Lohmann a3a803a389
📝 add FOSSA status badge 2020-05-10 13:49:26 +02:00
Niels Lohmann a50a14088c
Merge pull request #2081 from nlohmann/external_test_data 
Use external test data
 2020-05-04 20:58:02 +02:00
Niels Lohmann 2f0d37d7d2
🔥 remove fastcov 2020-05-02 23:48:11 +02:00
Niels Lohmann 9c0c58d948
🔥 remove Doozer CI 2020-05-02 23:41:28 +02:00
ArthurSonzogni f26689e006 Fix README.md 
About pull request:
https://github.com/nlohmann/json/pull/2074

An error has been introduced by accepting the suggestions:
4be4a038cc

One was about removing ~~~, but it was meant to be replaced by ``` in
reality. This caused the README.md to be slightly broken.
 2020-05-01 13:55:24 +02:00
Niels Lohmann 798dbb5c19
📝 add detail 2020-05-01 13:19:49 +02:00
Arthur Sonzogni 4be4a038cc
Apply suggestions from code review 
Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
 2020-04-29 21:08:39 +02:00
ArthurSonzogni c331706644 Add CMake fetchcontent documentation and tests 
Github issue:
https://github.com/nlohmann/json/issues/2073

nlohmann::json documents 2 way of depending on it using CMake
1) Copy-paste the project/source into your own project.
2) Install nlohman::json and then use find_package.

(1) pollutes your git repository, (2) requires everyone to install the
dependencies themselves.

Since 2018, CMake provide some kind of 'package manager' features using
[FetchContent](https://cmake.org/cmake/help/v3.17/module/FetchContent.html)
It gives the following:
~~~cmake
include(FetchContent)

FetchContent_Declare(json
  GIT_REPOSITORY https://github.com/nlohmann/json
  GIT_TAG v3.7.3)

FetchContent_GetProperties(json)
if(NOT json_POPULATED)
  FetchContent_Populate(json)
  add_subdirectory( ${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
~~~

Then declares the dependency in the target using it:
~~~cmake
target_link_library(my_project PRIVATE nlohmann_json::nlohmann_json
~~~

This patch updates the documentation and provides tests.
 2020-04-29 18:28:06 +02:00
Alexander Myasnikov b01bc05b2b
updated wandbox link 2020-04-23 13:32:42 +03:00
Evgenii Sopov d164a2bf09 Added wsjcpp.yml: C++ Source Package Manager 2020-04-11 16:30:04 +07:00
Niels Lohmann c6b298799a
👷 remove failing Travis workers 2020-04-07 09:09:44 +02:00
Niels Lohmann 554e8c7356
Merge pull request #2002 from alexandermyasnikov/develop 
fix error 'setw' is not a member of 'std' in Wandbox example
 2020-04-05 21:58:21 +02:00
Niels Lohmann 379ed1f67e
💰 add sponsor 2020-04-05 15:23:00 +02:00
Alexander Myasnikov 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example 2020-03-21 18:34:40 +03:00
Niels Lohmann 19843b038c
Merge pull request #1933 from dota17/dota17-FAQ 
Update README.md : add a FAQ about memory release
 2020-03-19 11:25:47 +01:00
Niels Lohmann ebb5a4c09f
💰 add sponsor 2020-03-19 11:14:50 +01:00
chenguoping 2ccdfebaa7 fix typo 2020-03-14 18:10:55 +08:00
Alexander “weej” Jones 5fdb1d08aa
README: Fix string representation of `dump`ed `json` 
As is it's confusing and inconsistent with the indented form right below. The backslash escapes make it confusing.
 2020-03-10 19:37:20 +00:00
Chen 42566c6bef
Update README.md 2020-02-17 15:40:52 +08:00
Chen 88097a250f
Update README.md : add a FAQ about memory release 2020-02-10 21:03:57 +08:00
Antoine Cœur 8d92ca865f Some typos 2020-02-02 17:29:37 +08:00
Niels Lohmann 6a6790ab68
Merge pull request #1917 from jothepro/update-links-to-hunter 
Readme: Updated links to hunter repo & docs
 2020-01-31 11:47:42 +01:00
Dave Lee f25a1287f9
Fix link to parse function in README 2020-01-29 14:19:00 -08:00
jothepro 0257533866
Updated links to hunter repo & docs 
hunter was recently passed over to a new maintainer, this is why the github url & the link to the documentation have changed.
 2020-01-29 22:33:59 +01:00