205 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Niels	f0582a8b60	ignore some CMake files	2015-01-05 20:36:31 +01:00
Niels	bf768d96d9	minor Markdown error	2015-01-05 20:30:34 +01:00
Niels	b39f78924a	Merge pull request #6 from Teemperor/master ... Added CMake and lcov	2015-01-05 20:28:56 +01:00
Raphael Isemann	67459fcd83	Added CMake to the README	2015-01-05 11:29:41 +01:00
Raphael Isemann	bd4e0e4fee	Merge branch 'master' of github.com:nlohmann/json	2015-01-05 11:20:32 +01:00
Raphael Isemann	0f371b4086	CMake and coverage report	2015-01-05 11:19:42 +01:00
Niels	a9669a410d	removed "noexpect" from all functions that use new	2015-01-04 23:18:24 +01:00
Niels	540cda6118	used _-suffix for member variables	2015-01-04 23:09:30 +01:00
Niels	3bef1a5097	renamed "toString()" to "to_string()"	2015-01-04 20:50:28 +01:00
Niels	f63ff7727e	renamed class from "JSON" to "son"	2015-01-04 20:43:25 +01:00
Niels	4d00105e5c	tidy up	2015-01-04 19:05:46 +01:00
Niels	0019c85b85	fix	2015-01-04 18:55:15 +01:00
Niels	aa166a4739	updated examples	2015-01-04 18:52:04 +01:00
Niels	77ea63ceb5	fixed a link	2015-01-04 18:32:03 +01:00
Niels	4ea98517f5	updated README	2015-01-04 13:20:32 +01:00
Niels	bd0be5f0af	fixed memory leak	2015-01-04 12:29:16 +01:00
Niels	481f377cfe	+ guard call to std::ios_base::sync_with_stdio	2015-01-04 12:05:28 +01:00
Niels	9537c70b67	removing flawed test case	2015-01-03 17:51:14 +01:00
Niels	764ed26c41	cleanup	2015-01-03 17:18:17 +01:00
Niels	18364aac85	parser returns an object	2015-01-02 17:19:40 +01:00
Niels	16c30cff8b	removed old C fragments	2015-01-02 15:29:36 +01:00
Niels	af4aca9edd	+ better string handling	2015-01-02 12:47:32 +01:00
Niels	85abe926cf	fixed coveralls call to ignore benchmarks folder	2014-12-30 12:02:38 +01:00
Niels	6995d33fb1	+ fixed documentation bugs	2014-12-30 11:57:58 +01:00
Niels	2335d3f3d5	tidy up	2014-12-30 11:47:28 +01:00
Niels	39cf26e2db	minor changes	2014-12-30 11:29:59 +01:00
Niels	2be4f24837	+ updated reference	2014-12-30 11:19:35 +01:00
Niels	9e61092fc6	+ overworked parser	2014-12-30 10:54:01 +01:00
Niels	4e44390090	+ fixed a bug in the stream input	2014-12-29 21:13:03 +01:00
Niels	15a9d3cff6	minor changes	2014-12-29 19:54:31 +01:00
Niels	0b8dda1e0c	minor changes	2014-12-29 18:32:17 +01:00
Niels	f50fdd08a7	syntax highlighting	2014-12-29 18:20:55 +01:00
Niels	6687ea1a36	updated reference	2014-12-29 18:19:06 +01:00
Niels	cff4d40afd	type reference	2014-12-29 17:07:00 +01:00
Niels	a8c4f84fb8	+ removed data() function	2014-12-29 16:45:54 +01:00
Niels	515d731fd4	+ documentation	2014-12-29 13:35:52 +01:00
Niels	725202356b	+ fix memory issues	2014-12-29 12:51:20 +01:00
Niels	2c1b3e5108	+ small cleanup	2014-12-29 00:02:14 +01:00
Niels	3985226f76	issue badge	2014-12-28 23:21:46 +01:00
Niels	bed47db168	+ that could be it!	2014-12-28 23:09:31 +01:00
Niels	776611c270	+ another check	2014-12-28 22:59:11 +01:00
Niels	0ced78bfa8	+ test	2014-12-28 22:51:27 +01:00
Niels	b573841ace	+ more test cases	2014-12-28 22:38:57 +01:00
Niels	98af0887f2	+ more test cases	2014-12-28 22:29:06 +01:00
Niels	ea85da8a55	+ more test cases	2014-12-28 22:16:58 +01:00
Niels	aacb58e56b	+ more test cases	2014-12-28 22:07:10 +01:00
Niels	48a349a058	+ more test cases	2014-12-28 21:53:13 +01:00
Niels	8f45d9351e	+ overworked switches	2014-12-28 20:07:56 +01:00
Niels	4810091bab	+ more test cases	2014-12-28 19:51:02 +01:00
Niels	b2b5e4e7e1	+ more test cases	2014-12-28 18:12:07 +01:00