Commit graph

  • 5c4624c351 wishlist Niels 2016-01-20 21:15:10 +0100
  • a04bd4f851 cleanup after #184 Niels 2016-01-20 21:14:58 +0100
  • 663ad13fc3 Merge pull request #184 from dariomt/master Niels 2016-01-20 20:58:44 +0100
  • db3c7fdb96 added missing template keyword (required by clang) dariomt 2016-01-19 16:20:27 +0100
  • e2f0e8b945 added missing typename (required by clang/gcc) dariomt 2016-01-19 14:56:07 +0100
  • 4d079d135e replicate code changes into re2c file dariomt 2016-01-18 11:32:24 +0100
  • e1645a09e9 Merge branch 'master' of https://github.com/nlohmann/json dariomt 2016-01-18 10:08:58 +0100
  • 72e33eec1a thanks Niels 2016-01-15 08:24:44 +0100
  • 8968885c61 Merge pull request #182 from nibroc/master Niels 2016-01-15 07:21:07 +0100
  • 8ecccf8628 Fixed some typos in CONTRIBUTING.md Corbin Hughes 2016-01-14 22:35:48 -0600
  • c0bb5a56eb added note on assertions (#168) Niels 2016-01-13 21:08:42 +0100
  • a05f27867b fixed wrong file name Niels 2016-01-13 20:37:05 +0100
  • 832fe49bc1 fixed lists Niels 2016-01-13 20:26:47 +0100
  • 57e018483a it's 2016 already... Niels 2016-01-13 20:19:05 +0100
  • 1741e58eb5 contribution guidelines (#175) Niels 2016-01-13 20:18:06 +0100
  • 4511145d3d removing unused catch variables (fixes #180) Niels 2016-01-13 19:19:35 +0100
  • 151d43f63e fixing numerous typos (fixes #179) Niels 2016-01-13 19:14:33 +0100
  • 4a452f11f9 added assertions (#168) Niels 2016-01-03 17:05:27 +0100
  • d27c8a8ea8 reverting OSX Niels 2016-01-02 16:49:56 +0100
  • fb7ff414ad more Valgrind information Niels 2016-01-02 16:42:45 +0100
  • 2d48a36f5c trying Travis and OSX Niels 2016-01-02 16:37:40 +0100
  • b4bb3afb65 removed clang 3.8 Niels 2016-01-02 15:42:56 +0100
  • 4a87ed4441 trying Clang 3.8 Niels 2016-01-02 15:34:34 +0100
  • 33abe87407 forgot version number Niels 2016-01-02 15:30:12 +0100
  • dbf58ae9c0 trying to add Clang 3.7 toolchain Niels 2016-01-02 15:24:13 +0100
  • 7614aa31c0 cleanup Niels 2016-01-02 13:07:22 +0100
  • 9b07504e23 fix for #166 Niels 2016-01-01 18:33:58 +0100
  • 3905406f9c removed an unnecessary cast (fixed #162) Niels 2015-12-29 12:30:05 +0100
  • aca6a3b373 version number Niels 2015-12-28 15:04:15 +0100
  • cb5581392a preparing 1.0.0 release Niels 2015-12-28 14:51:57 +0100
  • 80cdecaadd fixed a cppcheck warning Niels 2015-12-27 18:07:21 +0100
  • d80bbffc78 minor cleanup Niels 2015-12-27 17:58:36 +0100
  • 7371c71d2a using CHECK_THROWS_WITH to check exceptions (#160) Niels 2015-12-27 15:30:30 +0100
  • d6b8830e03 more work on exceptions (#160) Niels 2015-12-26 13:17:32 +0100
  • dc8ab92552 more tests for exceptions (#160) Niels 2015-12-25 13:04:40 +0100
  • 76e5e29eda overworked exceptions and tests (#160) Niels 2015-12-25 11:46:18 +0100
  • 8620583cf9 cleanup Niels 2015-12-23 12:05:57 +0100
  • fcbd984e0f cleanup Niels 2015-12-23 08:44:34 +0100
  • 70493a10d1 iterator_wrapper for const objects (#83) Niels 2015-12-23 08:21:29 +0100
  • 00f9296db5 some cleanup for #83 Niels 2015-12-22 18:07:51 +0100
  • 67c2d90a21 working on #160 Niels 2015-12-22 13:27:40 +0100
  • 4351698c83 re-adding const version operator[] (#135, #159) Niels 2015-12-21 08:42:42 +0100
  • 9def0186be upgraded Catch to v1.3.1 Niels 2015-12-20 15:42:01 +0100
  • 457bfc2401 work on #144 Niels 2015-12-20 15:30:07 +0100
  • 1adb9d62dd fixed #156 Niels 2015-12-17 16:52:38 +0100
  • ac4d4a0f66 fixed compilation error and fixed shadow warnings Niels 2015-12-17 16:22:15 +0100
  • 07033f67a5 some cleanup and more documentation Niels 2015-12-17 15:49:33 +0100
  • fb972e845b show reference to source code in documentation Niels 2015-12-16 12:10:12 +0100
  • 6ac89df54d fix for #127 Niels 2015-12-16 12:09:59 +0100
  • a615598b14 cleanup documentation; started added versions Niels 2015-12-15 19:42:32 +0100
  • 1df5d726d9 undid the fix for #136 Niels 2015-12-15 18:34:07 +0100
  • cd04a7d3e9 fix for #133 Niels 2015-12-15 08:38:54 +0100
  • 2ba901bbf6 cleanup Niels 2015-12-14 21:23:21 +0100
  • 5bc1b65676 clean up (for #154) Niels 2015-12-14 16:58:49 +0100
  • 258f04c561 fixed #154 (no more warnings for incomplete switches) Niels 2015-12-14 16:32:37 +0100
  • a70a7a8001 fixed #135: operator[] now only works on nonconst JSON objects Niels 2015-12-13 11:26:55 +0100
  • c767f464bb dropped GCC 4.8 support (due to #110) Niels 2015-12-08 18:12:34 +0100
  • 9da8770f3a ignore UTF-8 byte order mark (fixes #152) Niels 2015-12-07 22:27:53 +0100
  • e0d334c4f1 added a comment (see #109) Niels 2015-12-07 21:53:32 +0100
  • d6771ac79d corrected a username Niels 2015-12-07 21:50:27 +0100
  • d9432aa168 Merge pull request #124 from emvivre/master Niels 2015-12-07 21:11:58 +0100
  • 22bc022745 added change from #140 Niels 2015-12-07 21:05:21 +0100
  • 72476b4226 cleanup after #153 Niels 2015-12-07 20:38:13 +0100
  • f36f316fc7 Merge pull request #153 from whackashoe/remove_sprintf Niels 2015-12-07 20:35:43 +0100
  • 6f8e36ac3d fixes #136 Niels 2015-12-06 17:33:47 +0100
  • 14d8a91f73 Replace sprintf with hex function, this fixes #149 Jett 2015-11-19 00:17:36 -0600
  • c013223276 Merge pull request #146 from robertmrk/surrogate-pair-parsing-fix Niels 2015-11-14 08:22:04 +0100
  • ec7a1d8347 Fix character skipping after a surrogate pair Robert Marki 2015-11-13 12:49:26 +0100
  • 3948630374 Merge pull request #130 from dariomt/patch-1 Niels 2015-10-23 18:42:10 +0200
  • 8f379ef3eb Merge pull request #137 from dariomt/patch-3 Niels 2015-10-20 22:31:15 +0200
  • 652e1caa76 Apply same change to the re2c file dariomt 2015-10-19 12:34:10 +0200
  • 8162a6e3a3 Apply same change to the re2c file dariomt 2015-10-19 12:26:38 +0200
  • 746c1a7142 cleanup Niels 2015-10-17 12:51:59 +0200
  • 73632377bf Merge pull request #131 from dariomt/patch-2 Niels 2015-10-17 12:41:20 +0200
  • 4b8a822f33 Merge branch 'get_ref' dariomt 2015-10-16 16:42:03 +0200
  • 95090a7ddd Merge branch 'patch-2' dariomt 2015-10-16 16:40:57 +0200
  • 04cc7d5a05 doh! disable test correctly only for MSVC dariomt 2015-10-16 16:36:34 +0200
  • 5198e1f2e4 removed const in get_ptr() by accident dariomt 2015-10-16 15:45:47 +0200
  • bd2783f45c Added get_ref() dariomt 2015-10-16 15:23:57 +0200
  • 8f97e99feb Merge remote-tracking branch 'origin/patch-3' Dario Menendez 2015-10-16 11:23:19 +0200
  • 8d53c5e06f Merge remote-tracking branch 'origin/patch-2' Dario Menendez 2015-10-16 11:22:57 +0200
  • b342e1207c Detect correctly pointer-to-const dariomt 2015-10-16 11:11:16 +0200
  • 9d45aafc2c disabled "CopyAssignable" test for MSVC in Debug mode, see #125 dariomt 2015-10-07 18:31:08 +0200
  • 55cbd903e8 removed stream operator for iterator, resolution for #125 dariomt 2015-10-07 17:50:53 +0200
  • 57de1d602e Cleanup Niels 2015-10-03 13:16:59 +0200
  • 2550d29ded Merge pull request #122 from d-frey/patch-1 Niels 2015-10-03 12:29:26 +0200
  • 589dc2180a Merge pull request #120 from silverweed/patch-1 Niels 2015-10-03 10:43:16 +0200
  • 4eac295211 Merge pull request #115 from whoshuu/patch-1 Niels 2015-10-03 10:41:26 +0200
  • b3ff862afc Merge pull request #121 from ColinH/master Niels 2015-10-03 10:39:14 +0200
  • 83d068c32c Merge pull request #126 from d-frey/patch-2 Niels 2015-10-03 10:38:18 +0200
  • 99261bf39c Merge pull request #129 from dariomt/master Niels 2015-10-03 10:36:35 +0200
  • 260745810d fixed typos in comments for examples Dario Menendez 2015-10-02 15:57:40 +0200
  • 1c43789682 Remove superfluous inefficiency Daniel Frey 2015-09-25 20:08:35 +0200
  • 4f27004dd5 remove invalid parameter '-stdlib=libc++' in CMakeLists.txt emvivre 2015-09-22 16:57:18 +0200
  • f7fb405564 exception-safe object creation, fixes #118 Daniel Frey 2015-09-20 20:06:33 +0200
  • 2d7f1542b1 Use the right variable name in doc string Huu Nguyen 2015-08-24 17:57:50 -0700
  • 8fdd20cdda Overload parse() to accept an rvalue reference silverweed 2015-09-20 16:15:55 +0200
  • c6c37d00d1 Fix small oversight. Colin Hirsch 2015-09-20 15:04:51 +0200
  • 0a81353989 reverted changes Niels 2015-08-22 10:47:14 +0200
  • b9592bd2d6 more compilers Niels 2015-08-22 10:43:04 +0200