2108 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels Lohmann	b27a142ec0	Merge pull request #783 from eld00d/patch-1 ... Set GENERATE_TAGFILE in Doxyfile	2017-10-16 17:54:28 +02:00
Nate Vargas	727ee7d03e	Set GENERATE_TAGFILE in Doxyfile ... Allows documentation to be linked from other projects to https://nlohmann.github.io/json using Doxygen with the tag: TAGFILES = $(SOME_PATH)/nlohmann_json.tag=https://nlohmann.github.io/json	2017-10-14 19:06:38 -05:00
Niels Lohmann	d300a8e268	🚨 fixed warnings #776	2017-10-13 08:46:29 +02:00
Niels Lohmann	0c0851dbea	📝 comment how to integrate tsl::ordered_map (#546)	2017-10-05 20:36:18 +02:00
Niels Lohmann	bab4a15748	📝 comment how to integrate fifo_map (#485)	2017-10-05 20:33:27 +02:00
Niels Lohmann	60439aff05	📝 different cmake call	2017-10-05 19:43:59 +02:00
Niels Lohmann	73d1b55aba	🔧 executing tests in parallel	2017-10-05 19:43:39 +02:00
Niels Lohmann	615366447a	🔧 removing -Weffc++ warnings	2017-10-05 19:43:19 +02:00
Niels Lohmann	73727c989c	Merge branch 'feature/coveralls' into develop	2017-10-05 19:08:28 +02:00
Niels Lohmann	75f4678b96	🔨 added filter script for branch coverage	2017-10-05 19:08:15 +02:00
Niels Lohmann	c204ac82e0	🔨 adjusted Coverity script to work without Makefile	2017-10-05 07:13:59 +02:00
Niels Lohmann	7b82e4b4c8	🔨 added Makefile target to calculate lcov coverage	2017-10-05 00:17:09 +02:00
Niels Lohmann	1b3df3a63f	🔨 trying to use Coveralls with CMake #698	2017-10-04 22:18:21 +02:00
Niels Lohmann	99ee4c1eaf	🔨 cleaned up Makefiles and docs #698	2017-10-04 19:27:35 +02:00
Niels Lohmann	5cb6d7187d	🚨 fixing last warning in #755	2017-10-04 17:28:35 +02:00
Niels Lohmann	4e81c1db47	Merge pull request #765 from nlohmann/feature/issue698 ... using more CMake	2017-10-04 10:39:56 +02:00
Niels Lohmann	e2045eae53	🏁 and another try	2017-10-03 18:47:08 +02:00
Niels Lohmann	a85bc358f7	🏁 another try	2017-10-03 18:21:40 +02:00
Niels Lohmann	3457e7bc5b	🏁 try to get MSVC 2017 running again	2017-10-03 17:57:40 +02:00
Niels Lohmann	54bd1b5124	Merge branch 'develop' into feature/issue698	2017-10-03 17:23:05 +02:00
Niels Lohmann	7435d54e97	🔨 clean up	2017-10-02 23:06:41 +02:00
Niels Lohmann	4912231450	Merge branch 'develop' into feature/issue698	2017-10-02 18:25:25 +02:00
Niels Lohmann	b91805e1f0	🚨 removing a compiler warning #755	2017-10-02 18:11:36 +02:00
Niels Lohmann	f89f8b2d0b	Merge branch 'develop' into feature/issue698	2017-10-02 17:47:53 +02:00
Niels Lohmann	8be303d4fb	🏁 fixing a min() call for MSVC #762	2017-10-02 13:54:14 +02:00
Niels Lohmann	1df836ce40	⏪ removed call to std::signbit #761	2017-10-01 15:48:29 +02:00
Niels Lohmann	8af49d4be5	🚨 removing compiler warnings #755	2017-09-30 11:00:26 +02:00
Niels Lohmann	1a66527dca	📝 fixed documentation #745	2017-09-30 10:18:18 +02:00
Niels Lohmann	b05ea3de55	Merge pull request #753 from gregmarr/patch-1 ... Add info for the vcpkg package.	2017-09-26 22:36:36 +02:00
gregmarr	ec60ff3451	Add info for the vcpkg package.	2017-09-26 08:39:38 -07:00
Niels Lohmann	647711fad1	✅ improved test coverage	2017-09-14 17:31:28 +02:00
Niels Lohmann	737816d0cd	👷 another try with Travis	2017-09-14 17:31:14 +02:00
Niels Lohmann	e75adc21a5	Merge branch 'develop' into feature/issue698	2017-09-13 18:57:25 +02:00
Niels Lohmann	b90529c36d	✅ improved test coverage	2017-09-13 18:56:54 +02:00
Niels Lohmann	82c93680d1	Merge branch 'develop' into feature/issue698	2017-09-10 22:38:23 +02:00
Niels Lohmann	e2e0ecd867	✅ improved test coverage	2017-09-10 22:38:04 +02:00
Niels Lohmann	248db1e423	Merge branch 'develop' into feature/issue698	2017-09-10 11:42:57 +02:00
Niels Lohmann	7410763731	✅ improved test coverage	2017-09-10 11:42:43 +02:00
Niels Lohmann	cafc2d057a	Merge branch 'develop' into feature/issue698	2017-09-10 10:22:10 +02:00
Niels Lohmann	da97cf7895	✅ improved test coverage	2017-09-10 10:21:53 +02:00
Niels Lohmann	295d65ada7	Merge branch 'develop' into feature/issue698	2017-09-10 01:13:43 +02:00
Niels Lohmann	fcba9ec537	🔨 clean up	2017-09-10 01:12:03 +02:00
Niels Lohmann	41994ba028	Merge branch 'develop' into feature/issue698	2017-09-09 16:53:37 +02:00
Niels Lohmann	b21d7810fa	✅ improved test coverage	2017-09-09 16:53:27 +02:00
Niels Lohmann	c1d6478584	Merge branch 'develop' into feature/issue698	2017-09-09 13:07:40 +02:00
Niels Lohmann	9ae6796a38	✅ improved test coverage	2017-09-09 13:07:10 +02:00
Niels Lohmann	31ce7e1e59	Merge branch 'develop' into feature/issue698	2017-09-09 11:05:20 +02:00
Niels Lohmann	fd250ae2b1	✅ improved test coverage	2017-09-09 11:04:58 +02:00
Niels Lohmann	5c08b84dec	⏪ back to previous MSVC 2017	2017-09-06 18:26:52 +02:00
Niels Lohmann	da14286abb	👷 try to use MSVC 2017 again	2017-09-06 18:13:35 +02:00