Commit Graph

  • 1dee40a969 fixed test case Niels 2016-04-17 22:34:39 +02:00
  • 6268287940 improved documentation and test coverage Niels 2016-04-17 22:08:21 +02:00
  • 7034ae2486 improved test coverage Niels 2016-04-17 19:12:12 +02:00
  • 0835eb293f improved RFC compliance and code coverage Niels 2016-04-17 18:54:54 +02:00
  • f883a04c87 more documentation Niels 2016-04-17 18:18:49 +02:00
  • 40e899a819 cleanup and documentation Niels 2016-04-17 17:39:35 +02:00
  • f834965b44 implemented deflatten function Niels 2016-04-16 20:45:40 +02:00
  • 007359675b added a flatten function Niels 2016-04-16 16:39:20 +02:00
  • 3401954f5b cleaned up API Niels 2016-04-16 14:02:14 +02:00
  • 3a3e064287 Merge branch 'develop' into feature/json-pointer Niels 2016-04-16 12:19:31 +02:00
  • 76a5a776eb cleanup after #234 Niels 2016-04-16 12:19:10 +02:00
  • 6f0053a254 Merge branch 'support-move-iterators' of https://github.com/robertmrk/json into develop Niels 2016-04-16 12:12:16 +02:00
  • 94af8abdff overworked reference token parsing Niels 2016-04-13 23:23:54 +02:00
  • 2cb925c186 adding support for escaped reference tokens Niels 2016-04-13 17:41:19 +02:00
  • 2197f5f0a6 Make the indirection and dereference operators of iterator const Robert Marki 2016-04-13 13:49:53 +02:00
  • 726051e9b7 very first draft of a JSON pointer API Niels 2016-04-11 23:17:03 +02:00
  • 507322e6f2 updated ChangeLog Niels 2016-04-10 19:36:09 +02:00
  • 15f8c848fa fixed typo and indentation Niels 2016-04-10 18:23:43 +02:00
  • 170b70f082 Merge pull request #232 from nlohmann/issue228 Niels 2016-04-07 17:16:58 +02:00
  • a744c62696 made tests independent of "C" locale Niels 2016-04-05 22:28:27 +02:00
  • 0b60d970e9 make code independent of concrete locale Niels 2016-04-05 22:12:12 +02:00
  • 31bccc83b9 fixed locale problems Niels 2016-04-05 21:55:51 +02:00
  • 43ee70cef8 revert changes to master Niels 2016-04-05 20:47:47 +02:00
  • 44a8e9bf35 locale-independent dump Niels 2016-04-03 16:33:30 +02:00
  • 9c233be567 merged #201 Niels 2016-04-03 14:08:38 +02:00
  • 04edafbddc Merge pull request #227 from kevin--/kevin--/noexcept_documentation Niels 2016-03-30 20:21:35 +02:00
  • 1baa5a7350 fixed #225 Niels 2016-03-30 20:18:34 +02:00
  • 0951a1f94c Merge pull request #222 from Teemperor/fixAndroid Niels 2016-03-30 20:12:55 +02:00
  • 96443b0b97 added more thanks to the README file Niels 2016-03-30 19:47:08 +02:00
  • 27530c7840 better notes for Android (manually closes #215) Niels 2016-03-30 19:42:54 +02:00
  • 888635b749 cleanup after PR #212 and PR #226 Niels 2016-03-30 19:23:11 +02:00
  • 3df5337e79 fixes #223 by updating README.md Kevin Dixon 2016-03-29 21:41:46 -07:00
  • 54d3cab568 Merge pull request #226 from lv-zheng/fix_int64 Niels 2016-03-29 10:35:24 +02:00
  • 3e76e61b9c Use namespace std for int64_t and uint64_t Lv Zheng 2016-03-28 17:01:25 +08:00
  • 2f63e5fb45 added copyright information to files to make release more self-contained Niels 2016-03-25 17:41:36 +01:00
  • fbc25b080b Added missing cerrno header to fix ERANGE c-error on android Raphael Isemann 2016-03-10 08:46:26 +01:00
  • c6a6a024f7 fixes #214 Niels 2016-03-06 20:03:05 +01:00
  • 10a884473e fixed #217 Niels 2016-03-04 07:30:08 +01:00
  • 8ee3d24046 Merge pull request #218 from Annihil/master Niels 2016-03-04 07:26:27 +01:00
  • 78a020354d Corrected readme Annihil 2016-03-02 02:01:40 +01:00
  • 53879f9c99 cleanup Niels 2016-02-21 08:17:11 +01:00
  • 502cedf70b Merge pull request #213 from whackashoe/patch-1 Niels 2016-02-21 08:15:46 +01:00
  • df3ab06f2e Create PULL_REQUEST_TEMPLATE.md Jett LaRue 2016-02-20 16:22:46 -06:00
  • f965c4c35b improved code coverage Niels 2016-02-14 22:56:51 +01:00
  • d869b0a387 updated online documentation Niels 2016-02-14 22:28:56 +01:00
  • 3a92559fa9 cleanup Niels 2016-02-14 22:24:45 +01:00
  • 09654b3104 Merge pull request #208 from nlohmann/noexcept Niels 2016-02-14 22:18:39 +01:00
  • f160f33fb5 update from master Niels 2016-02-14 21:44:00 +01:00
  • 7f4736b546 added serialization to fuzz testing Niels 2016-02-14 21:36:56 +01:00
  • a3eecdc383 updated Catch to v1.3.4 Niels 2016-02-14 21:36:43 +01:00
  • 153e105164 cleanup after #207 Niels 2016-02-14 18:38:29 +01:00
  • ec098ffcc2 Merge pull request #207 from msm-/afl-fuzz Niels 2016-02-14 17:24:54 +01:00
  • 49dc2dff68 fixed error when compiled with Clang Niels 2016-02-14 16:58:24 +01:00
  • 836fdfedf2 fixed an error in MSVC Niels 2016-02-14 16:53:32 +01:00
  • a69b1a6f0b added noexcept and constexpr Niels 2016-02-14 16:42:48 +01:00
  • 9e500b49ac Add support for afl-fuzz testing Michael Macnair 2016-02-12 09:35:08 +00:00
  • 61fe90f998 Merge pull request #205 from nlohmann/issue204 Niels 2016-02-10 21:41:55 +01:00
  • a831c787df try to replace std::ptrdiff_t with auto (for #204) Niels 2016-02-10 21:19:31 +01:00
  • 4cc4b26dd2 try to replace ssize_t occurrences with std::ptrdiff_t (for #204) Niels 2016-02-10 21:09:52 +01:00
  • 1cc4717582 tried Clang 3.9 Niels 2016-02-09 21:26:40 +01:00
  • be20555985 removed gitter Niels 2016-02-07 17:24:51 +01:00
  • 236b7afff5 updated and fixed online version Niels 2016-02-07 15:07:17 +01:00
  • fdfb39d949 improved documentation Niels 2016-02-07 14:55:29 +01:00
  • 3b776c08c7 clarified documentation Niels 2016-02-07 10:45:52 +01:00
  • 8b1a777d36 reverted change wrt. Erasable concept Niels 2016-02-05 22:37:28 +01:00
  • 2ff2e10660 checking Erasable concept Niels 2016-02-05 22:30:37 +01:00
  • ae5bd307a2 improved documentation Niels 2016-02-05 22:30:25 +01:00
  • 2c720b26ab added a constructor from an input stream Niels 2016-02-05 19:24:42 +01:00
  • 104c4b5286 improve code coverage Niels 2016-01-31 15:04:38 +01:00
  • 6aa881988d improved documentation Niels 2016-01-31 13:05:39 +01:00
  • 22127a4b85 moved documentation to index markdown file Niels 2016-01-30 22:05:01 +01:00
  • 740239cef8 added a note about GCC 4.8 (#163) Niels 2016-01-30 21:17:08 +01:00
  • 36719fdb18 using re2c 0.16 (minimized automaton) Niels 2016-01-30 20:33:31 +01:00
  • 9d063d90e3 removed "using namespace" from examples Niels 2016-01-30 20:23:14 +01:00
  • ade2f7c92d updated ChangeLog Niels 2016-01-30 16:51:53 +01:00
  • 2224435f9b cleanup after #200 Niels 2016-01-30 13:36:15 +01:00
  • cd44e43457 Merge pull request #200 from twelsby/issue199 Niels 2016-01-30 13:32:22 +01:00
  • 561accb068 Fixed issue #199 Trevor Welsby 2016-01-30 12:41:12 +10:00
  • ff6f723195 removed token Niels 2016-01-26 23:30:51 +01:00
  • 3dfa56795f added note Niels 2016-01-26 23:27:07 +01:00
  • 1c80c2231f linked releases in ChangeLog Niels 2016-01-26 23:10:52 +01:00
  • 89b07bd3af added (generated) changelog Niels 2016-01-26 22:59:57 +01:00
  • 91c58a77a1 added Gitter to Travis Niels 2016-01-26 21:49:20 +01:00
  • fb239fe645 trying Gitter Niels 2016-01-26 21:42:51 +01:00
  • 2468631dc9 overworked examples Niels 2016-01-26 20:07:03 +01:00
  • 707732a53e clean up after #193 Niels 2016-01-26 19:50:49 +01:00
  • e46cc6327f Merge pull request #193 from twelsby/issue178 Niels 2016-01-26 19:40:16 +01:00
  • d338042e3e added note to warn about floating-point exceptions (#181) Niels 2016-01-26 19:21:46 +01:00
  • 11ae1d0f09 cleanup after #196 Niels 2016-01-26 19:13:03 +01:00
  • 077fb1d540 Merge pull request #196 from twelsby/issue195 Niels 2016-01-26 19:12:36 +01:00
  • b630ce0e78 thanks Niels 2016-01-26 19:11:58 +01:00
  • 8deaabb289 Merge pull request #197 from m-click/fix_broken_link Niels 2016-01-26 19:10:46 +01:00
  • 08fd6dbf98 Fix broken link Volker Diels-Grabsch 2016-01-26 15:22:15 +01:00
  • 2de94365de Revert to llvm-toolchain-precise-* due to Travis white-list issue Trevor Welsby 2016-01-26 09:14:43 +10:00
  • a4a88b1b7d Issue #195 - update Travis to Trusty due to gcc/clang strtod() bug Trevor Welsby 2016-01-26 08:32:15 +10:00
  • 2b13711009 updated online version v1.1.0 Niels 2016-01-24 23:02:28 +01:00
  • c09d03fba7 fixed documentation Niels 2016-01-24 22:43:00 +01:00
  • 31093694ce fixed version number Niels 2016-01-24 22:21:27 +01:00
  • aee99b362d some editing Niels 2016-01-24 19:24:06 +01:00
  • 0f28c69499 Merge upstream commits and resolve conflicts Trevor Welsby 2016-01-25 02:48:38 +10:00