amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-08-01 07:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,556 Commits 30 Branches 57 Tags
b53c6e2f8193cb6469ff4319f6c516ca94de71d3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann b53c6e2f81 ✨ ignore comments 2020-06-16 12:28:59 +02:00
Niels Lohmann e7452d8778 Merge branch 'release/3.8.0' into develop 2020-06-14 17:44:18 +02:00
Niels Lohmann 5f862710fe 🔖 set version to 3.8.0 2020-06-14 17:16:45 +02:00
Niels Lohmann 1ecb7884d1 👥 update contributor list 2020-06-14 15:22:08 +02:00
Niels Lohmann 27f5a6e827 🙈 ignore __pycache__ directory 2020-06-09 16:59:03 +02:00
Niels Lohmann 262d9cc67d 🚨 fix a maybe-uninitialized warning 2020-06-09 16:57:06 +02:00
Niels Lohmann ae04426c85 🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532) 2020-06-08 20:07:15 +02:00
Niels Lohmann 2cf16625ac ✅ add test for character types 2020-06-07 22:49:39 +02:00
Niels Lohmann d4bc0c39af ✅ add test for character types 2020-06-07 22:47:54 +02:00
Niels Lohmann 6d73126ea9 🚨 fix warnings 2020-06-07 22:47:25 +02:00
Niels Lohmann 28048d8207 Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into develop 
 Conflicts:
	doc/examples/swap__binary_t.link
 2020-06-07 21:02:08 +02:00
Niels Lohmann eca5490b94 📝 add example link for swap function 2020-06-07 21:01:13 +02:00
Niels Lohmann 8c1d26e186 📝 add documentation and example for accept function 2020-06-07 20:59:43 +02:00
Niels Lohmann 907803189b 🏁 fix MSVC 2015 compilation 2020-06-07 12:51:33 +02:00
Niels Lohmann e6a7e7a16a 🚑 hotfix for #2177 2020-06-07 12:41:36 +02:00
Niels Lohmann bf2e714e96 🚨 fix warnings 2020-06-06 14:30:17 +02:00
Niels Lohmann dd7e25927f 🚨 fix warning 2020-06-05 08:27:15 +02:00
Niels Lohmann 2df5f107a9 📝 add page on parsing and exceptions 2020-06-04 14:01:57 +02:00
Niels Lohmann 32bda1a7af Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs 2020-06-04 13:07:20 +02:00
Niels Lohmann 9212590764 👥 update contributor list 2020-06-03 13:56:01 +02:00
Niels Lohmann 9708b1e9c3 🔥 remove Code Inspector 2020-06-03 13:49:46 +02:00
Niels Lohmann 68fd772fdf 👷 add Code Inspector via GitHub Action 2020-06-03 13:44:33 +02:00
Niels Lohmann 9bc2a7fa25 👷 add Code Inspector via GitHub Action 2020-06-03 13:39:56 +02:00
Niels Lohmann c24218afe8 Merge remote-tracking branch 'origin/develop' into develop 2020-06-03 13:38:15 +02:00
Niels Lohmann 23c8ab95da 👥 update contributor list 2020-05-28 14:24:08 +02:00
Niels Lohmann 53ef076715 🔧 add more warning flags from GCC 10 2020-05-28 13:46:56 +02:00
Niels Lohmann 2edb5cb999 👷 fix -DJSON_BuildTests=On parameter placement 2020-05-28 13:46:47 +02:00
Niels Lohmann 5ff4d7b7ff Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-05-28 12:54:13 +02:00
Niels Lohmann fcda998ee2 🔧 add more warning flags from GCC 10 2020-05-28 12:53:22 +02:00
Niels Lohmann bb9619ef8b 📝 request more details in question template 2020-05-27 13:22:34 +02:00
Niels Lohmann 325e8ab8ab 🔧 explicitly switch on tests in CI 2020-05-27 13:22:14 +02:00
Niels Lohmann ed5c28d00c 👥 update contributor list 2020-05-27 13:07:24 +02:00
Niels Lohmann e3d9b3d755 📝 add documentation of parser callbacks 2020-05-26 14:16:13 +02:00
Niels Lohmann ace594da6a Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs 2020-05-26 13:17:55 +02:00
Niels Lohmann 27fe50dc92 📝 add example for contains #2133 
Closes #2133.
 2020-05-26 12:46:04 +02:00
Niels Lohmann 413df0fd88 📝 add more content to iterator page 2020-05-25 14:03:11 +02:00
Niels Lohmann 95a3c76643 📝 make examples collapsible 2020-05-24 22:45:38 +02:00
Niels Lohmann ddf92606ab 📝 add PlantUML 2020-05-24 21:05:35 +02:00
Niels Lohmann 3400af21cd 📝 add release page 2020-05-24 13:40:43 +02:00
Niels Lohmann a8f0cd15df 📝 add mkdocs 2020-05-24 13:03:04 +02:00
Niels Lohmann c92a696852 📝 update documentation 2020-05-22 18:21:37 +02:00
Niels Lohmann 88292d9499 🚨 remove redundant assertions 2020-05-22 14:19:07 +02:00
Niels Lohmann 225fa58f16 🚧 add fix from #1715 2020-05-20 22:20:40 +02:00
Niels Lohmann ae29456b3f 🚸 overwork report templates 2020-05-20 18:57:21 +02:00
Niels Lohmann 4d39644bd0 💚 fix build 2020-05-19 13:45:52 +02:00
Niels Lohmann 21b1680ea1 🚚 rename binary_array() to binary() 2020-05-19 13:30:22 +02:00
Niels Lohmann 86b053e916 Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-19 13:10:35 +02:00
Niels Lohmann 952a87a4f4 🚚 move byte container outside detail namespace 2020-05-19 13:08:18 +02:00
Niels Lohmann 79347b484b ✅ improve test coverage 2020-05-19 12:40:32 +02:00
Niels Lohmann 5cfa8a586e 👷 run workflows on pull requests 2020-05-18 14:01:54 +02:00
Niels Lohmann b7ff40029a 💥 change serialization of binary values 2020-05-18 13:53:20 +02:00
Niels Lohmann 9eb19bcc27 ✅ add more tests for binary type 2020-05-18 12:33:26 +02:00
Niels Lohmann 5dec7166ea Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-18 09:13:22 +02:00
Niels Lohmann 16d78a82e0 👷 add link to GitHub workflows 2020-05-18 09:12:18 +02:00
Niels Lohmann 904642f261 ♻️ rename internal_binary_t with binary_t 2020-05-17 22:50:27 +02:00
Niels Lohmann 1ce8a5be87 Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup 2020-05-17 14:11:49 +02:00
Niels Lohmann dead99eb0e 🔨 overwork binary subtypes 2020-05-17 13:51:59 +02:00
Niels Lohmann ab6e76dd05 Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-17 12:27:58 +02:00
Niels Lohmann 28e20bd9e4 🚨 fix warnings #2113 2020-05-16 14:26:17 +02:00
Niels Lohmann ad32f576bd Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup 2020-05-16 13:22:23 +02:00
Niels Lohmann c0cf67ead3 Merge branch 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-16 12:58:13 +02:00
Niels Lohmann 3ed059f6ff ⏪ revert faulty changes 2020-05-16 12:56:18 +02:00
Niels Lohmann bc1886fb60 ♻️ refine interface of wrapped_binary_t 2020-05-15 23:21:49 +02:00
Niels Lohmann a452e8a0a1 💚 fix GCC 4.9 compilation 2020-05-15 22:38:18 +02:00
Niels Lohmann daf2d296dd ♻️ move wrapped binary type to separate file 2020-05-15 14:12:32 +02:00
Niels Lohmann bcf4f3ce9a 📝 add warning for items() on temporary objects #2040 2020-05-14 19:06:48 +02:00
Niels Lohmann fc267af909 📝 update CI list 2020-05-14 17:53:00 +02:00
Niels Lohmann f4cc729054 🔊 add compiler version output 2020-05-14 13:37:59 +02:00
Niels Lohmann e91236e6d3 🔊 add compiler version output 2020-05-14 13:33:10 +02:00
Niels Lohmann c4c23f34c5 Merge branch 'develop' of https://github.com/nlohmann/json into release_cleanup 2020-05-14 07:55:09 +02:00
Niels Lohmann 33ae93beed 📝 update CI list 2020-05-14 07:55:01 +02:00
Niels Lohmann d7b032f565 ✅ add tests to improve coverage 2020-05-13 21:28:43 +02:00
Niels Lohmann ec68bb3387 📝 update CI list 2020-05-13 20:18:56 +02:00
Niels Lohmann f6f350a5c7 🔊 add operating system output 2020-05-13 14:25:51 +02:00
Niels Lohmann 855d25a76c Merge branches 'develop' and 'release_cleanup' of https://github.com/nlohmann/json into release_cleanup 2020-05-13 12:41:22 +02:00
Niels Lohmann a414e35971 🚨 add newline to end of file 2020-05-13 12:35:11 +02:00
Niels Lohmann def8aeb141 Merge branches 'develop' and 'release_cleanup' of https://github.com/nlohmann/json into release_cleanup 2020-05-13 07:57:03 +02:00
Niels Lohmann 6778ad8b0a 📝 update year 2020-05-12 22:26:55 +02:00
Niels Lohmann 7dbe5cf904 📝 update badges 2020-05-12 21:43:33 +02:00
Niels Lohmann 94115a302e 🏁 exclude slow Unicode test 2020-05-12 21:22:47 +02:00
Niels Lohmann 8c44c7b6de 🏁 set Windows CI to Release mode 2020-05-12 21:18:08 +02:00
Niels Lohmann 44a2158b18 👷 make debug build 2020-05-12 20:51:45 +02:00
Niels Lohmann 77e0ba8750 👷 parallelize builds 2020-05-12 20:45:18 +02:00
Niels Lohmann 6e59c8301a 👷 simplify CMake invocations 2020-05-12 20:37:50 +02:00
Niels Lohmann ab02b08296 👷 rename workflows 2020-05-12 20:30:11 +02:00
Niels Lohmann cd76f59af6 👷 add more GitHub actions workflows 2020-05-12 20:26:17 +02:00
Niels Lohmann b1c1eb145e 🔧 fix maintainer target 2020-05-12 19:36:33 +02:00
Niels Lohmann abeb80411b 📝 fix example 2020-05-12 16:28:26 +02:00
Niels Lohmann 52f5f3d29f 📝 fix example 2020-05-12 16:27:55 +02:00
Niels Lohmann e9a845f08a 📝 fix example output 2020-05-12 16:13:33 +02:00
Niels Lohmann 8e0ae9b46f ⬆️ update Doxyfile 2020-05-12 14:37:35 +02:00
Niels Lohmann afc30a14a7 🔧 set Wandbox script to use HTTPS 2020-05-12 14:37:22 +02:00
Niels Lohmann 6014419818 Merge branches 'develop' and 'issue2082' of https://github.com/nlohmann/json into issue2082 2020-05-12 12:28:34 +02:00
Niels Lohmann 76c01501f7 🔧 fix pedantic maintainer targets 2020-05-11 20:03:13 +02:00
Niels Lohmann 66dfa22de2 ⚗️ try to fix SSL issue 2020-05-11 14:24:38 +02:00
Niels Lohmann 0ad595709d ⚗️ try to fix SSL issue 2020-05-11 13:40:43 +02:00
Niels Lohmann cbb2d4e4d8 ⚗️ try to fix SSL issue 2020-05-11 13:29:40 +02:00
Niels Lohmann 8389c1961b ⚗️ try to fix SSL issue 2020-05-11 13:19:22 +02:00
Niels Lohmann 19b21e61e5 ⚗️ try to fix SSL issue 2020-05-11 13:05:53 +02:00
Niels Lohmann 697305819f ⚗️ try to fix SSL issue 2020-05-11 12:37:24 +02:00