External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,334 Commits 10 Branches 56 Tags 212 MiB
e86d8b9477
Commit Graph

339 Commits

Author SHA1 Message Date
Niels Lohmann
76109db662
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 2021-11-20 11:21:44 +01:00
Daniel Albuschat
ee1208aa60
Docs: Update skip_comments to ignore_comments (#3145) 
In the docs, the `ignore_comments` parameter to `nlohmann::json::parse()` is described as `skip_comments`, which does not match the actual implementation. While the demo code compiles and works, the parameter name is wrong.
 2021-11-17 19:21:54 +01:00
Dirk Stolle
fe230334d9
fix typos in documentation (#3140) 
* fix typos in documentation

* revert changes to ChangeLog.md
 2021-11-14 14:25:14 +01:00
Niels Lohmann
5d87c4d409
Add recursive update function (#3069) 
* ✨ add recursive update function
 2021-11-03 13:52:20 +01:00
Niels Lohmann
c4a4e672fd
📝 add examples for parsing from iterator pair (#3100) 2021-10-29 21:26:41 +02:00
Cristi Vîjdea
f5b3fb326c
Fix typos in operator[] documentation (#3102) 
* Fix typos in operator[] documentation
* Fix additional typo
 2021-10-20 21:59:33 +02:00
Niels Lohmann
11eab8a831
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 
 Conflicts:
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2021-10-17 15:25:54 +02:00
Niels Lohmann
a09bfa5faa
🔖 set version to 3.10.4 2021-10-16 13:34:31 +02:00
Niels Lohmann
ab6a2c7425
🔖 set version to 3.10.3 2021-10-08 13:58:48 +02:00
Niels Lohmann
bbdb29c658
Update docset generation script (#2967) 
* 📝 update docset generation script

* 📝 update documentation
 2021-09-01 08:43:10 +02:00
Niels Lohmann
d15ad85203
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 
 Conflicts:
	include/nlohmann/detail/meta/type_traits.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2021-08-30 17:34:31 +02:00
Niels Lohmann
33b674b4b2
🔖 set version to 3.10.2 2021-08-26 08:13:04 +02:00
Niels Lohmann
8ad66e9136
🔖 set version to 3.10.1 2021-08-24 20:19:55 +02:00
mb0202
7194245a31
Fixed typo in parse.md (#2968) 
Changed a potential typo: "charater" -> "character"
 2021-08-24 08:08:02 +02:00
Niels Lohmann
34e2c4ab88
📝 add link to Homebrew package (#2966) 2021-08-22 21:58:37 +02:00
Niels Lohmann
44ffaa052c
Merge pull request #2943 from amirmasoudabdol/patch-1 
Updating the Homebrew Command
 2021-08-19 12:03:52 +02:00
Amir Masoud Abdol
14af5d4a9f fixing the doc files 2021-08-19 09:31:39 +02:00
Niels Lohmann
23e3b622aa
📝 add documentation for integration via vcpkg 2021-08-18 20:49:13 +02:00
Niels Lohmann
1de378f580
🔖 set version to 3.10.0 2021-08-17 15:23:23 +02:00
Niels Lohmann
8cae9d7cd2
Overwork warning flags (#2936) 
* ⚗️ update warning flags
 2021-08-17 14:43:43 +02:00
Niels Lohmann
09237272bc
👥 update documentation 2021-08-15 21:05:26 +02:00
Niels Lohmann
0a0eb7a850
Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 
 Conflicts:
	.github/workflows/windows.yml
 2021-08-14 11:19:48 +02:00
Niels Lohmann
8ae31a56a5
Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-11 08:06:32 +02:00
Niels Lohmann
68d8661f1b
📝 update documentation 2021-08-11 08:06:25 +02:00
Niels Lohmann
523f7c2c9d
💡 update documentation 2021-08-08 13:24:17 +02:00
Niels Lohmann
eb488bb4d9
📝 add note for wstring handling 2021-08-01 20:54:02 +02:00
Niels Lohmann
575c28ca4c
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 2021-07-22 09:29:17 +02:00
Niels Lohmann
19a5e12136
CMake cleanup (#2885) 
* 🔥 clean CMake files and Makefile
* 💡 update documentation
 2021-07-22 09:25:55 +02:00
Niels Lohmann
03270ef090
👥 update contributors 2021-07-19 16:57:15 +02:00
Niels Lohmann
45016c4429
⬆️ update Doxyfile 2021-07-19 16:56:43 +02:00
Niels Lohmann
926fab47d0
📝 fix GIF examples #2457 2021-07-17 14:43:01 +02:00
Niels Lohmann
a0863b8c20
📝 add support section 2021-07-17 13:44:54 +02:00
Niels Lohmann
3db8903f29
📝 restructure README 2021-07-16 15:00:11 +02:00
Niels Lohmann
fb1ee4f94b
📝 update documentation 2021-07-16 14:41:14 +02:00
Niels Lohmann
8ba8c43707
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 2021-07-16 08:45:53 +02:00
Niels Lohmann
a82f66beed
📝 document JSON_NO_IO macro #2842 2021-07-10 12:51:18 +02:00
Niels Lohmann
5c8d0af5ce
📝 add comment for handling of negative zeros #2854 2021-07-10 12:50:59 +02:00
justanotheranonymoususer
e970f31066
Update arbitrary_types.md 2021-06-18 12:44:27 +03:00
Niels Lohmann
eb0f8d734c
👌 apply review comments 2021-05-03 20:42:28 +02:00
Niels Lohmann
12c0bc4c9e
📝 document less-than comparability 2021-05-03 20:20:52 +02:00
Niels Lohmann
4a16e5596c
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 
 Conflicts:
	include/nlohmann/detail/meta/type_traits.hpp
	single_include/nlohmann/json.hpp
 2021-05-03 20:12:53 +02:00
Niels Lohmann
d0ab2b86c3
📝 update documentation 2021-04-29 17:19:57 +02:00
Niels Lohmann
cdfe865486
📝 add documentation for numbers 2021-04-28 20:33:05 +02:00
Niels Lohmann
ea4891fb5c
👌 implement some review comments 2021-03-31 10:42:08 +02:00
Niels Lohmann
69d74d4e3d
♻️ clean up 2021-03-30 08:41:44 +02:00
Niels Lohmann
0ff33d090b
👌 apply review comments 2021-03-29 22:32:54 +02:00
Niels Lohmann
203b53d7cb
💡 update documentation 2021-03-29 13:23:09 +02:00
Niels Lohmann
2f2c75942b
💚 fix build 2021-03-25 13:31:11 +01:00
Niels Lohmann
ba97e9f45d
📝 update documentation 2021-03-25 12:54:20 +01:00
Niels Lohmann
ca9a1f2fd4
📝 add note to outdated exceptions 2021-03-24 12:46:34 +01:00