Commit Graph

325 Commits

Author SHA1 Message Date
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
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
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
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
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
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
ca9a1f2fd4
📝 add note to outdated exceptions 2021-03-24 12:46:34 +01:00
Fraser
90d51b9205
Update parse_exceptions.md
Referring to https://github.com/nlohmann/json/blob/develop/doc/examples/parse_error.cpp  and https://json.nlohmann.me/home/exceptions/
(and also based on testing), the catch command should reference `catch (json::parse_error& ex)` and not `catch (json::exception::parse_error& ex)`
2021-03-18 12:25:12 -04:00
Niels Lohmann
7b7da08fb6
📝 update documentation 2021-01-23 10:04:19 +01:00
Niels Lohmann
d00ad33e46
📝 update documentation 2021-01-21 21:47:19 +01:00
Niels Lohmann
085d497bf7
📄 update copyright year 2021-01-03 20:28:06 +01:00
Niels Lohmann
00e3f69a26
⬆️ update Doxyfile for doxygen 1.9.0 2020-12-30 20:31:16 +01:00
Niels Lohmann
d8d8cbf6e0
🔨 fix site URL 2020-12-07 15:30:28 +01:00
Niels Lohmann
3322c9df6e
🔒 use HTTPS 2020-12-06 14:41:48 +01:00
Niels Lohmann
9d81eedb42
📝 fix and extend documentation of discarded values 2020-08-19 20:26:30 +02:00
Niels Lohmann
b386f4de0b
📝 fix and extend documentation of discarded values 2020-08-19 20:26:06 +02:00
Niels Lohmann
3be6ee3525
🚚 remove < from filename to fix Windows build 2020-08-16 21:39:40 +02:00
Niels Lohmann
fe507a7ee8
🚚 remove < from filename to fix Windows build 2020-08-16 21:36:21 +02:00
Niels Lohmann
6b04f05eba
📝 add more API documentation 2020-08-16 21:23:44 +02:00
Niels Lohmann
5c4cc20ed8
📝 add more API documentation 2020-08-16 20:48:10 +02:00
Niels Lohmann
a430d25f22
📝 add more API documentation 2020-08-16 14:48:48 +02:00