 Niels Lohmann
|
a46afd4008
|
Merge pull request #679 from traits/patch-1
Digraph warning
|
2017-08-10 11:39:13 +02:00 |
|
|
Niels Lohmann
|
d26b3f1fe5
|
Merge pull request #686 from WebProdPP/patch-1
Update json.hpp
|
2017-08-10 06:44:59 +02:00 |
|
|
Niels Lohmann
|
345846b514
|
Merge pull request #685 from daixtrose/patch-1
Remove duplicate word
|
2017-08-09 15:32:33 +02:00 |
|
|
Niels Lohmann
|
6e5b895f87
|
Merge pull request #682 from kbthomp1/fix-intel-osx
To fix compilation issue for intel OSX compiler
|
2017-08-09 10:16:03 +02:00 |
|
|
Niels Lohmann
|
b32a6b8c75
|
Merge pull request #678 from DmitryKuk/develop
massage -> message
|
2017-08-05 13:42:43 +02:00 |
|
|
Niels Lohmann
|
0ea0d7d860
|
Merge pull request #674 from wincent/patch-1
Fix "not constraint" grammar in docs
|
2017-08-01 20:21:04 +02:00 |
|
|
Niels Lohmann
|
76ecb2bd60
|
Merge pull request #671 from dan-42/develop
Add documentation for integration with CMake and hunter
|
2017-08-01 07:15:55 +02:00 |
|
|
Niels Lohmann
|
67fb517ccd
|
Merge pull request #669 from dan-42/change_installed_cmake_include_path
REFACTOR: rewrite CMakeLists.txt for better inlcude and reuse
|
2017-07-30 20:01:03 +02:00 |
|
|
Niels Lohmann
|
80e95844f6
|
Merge pull request #663 from himikof/move-construction
Support moving from rvalues in std::initializer_list
|
2017-07-30 20:00:46 +02:00 |
|
|
Niels Lohmann
|
aad55219f8
|
Merge branch 'develop' into move-construction
|
2017-07-30 19:49:24 +02:00 |
|
|
Niels Lohmann
|
c136b6f200
|
Merge pull request #666 from effolkronium/develop
enable_testing only if the JSON_BuildTests is ON
|
2017-07-27 20:48:56 +02:00 |
|
|
Niels Lohmann
|
8a9133c6b2
|
Merge pull request #652 from olegendo/develop
Rename BuildTests to JSON_BuildTests
|
2017-07-15 11:39:27 +02:00 |
|
|
Niels Lohmann
|
f1fabd1ba2
|
📄 added code of conduct
added Contributor Covenant Code of Conduct
|
2017-07-13 19:16:41 +02:00 |
|
|
Niels Lohmann
|
dad4916f9e
|
Merge pull request #654 from ryanjmulder/develop
add ensure_ascii parameter to dump. #330
|
2017-07-12 07:58:45 +02:00 |
|
|
Niels Lohmann
|
7dee868a42
|
Merge pull request #643 from theodelrieu/refacto/split_basic_json
Refacto/split basic json
|
2017-07-09 23:12:35 +02:00 |
|
|
Niels Lohmann
|
a0e0579374
|
Merge pull request #650 from olegendo/develop
Don't include <iostream>, use std::make_shared
|
2017-07-09 11:12:46 +02:00 |
|
|
Niels Lohmann
|
5ee651c387
|
Merge pull request #630 from Chocobo1/doc_neq
fix typo in operator__notequal example
|
2017-06-21 18:54:18 +02:00 |
|
|
Niels Lohmann
|
dad6051f37
|
Merge pull request #629 from Chocobo1/c4819
Fix MSVC warning C4819
|
2017-06-21 18:54:03 +02:00 |
|
|
Niels Lohmann
|
4e6f548c0b
|
Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions
add pair/tuple conversions
|
2017-06-19 17:31:10 +02:00 |
|
|
Niels Lohmann
|
7b97100ffd
|
Merge pull request #626 from koemeet/bugfix/vs2017-min-macro-fix
[BugFix] Add parentheses around std::min
|
2017-06-17 23:58:13 +02:00 |
|
|
Niels Lohmann
|
d415293d41
|
Merge pull request #615 from theodelrieu/develop
remove std::pair support
|
2017-06-16 18:16:20 +02:00 |
|
|
Niels Lohmann
|
6caad48e44
|
Merge pull request #595 from HenryRLee/iterator_arithmetic
Issue #593 Fix the arithmetic operators in the iterator and reverse iterator
|
2017-06-10 18:26:48 +02:00 |
|
|
Niels Lohmann
|
52f934cbbf
|
Merge pull request #609 from theodelrieu/develop
Add pair support, fix CompatibleObject conversions (fixes #600)
|
2017-06-07 16:38:23 +02:00 |
|
|
Niels Lohmann
|
bfdf0d1ce6
|
Merge pull request #598 from HenryRLee/issue550
#550 Fix iterator related compiling issues for Intel icc
|
2017-06-06 20:41:42 +02:00 |
|
|
Niels Lohmann
|
0f4131d138
|
Merge pull request #583 from zhaohuaxishi/doxygen_error
fix doxygen error of basic_json::get()
|
2017-05-15 21:09:43 +02:00 |
|
|
Niels Lohmann
|
8b88e1b266
|
Merge pull request #579 from Type1J/develop_feature_first_second
Fixing assignement for iterator wrapper second, and adding unit test
|
2017-05-13 11:37:57 +02:00 |
|
|
Niels Lohmann
|
5beea35443
|
Merge pull request #578 from Type1J/develop_feature_first_second
Adding first and second properties to iteration_proxy_internal
|
2017-05-10 17:25:54 +02:00 |
|
|
Niels Lohmann
|
15ef9b8a35
|
Merge pull request #576 from Type1J/develop
Adding support for Meson.
|
2017-05-10 16:32:14 +02:00 |
|
|
Niels Lohmann
|
4f6b63e492
|
Merge pull request #545 from theodelrieu/feature/enum_class_support
add enum class default conversions
|
2017-04-03 22:13:59 +02:00 |
|
|
Niels Lohmann
|
7881783745
|
Merge pull request #540 from tinloaf/diagnostics
Properly pop diagnostics
|
2017-03-30 17:25:29 +02:00 |
|
|
Niels Lohmann
|
0f9585685a
|
Merge pull request #536 from vpetrigo/feature/VS17_appveyor_support
Add Visual Studio 17 image to appveyor build matrix
|
2017-03-25 14:12:30 +01:00 |
|
|
Niels Lohmann
|
bba688f53e
|
Merge pull request #534 from TedLyngmo/utf8_encoding_enhancement
UTF8 encoding enhancement
|
2017-03-24 19:38:29 +01:00 |
|
|
Niels Lohmann
|
8a872927e8
|
Merge pull request #530 from berkus/patch-1
Fix typo
|
2017-03-23 13:57:54 +01:00 |
|
|
Niels Lohmann
|
67a06834b0
|
Merge pull request #526 from krzysztofwos/feature/exception-base-class
Make exception base class visible in basic_json
|
2017-03-22 07:50:34 +01:00 |
|
|
Niels Lohmann
|
2d474b5273
|
Merge pull request #510 from alex-weej/patch-1
🎨 Namespace `uint8_t` from the C++ stdlib
|
2017-03-17 06:47:11 +01:00 |
|
|
Niels Lohmann
|
773b33e016
|
Merge pull request #508 from theodelrieu/feature/c_array_conversion
add to_json method for C arrays
|
2017-03-16 19:00:58 +01:00 |
|
|
Niels Lohmann
|
754ce0b991
|
Merge pull request #496 from TedLyngmo/fix_effcplusplus_warnings
Fix -Weffc++ warnings (GNU 6.3.1)
|
2017-03-11 15:57:10 +01:00 |
|
|
Niels Lohmann
|
22b9a301d6
|
Merge pull request #450 from nlohmann/TurpentineDistillery-feature/locale_independent_str_to_num
TurpentineDistillery feature/locale independent str to num
|
2017-02-14 07:18:35 +01:00 |
|
|
Niels Lohmann
|
4746a4c536
|
💄 minor change
|
2017-02-08 17:56:43 +01:00 |
|
|
Niels Lohmann
|
163f8397fd
|
✏️ fixed a typo #446
|
2017-02-05 17:11:26 +01:00 |
|
|
Niels Lohmann
|
8d88a1da2a
|
🔀 merged #379 and fixed conflicts
|
2017-02-05 13:13:41 +01:00 |
|
|
Niels Lohmann
|
d284c86dd1
|
✅ uncommented some tests
|
2017-02-04 21:00:41 +01:00 |
|
|
Niels Lohmann
|
922fe693e1
|
⬆️ updated Catch to v1.7.0
|
2017-02-04 15:30:28 +01:00 |
|
|
Niels Lohmann
|
1cfdc2a753
|
🐛 fixed test compilation
|
2017-02-04 08:25:55 +01:00 |
|
|
Niels Lohmann
|
77d6f70602
|
📝 acknowledgments for #442 and #445
|
2017-02-03 18:28:22 +01:00 |
|
|
Niels Lohmann
|
d6afaa8e16
|
📝 fixing a documentation issue #442
|
2017-02-03 18:15:37 +01:00 |
|
|
Niels Lohmann
|
5976caf032
|
⚡ improved test compilation speed #445
|
2017-02-03 18:09:55 +01:00 |
|
|
Niels Lohmann
|
16af771277
|
✅ added roundtrip test for the Big List of Naughty Strings
|
2017-02-01 17:34:39 +01:00 |
|
|
Niels Lohmann
|
bf8fdac99a
|
👷 dropped Doozer.io support
|
2017-02-01 16:41:05 +01:00 |
|
|
Niels Lohmann
|
c75865d88c
|
🐛 fixed -Weffc++ warnings
|
2017-02-01 15:13:21 +01:00 |
|
|
Niels Lohmann
|
b210f2dbf4
|
💄 minor refactoring
|
2017-01-29 21:40:37 +01:00 |
|
|
Niels Lohmann
|
0164b10e10
|
✅ added missing tests found by mutate++
|
2017-01-29 17:18:58 +01:00 |
|
|
Niels Lohmann
|
affa3bf4e9
|
Merge pull request #439 from jaredgrubb/patch-2
README: adjust boost::optional example
|
2017-01-29 08:18:44 +01:00 |
|
|
Niels Lohmann
|
f642934b18
|
🔀 merge branch 'release/2.1.0' into develop
|
2017-01-28 18:43:01 +01:00 |
|
|
Niels Lohmann
|
6746a57524
|
📝 updated slides
|
2017-01-28 18:41:30 +01:00 |
|
|
Niels Lohmann
|
eb08e8b09b
|
📝 updated documentation
|
2017-01-28 18:20:12 +01:00 |
|
|
Niels Lohmann
|
4b5c61075f
|
📄 changes to let Github detect the license
|
2017-01-28 18:17:57 +01:00 |
|
|
Niels Lohmann
|
38e4935db0
|
📝 added example and documentation for the meta function
|
2017-01-28 17:12:29 +01:00 |
|
|
Niels Lohmann
|
cdde1a9436
|
🔖 set version to 2.1.0
|
2017-01-28 16:46:03 +01:00 |
|
|
Niels Lohmann
|
d870826811
|
🔖 set version to 2.1.0
|
2017-01-28 16:03:35 +01:00 |
|
|
Niels Lohmann
|
2f6260751c
|
📝 fixed #434
|
2017-01-27 18:50:52 +01:00 |
|
|
Niels Lohmann
|
42fa3f0568
|
🔀 merge pull request #435 (based on #338, #355, and #423)
conversion from/to user-defined types
|
2017-01-27 06:22:10 +01:00 |
|
|
Niels Lohmann
|
cd9701b123
|
💄 cleanup
|
2017-01-26 20:51:30 +01:00 |
|
|
Niels Lohmann
|
1305e03557
|
📝 fixed documentation
|
2017-01-26 19:39:34 +01:00 |
|
|
Niels Lohmann
|
77bb7af5d9
|
📝 added more documentation
|
2017-01-26 07:29:37 +01:00 |
|
|
Niels Lohmann
|
4d3053cd42
|
💄 some cleanup
|
2017-01-25 22:21:07 +01:00 |
|
|
Niels Lohmann
|
94d9b7bc86
|
📝 overworked documentation (re-added constructor examples)
|
2017-01-25 21:59:54 +01:00 |
|
|
Niels Lohmann
|
ec03c9c53e
|
📝 overworked docs #435
|
2017-01-25 19:01:31 +01:00 |
|
|
Niels Lohmann
|
4139bb6572
|
📝 adjusted test count
|
2017-01-24 15:20:20 +01:00 |
|
|
Niels Lohmann
|
c154f3133d
|
🚧 rephrased assertions
|
2017-01-24 15:02:35 +01:00 |
|
|
Niels Lohmann
|
50a3f3b301
|
📝 added nicer example
|
2017-01-24 14:55:51 +01:00 |
|
|
Niels Lohmann
|
781fd09f2d
|
📝 cleanup
|
2017-01-24 14:45:32 +01:00 |
|
|
Niels Lohmann
|
daf8dcdb32
|
📝 overworked README
|
2017-01-24 14:37:25 +01:00 |
|
|
Niels Lohmann
|
250e5bf43d
|
💄 overworked documentation and indentation
|
2017-01-24 13:47:33 +01:00 |
|
|
Niels Lohmann
|
030cf674ef
|
🚧 fixed a warning
|
2017-01-24 12:49:38 +01:00 |
|
|
Niels Lohmann
|
3857e55290
|
💄 ran "make pretty"
|
2017-01-24 12:43:43 +01:00 |
|
|
Niels Lohmann
|
034d5ed97e
|
💄 some cleanup
|
2017-01-21 16:14:21 +01:00 |
|
|
Niels Lohmann
|
be1d3de49b
|
💄 moved changes to re2c file and ran make pretty
|
2017-01-21 16:14:21 +01:00 |
|
|
Niels Lohmann
|
ce0b3fe5a3
|
🚧 made type_name() public
|
2017-01-21 16:12:17 +01:00 |
|
|
Niels Lohmann
|
145188f264
|
⏪ renaming did not help
|
2017-01-19 19:23:56 +01:00 |
|
|
Niels Lohmann
|
69be3fa842
|
📝 small documentation update
|
2017-01-19 18:19:20 +01:00 |
|
|
Niels Lohmann
|
5e3f9c8969
|
📄 help Github find the license
|
2017-01-19 17:09:55 +01:00 |
|
|
Niels Lohmann
|
e951d198f4
|
🔀 merge pull request #430 from vjon/patch-1
Fix documentation error
|
2017-01-19 07:42:29 +01:00 |
|
|
Niels Lohmann
|
bae8e70137
|
🔀 merge branch 'feature/noexceptions_2' into develop
|
2017-01-18 20:41:17 +01:00 |
|
|
Niels Lohmann
|
87c5e32e1f
|
🐛 fixed escaping
|
2017-01-16 22:46:49 +01:00 |
|
|
Niels Lohmann
|
a00149f8ee
|
🐛 fixed logic error
|
2017-01-16 22:36:58 +01:00 |
|
|
Niels Lohmann
|
1ab26ab367
|
✨ option to switch off exceptions
|
2017-01-16 22:11:07 +01:00 |
|
|
Niels Lohmann
|
74cbd30cd0
|
📄 it's 2017
|
2017-01-16 20:04:47 +01:00 |
|
|
Niels Lohmann
|
a7f3938391
|
✅ added Big List of Naughty Strings
|
2017-01-16 20:03:50 +01:00 |
|
|
Niels Lohmann
|
a9b4cb8bf8
|
🔀 merge branch 'feature/release_information' into develop #397
|
2017-01-12 21:37:31 +01:00 |
|
|
Niels Lohmann
|
3a9ccfac22
|
🚧 cleanup
|
2017-01-12 21:35:27 +01:00 |
|
|
Niels Lohmann
|
98ad3c3ac1
|
Merge branch 'develop' into feature/release_information
|
2017-01-12 21:30:08 +01:00 |
|
|
Niels Lohmann
|
0f03543861
|
⬆️ upgraded to Catch 1.6.0
|
2017-01-11 22:23:02 +01:00 |
|
|
Niels Lohmann
|
e9bbf5aaba
|
🐛 forgot to remove a test case
|
2017-01-08 09:31:40 +01:00 |
|
|
Niels Lohmann
|
dd45ba6f89
|
🚧 renamed version() to meta()
|
2017-01-08 09:19:44 +01:00 |
|
|
Niels Lohmann
|
e1b89dd1d6
|
Merge branch 'develop' into feature/release_information
|
2017-01-04 20:06:23 +01:00 |
|
|
Niels Lohmann
|
9f6c86f233
|
🐛 fix for #417
|
2017-01-04 18:54:44 +01:00 |
|
|
Niels Lohmann
|
4765070318
|
📝 added documentation wrt. UTF-8 strings #406
|
2017-01-04 18:07:46 +01:00 |
|
|
Niels Lohmann
|
cdd3b5a68c
|
🚑 fix for #416
|
2017-01-03 23:52:01 +01:00 |
|
|
Niels Lohmann
|
767637877b
|
💄 cleanup
|
2017-01-03 22:37:07 +01:00 |
|