Commit Graph

4333 Commits

Author SHA1 Message Date
Niels Lohmann
96e5347c04
🚚 move images files to mkdocs 2021-11-05 20:24:38 +01:00
Niels Lohmann
00ab9e5ccc
🚚 move images files to mkdocs 2021-11-05 20:24:34 +01:00
Niels Lohmann
41bc172653
🚚 move images files to mkdocs 2021-11-05 20:24:06 +01:00
Niels Lohmann
e624c8941d
🔥 consolidate documentation 2021-11-05 15:11:05 +01:00
Niels Lohmann
09da90eb76
🚨 fix linter warnings 2021-11-05 14:48:28 +01:00
Niels Lohmann
d54fd35355
🚨 fix linter warnings 2021-11-05 14:26:19 +01:00
Niels Lohmann
df7b521fcd
♻️ rename subpages 2021-11-05 13:41:52 +01:00
Niels Lohmann
7bfe76848a
🔥 consolidate documentation 2021-11-05 13:33:21 +01:00
Niels Lohmann
0d06b5d5e7
🔥 consolidate documentation 2021-11-04 22:36:11 +01:00
Niels Lohmann
c353461f83
🔥 consolidate documentation 2021-11-04 22:10:12 +01:00
Niels Lohmann
54b05a2672
🔥 consolidate documentation 2021-11-04 22:02:48 +01:00
Niels Lohmann
be17f1d366
✏️ fix typos 2021-11-04 20:39:47 +01:00
Niels Lohmann
544a8888aa
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen 2021-11-04 19:14:03 +01:00
Niels Lohmann
5c08a52fd6
♻️ overwork std specializations (#3121) 2021-11-04 16:38:40 +01:00
Niels Lohmann
5534a77221
🔥 consolidate documentation 2021-11-04 14:26:05 +01:00
Niels Lohmann
4bf03fd8e7
🚨 suppress cert-dcl58-cpp 2021-11-03 22:27:41 +01:00
Niels Lohmann
dceb9b2493
♻️ overwork std specializations 2021-11-03 22:00:39 +01:00
Niels Lohmann
04d2020ea8
🚨 fix -fpermissive warnings 2021-11-03 21:25:51 +01:00
Niels Lohmann
5663bfa6c6
🚨 fix -fpermissive warnings 2021-11-03 21:25:46 +01:00
Niels Lohmann
2e66720982
🚨 add namespace comment 2021-11-03 20:54:15 +01:00
Niels Lohmann
b62f82e664
💚 fix build 2021-11-03 20:41:16 +01:00
Niels Lohmann
42c37d9c01
♻️ overwork std specializations 2021-11-03 15:20:44 +01:00
Niels Lohmann
ca5ecc2945
🔥 consolidate documentation 2021-11-03 14:51:19 +01:00
Niels Lohmann
cc218b7e80
💚 fix build 2021-11-03 14:16:54 +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
7440786b81
Update CI (#3088)
* 👷 prepare GitHub actions for new Docker image

* 👷 use experimental docker image

* 👷 use Clang-Analyzer 14

* 🔇 suppress readability-identifier-length

* 🔇 suppress more Clang-Tidy warnings

* ♻️ simplify code

* 🔇 suppress more Clang-Tidy warnings

* 🔇 suppress more Clang-Tidy warnings

* 🚨 fix warning

* 🚨 fix warning

* 🚨 fix warning

* 👷 use new Docker image
2021-10-29 21:27:34 +02: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
67c8ead923
Merge branch 'release/3.10.4' into develop 2021-10-16 14:47:23 +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
a8a6511f17
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen 2021-10-16 13:45:17 +02:00
Niels Lohmann
a09bfa5faa
🔖 set version to 3.10.4 2021-10-16 13:34:31 +02:00
Niels Lohmann
80cf9d7065
Revert invalid fix (#3082)
*  revert invalid fix
2021-10-16 13:27:28 +02:00
Niels Lohmann
ac91ab5798
Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen 2021-10-14 21:03:07 +02:00
Niels Lohmann
ba046e4ea4
Allow to use get with explicit constructor (#3079)
*  remove "fix" that caused #3077
2021-10-14 21:01:14 +02:00
Théo DELRIEU
0e694b4060
fix std::filesystem::path regression (#3073)
* meta: rework is_compatible/is_constructible_string_type

These type traits performed an incorrect and insufficient check.

Converting to a std::filesystem::path used to work by accident thanks to
these brittle constraints, but the clean-up performed in #3020 broke them.

* support std::filesystem::path

Fixes #3070
2021-10-14 19:19:46 +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
13d4e6bcf9
🔥 consolidate documentation 2021-10-13 21:21:02 +02:00