6c7cde181c
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2019-07-14 20:58:29 +02:00
6a3cdb281e
Package Manager: MSYS2 (pacman)
...
Add a package installation instructions for MSYS2 software distro.
2019-07-12 22:27:17 +03:00
346e9813c5
🚧 add more annotations
2019-07-02 20:25:51 +02:00
0c214949f5
✏️ Fix links to create an issue page
2019-06-04 11:27:25 +04:30
b22c577e83
✏️ Fix brew instructions in README
2019-06-04 11:25:44 +04:30
0d55ddc5bf
✏️ Fix a typo in README
2019-06-04 11:24:22 +04:30
40c3d5024a
Fix broken links to documentation
...
Fixes #1597 and some other links
2019-05-12 22:04:01 +04:30
cf6b6692aa
Merge branch 'develop' into feature/fastcov
2019-04-06 09:03:35 +02:00
f0bc16d899
🔨 overworked coverage targets
2019-04-06 09:02:17 +02:00
63fe1cbbcf
📝 updated README
2019-04-05 18:29:57 +02:00
82af0ecdc1
Merge branch 'develop' into doctest
2019-03-26 23:32:32 +02:00
24d91cf36f
📝 added Doozer to README
2019-03-26 10:49:14 +01:00
2b346099df
Merge branch 'develop' of https://github.com/nlohmann/json into doctest
2019-03-24 17:21:44 +02:00
b37392b7ac
🔖 set version to 3.6.0
2019-03-20 00:19:07 +01:00
a6f9b4e36d
👥 added contributors
2019-03-19 17:18:33 +01:00
365944b0bc
Merge branch 'develop' into doctest
2019-03-18 16:59:36 +02:00
02b3494711
🔥 removing unstable macOS builds on Traivs
2019-03-16 08:28:44 +01:00
d39842e68f
Merge pull request #1330 from ax3l/topic-installEmbed
...
CMake: Optional Install if Embedded
2019-03-13 11:13:09 +01:00
c11bead2ae
👷 removing more retired Travis images
2019-03-11 21:22:30 +01:00
16d9cdce45
📝 updated documentation of CI
2019-03-11 15:19:50 +01:00
e3729ba0a5
💚 fix compiler selection
2019-03-11 07:44:40 +01:00
e5c7fd488d
👷 trying new Travis workers
2019-03-10 22:56:14 +01:00
8aeee4f7e3
Update README.md
...
* Updates Buckaroo instructions to v2
2019-02-25 09:44:38 +00:00
088a245218
Fix typo in README.ME
...
Fixes https://github.com/nlohmann/json/issues/1486 .
2019-02-22 01:05:00 +03:30
68ec3eb8d6
Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon
...
remove extra semicolon from readme
2019-01-25 13:36:18 +01:00
cca6d0dbae
docs: README type
...
Just another small typo I found in the README.
2019-01-24 10:49:45 -06:00
dc21cbb751
remove extra semicolon
...
in example of NLOHMANN_JSON_SERIALIZE_ENUM
2019-01-22 10:13:12 +01:00
2f44ac1def
moved from Catch to doctest for unit tests
2019-01-15 22:02:16 +02:00
b025d66eb5
Add instructions about using nlohmann/json with the conda package manager
2019-01-15 11:06:26 -02:00
7f73915d4f
Updated year in README.md
2019-01-11 08:54:03 -05:00
6546cad7bf
Fixed broken links in the README file
2019-01-10 08:54:53 +01:00
847dd2a954
Merge pull request #1420 from skypjack/patch-1
...
Fixed broken links in the README file
2019-01-09 22:33:40 +01:00
937b642e0e
📝 added description on how to use NuGet package #1132
...
Closes #1132 .
2019-01-09 21:08:06 +01:00
b8be0f64ae
Fixed broken links to operator[]() and at()
2019-01-09 15:11:54 +01:00
619bf9c20d
Fixed broke links to RFC7159
2019-01-09 15:05:09 +01:00
a559ff8fc6
typo in README
...
inintended -> unintended
2019-01-08 13:24:07 -06:00
98f4e31c3e
📝 formatted picture
2018-12-21 18:33:46 +01:00
58c269b039
📝 updated documentation
2018-12-21 18:27:56 +01:00
117c1d14fb
📝 added contributors to 3.5.0
2018-12-20 22:20:47 +01:00
767a3a327d
Link to issue #958 broken
2018-12-04 10:03:10 -05:00
d53873a251
Merge pull request #1363 from theodelrieu/doc/implicit_conversions
...
recommend using explicit from JSON conversions
2018-12-02 17:27:46 +01:00
5de184b8fb
readme: fix typo
2018-12-02 01:50:57 +05:30
7b961368d5
recommend using explicit from JSON conversions
2018-11-20 14:14:07 +01:00
f049836d68
CMake: Optional Install if Embedded
...
When adding this library as embedded library with private
"target link", e.g. only used inside private source files, the
library does not need to be installed when the main project gets
installed.
This adds an additional option `JSON_Install` similar to the
test-build control switch in order to skip installing headers and
CMake config files if requested.
Avoids using
```cmake
add_subdirectory(path/to/nlohmann_json EXCLUDE_FROM_ALL)
```
which has further side-effects:
https://cmake.org/cmake/help/v3.0/command/add_subdirectory.html
2018-11-02 10:18:00 +01:00
689382a722
Fix EOL Whitespaces & CMake Spelling
...
Fix little leftover EOL whitespaces in `CMakeLists.txt` and
a spelling of CMake in README.md
2018-11-02 09:35:17 +01:00
0f3c74d821
🔖 set version to 3.4.0
2018-10-30 22:18:45 +01:00
85aaf91b85
Merge branch 'develop' into feature/enum_json_mapping
2018-10-27 16:52:59 +02:00
ad639ad5e6
✨ added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208
2018-10-26 14:48:20 +02:00
62126278a6
🔨 added fix for arrays
2018-10-25 13:01:18 +02:00
f102df3cba
📝 updated documentation #1314
2018-10-24 09:28:57 +02:00
