4303 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	303a0c5843	Merge branch 'develop' into feature/sax2	2018-03-07 22:26:01 +01:00
Niels Lohmann	d183d34b96	💚 added another test case	2018-03-07 22:25:25 +01:00
Niels Lohmann	d2d65bb25b	♻️ refined SFINAE to fix some warnings	2018-03-07 22:01:44 +01:00
Niels Lohmann	476b2e09be	💚 added regression tests for #972 and #977	2018-03-06 20:13:31 +01:00
Niels Lohmann	62030615a0	Merge pull request #986 from theodelrieu/fix/basic_json_conversion ... Fix/basic json conversion	2018-03-06 19:27:39 +01:00
Niels Lohmann	5beab80553	🔨 using the SAX-DOM parser	2018-03-06 18:17:07 +01:00
Niels Lohmann	faf2546a15	🔨 simplified SAX-DOM parser	2018-03-06 07:19:05 +01:00
Niels Lohmann	5b9d03cfdb	🔨 added SAX-DOM-Parser	2018-03-05 21:06:00 +01:00
Niels Lohmann	9d27429527	🔨 added error messages to SAX interface	2018-03-05 16:46:35 +01:00
Niels Lohmann	86991d5204	Merge branch 'develop' into feature/sax2	2018-03-05 16:16:43 +01:00
Niels Lohmann	fdecbf6e1e	Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition ... fixed misprinted condition detected by PVS Studio.	2018-03-05 15:57:57 +01:00
Mike Bogdanov	fd30ad8a14	did make amalgamate	2018-03-02 11:47:35 +03:00
Mike Bogdanov	2a2ed799b1	pvs_studio fix. misprinted condition	2018-03-02 11:12:44 +03:00
Niels Lohmann	8d104e6fe3	💚 fixed test case	2018-02-28 22:40:48 +01:00
Niels Lohmann	5773e164bb	🚨 fixed a linter warning	2018-02-28 19:59:54 +01:00
Théo DELRIEU	8711ec6034	support construction from other basic_json types ... Before this patch, `basic_json` types with different template arguments were treated as `CompatibleArrayType`. Which sometimes leads to recursive calls and stack overflows. This patch adds a constructor and a `get` overload to deal with different `basic_json` types.	2018-02-27 16:48:09 +01:00
Théo DELRIEU	c22f2d41f3	missing CHECK_NOTHROW in unit-udt	2018-02-27 11:09:53 +01:00
Niels Lohmann	3ff9455332	🔨 added a SAX-DOM-Parser	2018-02-26 23:39:23 +01:00
Niels Lohmann	21352c4d8e	♻️ refactored SAX parser	2018-02-26 20:08:12 +01:00
Niels Lohmann	981e226ca2	Merge branch 'develop' into feature/sax2	2018-02-26 20:07:52 +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	8d6b3d44d6	👌 fixed some compiler warnings	2018-02-25 18:35:16 +01:00
Niels Lohmann	8c7f46f7d0	🔨 removed a logic error and improved coverage	2018-02-25 17:10:30 +01:00
Niels Lohmann	922f7a3d0e	✅ added more tests for SAX parsing	2018-02-25 14:21:30 +01:00
Niels Lohmann	ac230e8b4b	🔨 fixed test cases to be more robust	2018-02-25 10:44:47 +01:00
Niels Lohmann	374ebacc51	✨ added a SAX parser #971	2018-02-24 18:04:07 +01: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