 Niels Lohmann
|
b6ee34cc99
|
Merge branch 'develop' of https://github.com/nlohmann/json into develop
|
2019-08-27 20:03:05 +02:00 |
|
|
Niels Lohmann
|
7dccfa5355
|
Merge pull request #1724 from t-b/enhance-travis
Add gcc 9 and compile with experimental C++20 support
|
2019-08-27 19:57:23 +02:00 |
|
 Thomas Braun
|
a4eaaa56d1
|
.travis.yml: Add gcc 9 and compile with experimental C++20 support
|
2019-08-26 12:38:36 +02:00 |
|
|
Niels Lohmann
|
fe618ac246
|
👷 adjust maintainer scripts
|
2019-07-29 18:49:21 +02:00 |
|
|
Niels Lohmann
|
a015b78e81
|
🔒 add security policy
|
2019-07-28 21:46:32 +02:00 |
|
|
Niels Lohmann
|
6291803f59
|
👥 update contributors
|
2019-07-28 21:31:17 +02:00 |
|
|
Niels Lohmann
|
53c3eefa2c
|
Merge branch 'release/3.7.0' into develop
v3.7.0
|
2019-07-28 21:23:36 +02:00 |
|
|
Niels Lohmann
|
d275d05514
|
📝 update documentation
|
2019-07-28 20:54:02 +02:00 |
|
|
Niels Lohmann
|
ddb7f70a12
|
📝 update documentation
|
2019-07-28 20:53:18 +02:00 |
|
|
Niels Lohmann
|
48e1fe03b5
|
🔖 set version to 3.7.0
|
2019-07-28 20:20:41 +02:00 |
|
|
Niels Lohmann
|
66d63abe6d
|
Update Makefile
|
2019-07-28 18:40:11 +02:00 |
|
|
Niels Lohmann
|
d4fd731f1f
|
🔨 fix release target
|
2019-07-28 17:55:01 +02:00 |
|
|
Niels Lohmann
|
d80f8b09f5
|
🔨 adjust version
|
2019-07-28 15:20:07 +02:00 |
|
|
Niels Lohmann
|
7bf8a86090
|
🔨 adjust paths
|
2019-07-28 14:30:17 +02:00 |
|
|
Niels Lohmann
|
65e4b973bd
|
🔥 remove leftover file
|
2019-07-21 14:10:37 +02:00 |
|
|
Niels Lohmann
|
323cf95d8c
|
🚨 fix linter warning
|
2019-07-21 14:04:49 +02:00 |
|
|
Niels Lohmann
|
ffe0e3d70f
|
Merge pull request #1673 from remyabel/gnuinstalldirs
Use GNUInstallDirs instead of hard-coded path.
|
2019-07-17 06:28:38 +02:00 |
|
 Tommy Nguyen
|
3184e9bd8b
|
Use GNUInstallDirs instead of hard-coded path.
|
2019-07-16 11:44:32 -04:00 |
|
|
Niels Lohmann
|
cf8251eb54
|
🚑 fix compiler errors
|
2019-07-14 21:19:55 +02:00 |
|
|
Niels Lohmann
|
6c7cde181c
|
Merge branch 'develop' of https://github.com/nlohmann/json into develop
|
2019-07-14 20:58:29 +02:00 |
|
|
Niels Lohmann
|
a501365ea2
|
Merge branch 'feature/hedley' into develop
|
2019-07-14 20:58:08 +02:00 |
|
|
Niels Lohmann
|
8d059b96a1
|
Merge pull request #1670 from podsvirov/readme-package-managers-msys2
Package Manager: MSYS2 (pacman)
|
2019-07-13 17:58:08 +02:00 |
|
 Konstantin Podsvirov
|
6a3cdb281e
|
Package Manager: MSYS2 (pacman)
Add a package installation instructions for MSYS2 software distro.
|
2019-07-12 22:27:17 +03:00 |
|
|
Niels Lohmann
|
b17440c12f
|
🚨 fix compiler warnings
|
2019-07-12 21:05:16 +02:00 |
|
|
Niels Lohmann
|
104c5c1996
|
Merge branch 'feature/json_pointer_contains' into develop
|
2019-07-09 08:08:56 +02:00 |
|
|
Niels Lohmann
|
7a23aa1c0d
|
Merge branch 'feature/emplace_back' into develop
|
2019-07-09 08:06:27 +02:00 |
|
|
Niels Lohmann
|
24fa285edb
|
📝 remove HEDLEY annotation from documentation
|
2019-07-02 21:15:52 +02:00 |
|
|
Niels Lohmann
|
947656544d
|
🚨 fix warnings
|
2019-07-02 21:06:42 +02:00 |
|
|
Niels Lohmann
|
346e9813c5
|
🚧 add more annotations
|
2019-07-02 20:25:51 +02:00 |
|
|
Niels Lohmann
|
9289a23a76
|
Merge pull request #1643 from kevinlul/develop
Fix json.hpp compilation issue with other typedefs with same name (Issue #1642)
|
2019-07-01 22:57:04 +02:00 |
|
|
Niels Lohmann
|
90798caa62
|
🚚 rename Hedley macros
|
2019-07-01 22:37:30 +02:00 |
|
|
Niels Lohmann
|
025f4cea42
|
🚨 fix warning
|
2019-07-01 22:29:21 +02:00 |
|
|
Niels Lohmann
|
897362191d
|
🔨 add NLOHMANN_JSON prefix and undef macros
|
2019-07-01 22:24:39 +02:00 |
|
|
Niels Lohmann
|
1720bfedd1
|
⚗️ add Hedley annotations
|
2019-06-30 22:14:02 +02:00 |
|
 kevinlul
|
e616d095ab
|
Remove boolean regression test for #1642
|
2019-06-30 11:57:57 -04:00 |
|
|
Niels Lohmann
|
1be63431f3
|
✨ make emplace_back return a reference #1609
|
2019-06-30 12:19:41 +02:00 |
|
|
Niels Lohmann
|
258fa798f1
|
✨ add contains function for JSON pointers
|
2019-06-30 10:03:08 +02:00 |
|
|
kevinlul
|
855156b5e8
|
Add regression tests for #1642
|
2019-06-29 19:26:38 -04:00 |
|
|
Niels Lohmann
|
9a775bcb14
|
Merge pull request #1570 from nickaein/msvc-regression-tests
Regression tests for MSVC
|
2019-06-25 07:05:53 +02:00 |
|
 Isaac Nickaein
|
5b2e2305a0
|
CI: Skip test-unit_all on MSVC Debug builds
|
2019-06-24 21:21:58 +04:30 |
|
|
Isaac Nickaein
|
3db14cbfae
|
📝 Improve doc on const_inter constructor
|
2019-06-24 15:40:01 +04:30 |
|
|
Isaac Nickaein
|
0a137b78ac
|
Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake
|
2019-06-22 22:14:40 +04:30 |
|
|
Isaac Nickaein
|
f559142008
|
Appveyor: Set build mode explicitly
|
2019-06-22 21:15:17 +04:30 |
|
|
Isaac Nickaein
|
eba8244ead
|
Avoid collision of ::max with windows.h macro
|
2019-06-22 21:15:13 +04:30 |
|
|
Isaac Nickaein
|
798e83a038
|
Workaround msvc2015 bug with explicit copy-constructor for const_iterator
|
2019-06-22 21:15:11 +04:30 |
|
|
Isaac Nickaein
|
d28b4b900e
|
Add a separate build with Windows.h included
|
2019-06-22 21:15:07 +04:30 |
|
|
Isaac Nickaein
|
4ac0fe2628
|
Increase timeout of test-unicode_all in Debug build
|
2019-06-22 21:15:03 +04:30 |
|
|
Isaac Nickaein
|
ec43d27f9f
|
Add Debug builds for AppVeyor
|
2019-06-22 21:14:51 +04:30 |
|
|
Niels Lohmann
|
39011a1759
|
📝 mention json type in documentation start page #1616
|
2019-06-22 09:54:59 +02:00 |
|
|
Niels Lohmann
|
3b82a350ed
|
📝 mention 302 exception in value() documentation #1601
|
2019-06-22 09:44:12 +02:00 |
|