Commit Graph

344 Commits

Author SHA1 Message Date
Niels Lohmann
5534a77221
🔥 consolidate documentation 2021-11-04 14:26:05 +01:00
Niels Lohmann
ca5ecc2945
🔥 consolidate documentation 2021-11-03 14:51:19 +01:00
Niels Lohmann
561fe8959c
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
 Conflicts:
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
2021-11-03 13:58:08 +01:00
Niels Lohmann
5d87c4d409
Add recursive update function (#3069)
*  add recursive update function
2021-11-03 13:52:20 +01:00
Niels Lohmann
dee9c8c4db
🔥 consolidate documentation 2021-11-01 22:28:53 +01:00
Niels Lohmann
fd054df1c6
🔥 consolidate documentation 2021-10-31 14:02:31 +01:00
Niels Lohmann
ade4e8b8db
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen 2021-10-31 12:48:22 +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
e1a0d3f2e7
🔀 merge develop branch 2021-10-16 14:54:31 +02:00
Niels Lohmann
64c7d3c9d8
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen
 Conflicts:
	doc/Doxyfile
	doc/examples/README.link
2021-10-16 14:53:59 +02:00
Niels Lohmann
9dc6d70db8
🔥 consolidate documentation 2021-10-16 14:45:29 +02:00
Niels Lohmann
7dfe09f7ac
🔥 consolidate documentation 2021-10-16 14:21:49 +02:00
Niels Lohmann
15a779cde7
🔥 consolidate documentation 2021-10-16 14:10:09 +02:00
Niels Lohmann
17a31bf503
🔥 consolidate documentation 2021-10-16 13:56:49 +02:00
Niels Lohmann
a09bfa5faa
🔖 set version to 3.10.4 2021-10-16 13:34:31 +02:00
Niels Lohmann
421555bb01
🔥 consolidate documentation 2021-10-13 22:12:49 +02:00
Niels Lohmann
0de7ba9b2c
🔥 consolidate documentation 2021-10-13 22:03:34 +02:00
Niels Lohmann
0eea6f241e
🔥 consolidate documentation 2021-10-13 21:54:41 +02:00
Niels Lohmann
0b02eb0dfb
🔥 consolidate documentation 2021-10-13 21:44:34 +02:00
Niels Lohmann
fdef0dc860
🔥 consolidate documentation 2021-10-13 21:17:14 +02:00
Niels Lohmann
d41464eee0
🔥 consolidate documentation 2021-10-10 16:07:47 +02:00
Niels Lohmann
25ff9a2d6f
🔥 consolidate documentation 2021-10-10 15:57:54 +02:00
Niels Lohmann
5e04a6a2ba
🔥 consolidate documentation 2021-10-10 15:32:59 +02:00
Niels Lohmann
cb60de9e69
🔥 consolidate documentation 2021-10-10 15:12:26 +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