haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
2429 commits 11 branches 56 tags 222 MiB
Commit graph

2429 commits

This branch
This branch
All branches
Author SHA1 Message Date
Théo DELRIEU c22f2d41f3
missing CHECK_NOTHROW in unit-udt 2018-02-27 11:09:53 +01:00
Niels Lohmann 1f3d2a3be7
📝 overworked README 2018-02-26 17:37:24 +01:00
Niels Lohmann 13ca723c38
Merge pull request #981 from wla80/develop 
Make integration section concise
 2018-02-26 16:51:51 +01:00
Wilson 05d3bf1699 Make integration section concise 2018-02-25 22:12:44 -08:00
Niels Lohmann 8968adcd53
Merge branch 'release/3.1.1' into develop 2018-02-13 19:36:35 +01:00
Niels Lohmann 8424d10e45
🔖 set version to 3.1.1 2018-02-13 15:59:32 +01:00
Niels Lohmann 938c861a09
🔖 set version to 3.1.1 2018-02-12 22:59:36 +01:00
Niels Lohmann 94b7a8da66
💄 fixed indentation 2018-02-12 20:46:14 +01:00
Niels Lohmann 20b5f4d89c
Merge pull request #969 from theodelrieu/fix/924 
Fix constraints on from_json(CompatibleArrayType)
 2018-02-12 18:17:59 +01:00
Théo DELRIEU 01d6118828
Fix constraints on from_json(CompatibleArrayType) 
Fixes #924
 2018-02-12 15:37:33 +01:00
Niels Lohmann b02e3bb0b6
Merge pull request #957 from theodelrieu/fix_coveralls 
Make coveralls watch the include folder
 2018-02-12 15:02:21 +01:00
Théo DELRIEU 41db7cd818
Make the coveralls job use the multiple header version 2018-02-12 10:23:33 +01:00
Niels Lohmann 447f5421eb
🔨 overworked release target 2018-02-11 16:50:01 +01:00
Niels Lohmann 61f0bfb15c
🔨 enforce using Python 2 for the wandbox script 2018-02-11 14:46:15 +01:00
Niels Lohmann 548f488941
🔨 overworked Makefile 2018-02-10 14:46:39 +01:00
Niels Lohmann 865ff00de0
📝 updated documentation wrt. objects #963 2018-02-09 23:37:20 +01:00
Niels Lohmann addbbbe136
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-02-09 23:32:37 +01:00
Niels Lohmann 0a64982e86
📝 cleanup after #954 2018-02-09 23:32:28 +01:00
Niels Lohmann e5d538c5ea
Merge pull request #954 from pfultz2/patch-1 
Add a note about installing the library with cget
 2018-02-09 23:28:54 +01:00
Niels Lohmann 2dda87c3b7
Merge branch 'feature/coverage_multi' into develop 2018-02-09 23:01:56 +01:00
Paul Fultz II 5731695d7b
Clarify dev version and add space after the word flag. 2018-02-09 15:45:20 -06:00
Niels Lohmann 74675dd69c
⏪ back to the original version 2018-02-09 22:40:52 +01:00
Paul Fultz II 50863c5a09
Latest updates based on feedback 2018-02-09 15:35:46 -06:00
Niels Lohmann ab05df3a48
🔨 another try 2018-02-09 22:27:08 +01:00
Niels Lohmann b455154cc9
🔨 another try 2018-02-09 22:18:51 +01:00
Niels Lohmann 1e8f4d6ab3
🔨 more trying 2018-02-09 22:11:05 +01:00
Niels Lohmann 316634e129
🔨 added quotes around parameters 2018-02-09 21:54:32 +01:00
Niels Lohmann 0111f3187e
🔨 working on #953 2018-02-09 21:30:15 +01:00
Niels Lohmann 83db7876c5
🏁 removing test case that fails on MSVC #962 2018-02-09 18:32:12 +01:00
Niels Lohmann 33a9b00ce6
🐛 fix for #962 
Added out_of_range exception for UBJSON containers with sizes that exceed the target container's max_size.
 2018-02-06 22:38:53 +01:00
Niels Lohmann 8b457ace25
🐛 fixing CBOR's indefinity length strings #961 
Beside the fix discussed in #961, we also had to re-adjust a test case. It seems that it was failing before, and I "fixed" it to work with the broken implementation...
 2018-02-06 20:43:03 +01:00
Niels Lohmann 556e30f759
Merge pull request #955 from patrikhuber/patch-1 
Fix links in README.md
 2018-02-06 20:18:14 +01:00
Patrik Huber ee76436592
Change to angle brackets 2018-02-06 11:29:37 +00:00
Niels Lohmann 737cffe0cb
🔨 fixed directory for lcov coverage 2018-02-04 20:58:50 +01:00
Patrik Huber ae688016f6
Changed links from master to develop branch 2018-02-04 12:41:46 +00:00
Niels Lohmann 2b7b39c72d
🚀 added release target #956 2018-02-04 13:29:23 +01:00
Patrik Huber 44b40d7c6a
Fix links in README.md 2018-02-03 15:48:02 +00:00
Paul Fultz II 3402260983
Add a note about installing the library with cget 2018-02-02 11:13:13 -06:00
Niels Lohmann 3a887dc9fe
👷 fixed coveralls 2018-02-02 07:56:30 +01:00
Niels Lohmann 5c2a0a511e
👷 fixed coveralls 2018-02-02 07:31:57 +01:00
Niels Lohmann b779666916
👷 re-added homebrew tests 2018-02-02 00:20:04 +01:00
Niels Lohmann 97309f0da9
Merge branch 'release/3.1.0' into develop 2018-02-02 00:06:17 +01:00
Niels Lohmann a8fcfd9880
👷 fixed travis file 2018-02-01 22:34:14 +01:00
Niels Lohmann f5c03999d0
🔨 fixed benchmark compilation 2018-02-01 22:26:26 +01:00
Niels Lohmann 0258484626
🔖 set version to 3.1.0 
- updated documentation wrt. new repository layout
- temporarily switched off Homebrew --HEAD building (can only be switched on after release)
- set copyright date to 2018
 2018-02-01 22:20:26 +01:00
Niels Lohmann ce7d0ebf5d
Merge pull request #944 from theodelrieu/fix/cmake_install 
fix cmake install directory (for real this time)
 2018-02-01 18:39:07 +01:00
Théo DELRIEU 14cd019861
fix cmake install directory (for real this time) 
* Rename 'develop' folder to 'include/nlohmann'
* Rename 'src' folder to 'single_include/nlohmann'
* Use <nlohmann/*> headers in sources and tests
* Change amalgamate config file
 2018-02-01 11:06:51 +01:00
Niels Lohmann 9958dde3da
Merge pull request #950 from kaidokert/develop 
Templatize std::string in binary_reader #941
 2018-02-01 09:29:53 +01:00
Kaido aed4a080bf Templatize std::string in binary_reader #941 2018-01-31 23:01:01 -08:00
Niels Lohmann e8bf1f62f7
✨ added define for library version #948 #943 2018-01-31 22:36:18 +01:00