Niels
|
9e2dfd19e8
|
minor cleanup
|
2016-06-07 00:20:53 +02:00 |
|
Niels
|
04e1e7b586
|
cleanup
|
2016-05-29 14:56:08 +02:00 |
|
Niels
|
aa8aa3ba9f
|
overworked coverity stuffy
|
2016-05-29 14:06:43 +02:00 |
|
Niels
|
6bdb883b5c
|
ignore build errors for coverity-scan
|
2016-05-29 13:32:36 +02:00 |
|
Niels
|
c0b2c6ea5d
|
removing beta-xcode6.3 for now
|
2016-05-29 13:06:27 +02:00 |
|
Niels
|
6fed416125
|
fixed used compiler
|
2016-05-29 12:57:09 +02:00 |
|
Niels
|
b26582c0e9
|
another try for coverity-scan
|
2016-05-29 12:29:46 +02:00 |
|
Niels
|
1cc77a5fe5
|
another try for coverity-scan
|
2016-05-29 12:15:13 +02:00 |
|
Niels
|
91dfc723be
|
added coverity_scan
|
2016-05-29 12:07:20 +02:00 |
|
Niels
|
7bdfde4493
|
added a note about different NDKs (see #219)
|
2016-05-28 16:06:41 +02:00 |
|
Niels
|
71a7746ccb
|
removed a line
|
2016-05-25 21:55:03 +02:00 |
|
Niels
|
a3f432b3dd
|
added hint to Homebrew
|
2016-05-18 22:23:35 +02:00 |
|
Niels
|
25d60b7bab
|
Merge pull request #247 from robertmrk/feature/cmake-cleanup
Define CMake/CTest tests
|
2016-05-18 22:20:45 +02:00 |
|
Niels
|
837617122a
|
fixed #246
|
2016-05-18 22:17:08 +02:00 |
|
Niels
|
0a393b8374
|
indentation cleanup
|
2016-05-12 07:34:36 +02:00 |
|
Niels
|
0e0ecb2c14
|
fixed a warning and update ChangeLog
|
2016-05-12 00:32:18 +02:00 |
|
Niels
|
fb06356856
|
thanks
|
2016-05-11 20:58:11 +02:00 |
|
Niels
|
888d022573
|
Merge pull request #242 from ChrisKitching/outOfTree
Out of tree builds and a few other miscellaneous CMake cleanups.
|
2016-05-11 20:52:45 +02:00 |
|
Niels
|
f1e61896fb
|
fixed a shadow error
|
2016-05-11 18:43:12 +02:00 |
|
Niels
|
db5c9ec9ba
|
fixed issue #239 (-Wconversion warnings)
|
2016-05-11 17:25:59 +02:00 |
|
Niels
|
91aa4c9def
|
Merge branch 'develop' into feature/issue239
|
2016-05-11 17:23:01 +02:00 |
|
Niels
|
9ecf83f630
|
working on #235
|
2016-05-08 20:28:20 +02:00 |
|
Niels
|
6d8e00ade8
|
another try to remove a warning
|
2016-05-08 17:17:17 +02:00 |
|
Niels
|
ac3036dc0f
|
Merge branch 'develop' into feature/issue239
|
2016-05-08 17:07:08 +02:00 |
|
Niels
|
fadf286653
|
added test case for std::bad_alloc
|
2016-05-08 14:35:32 +02:00 |
|
Niels
|
85a30813c8
|
removed unnecessary code (numbers must not begin with "+")
|
2016-05-07 20:22:58 +02:00 |
|
Niels
|
688cd49bdc
|
Merge branch 'feature/json-patch' into develop
|
2016-05-07 18:41:02 +02:00 |
|
Niels
|
c04275966f
|
improved test coverage
|
2016-05-07 18:33:43 +02:00 |
|
Niels
|
9073b2ca39
|
hopefully removed some warnings
|
2016-04-30 16:22:27 +02:00 |
|
Niels
|
ea84a85b13
|
simplified flatten/unflatten examples
|
2016-04-30 10:39:03 +02:00 |
|
Niels
|
a21f8b0c77
|
added AppVeyor information
|
2016-04-30 01:21:35 +02:00 |
|
Niels
|
9170740f45
|
added documentation on Travis compilers
|
2016-04-30 01:01:41 +02:00 |
|
Niels
|
7c04bc3db6
|
added name call
|
2016-04-30 00:43:33 +02:00 |
|
Niels
|
be16d005e4
|
get compiler versions
|
2016-04-30 00:25:11 +02:00 |
|
Niels
|
f4ecceab19
|
cleanup
|
2016-04-30 00:12:19 +02:00 |
|
Niels
|
1d3b4dd158
|
added test cases
|
2016-04-30 00:03:47 +02:00 |
|
Niels
|
62f81a60d7
|
hopefully fixed a warning
|
2016-04-29 21:23:13 +02:00 |
|
Niels
|
82f5332cf4
|
Merge branch 'develop' into feature/json-patch
|
2016-04-29 20:50:34 +02:00 |
|
Niels
|
74544b42af
|
removed MinGW compiler (too old)
|
2016-04-29 20:48:47 +02:00 |
|
Niels
|
c019088d3b
|
wrong MinGW binary
|
2016-04-29 20:35:40 +02:00 |
|
Niels
|
b685737d53
|
added MinGW
|
2016-04-29 20:18:20 +02:00 |
|
Niels
|
ddc5442c91
|
cleanup
|
2016-04-29 20:09:41 +02:00 |
|
Niels
|
a07cdb14ec
|
don't install valgrind for OSX
|
2016-04-29 20:01:11 +02:00 |
|
Niels
|
40abeb28d5
|
Valgrind only for Linux
|
2016-04-29 20:00:33 +02:00 |
|
Niels
|
68c50073a4
|
added OSX
|
2016-04-29 19:46:37 +02:00 |
|
Niels
|
ca604c5a2e
|
trying Clang 3.9
|
2016-04-29 19:37:52 +02:00 |
|
Niels
|
86d7e3090f
|
removed GCC 6, added Clang 3.5
|
2016-04-29 19:33:43 +02:00 |
|
Niels
|
e35805cf3a
|
added GCC 6 and Clang 3.8 to Travis
|
2016-04-29 19:29:02 +02:00 |
|
Niels
|
86debab3b1
|
Merge branch 'develop' into feature/json-patch
|
2016-04-26 20:43:02 +02:00 |
|
Niels
|
9af8f7d094
|
update after #238
|
2016-04-26 20:38:01 +02:00 |
|
Niels
|
7dc07b75de
|
Merge branch 'develop' into feature/json-patch
|
2016-04-26 20:32:24 +02:00 |
|
Niels
|
0f64761663
|
Merge pull request #238 from robertmrk/cmake-package
Implement additional integration options
|
2016-04-26 20:31:19 +02:00 |
|
Niels
|
5e0bf75d60
|
cleanup, test, and diff
|
2016-04-25 23:17:04 +02:00 |
|
Niels
|
96cfe7463f
|
fixed some warnings
|
2016-04-24 19:09:12 +02:00 |
|
Niels
|
8d4cf5ef8d
|
oops
|
2016-04-24 19:04:10 +02:00 |
|
Niels
|
fb54e212b6
|
clean up and added tests
|
2016-04-24 19:03:33 +02:00 |
|
Niels
|
09e9f6dcd4
|
implemented "move"
|
2016-04-24 17:43:27 +02:00 |
|
Niels
|
855cf2307b
|
extended "add" to cope with arrays
|
2016-04-24 16:51:06 +02:00 |
|
Niels
|
397ada22d3
|
implemented remove
|
2016-04-20 16:52:00 +02:00 |
|
Niels
|
fa03cf0c63
|
replace and copy
|
2016-04-20 15:41:33 +02:00 |
|
Niels
|
70fc5835cb
|
started implementing JSON Patch (RFC 6902)
|
2016-04-18 22:41:36 +02:00 |
|
Niels
|
3ca1bfdd9d
|
made a function static
|
2016-04-17 23:41:52 +02:00 |
|
Niels
|
f4107d0d9c
|
updated documentation
|
2016-04-17 23:36:37 +02:00 |
|
Niels
|
9f8da4c650
|
Merge branch 'feature/json-pointer' into develop
|
2016-04-17 23:23:34 +02:00 |
|
Niels
|
08c97df420
|
added examples
|
2016-04-17 23:18:07 +02:00 |
|
Niels
|
1dee40a969
|
fixed test case
|
2016-04-17 22:34:39 +02:00 |
|
Niels
|
6268287940
|
improved documentation and test coverage
|
2016-04-17 22:08:21 +02:00 |
|
Niels
|
7034ae2486
|
improved test coverage
|
2016-04-17 19:12:12 +02:00 |
|
Niels
|
0835eb293f
|
improved RFC compliance and code coverage
|
2016-04-17 18:54:54 +02:00 |
|
Niels
|
f883a04c87
|
more documentation
|
2016-04-17 18:18:49 +02:00 |
|
Niels
|
40e899a819
|
cleanup and documentation
|
2016-04-17 17:39:35 +02:00 |
|
Niels
|
f834965b44
|
implemented deflatten function
|
2016-04-16 20:45:40 +02:00 |
|
Niels
|
007359675b
|
added a flatten function
|
2016-04-16 16:39:20 +02:00 |
|
Niels
|
3401954f5b
|
cleaned up API
|
2016-04-16 14:02:14 +02:00 |
|
Niels
|
3a3e064287
|
Merge branch 'develop' into feature/json-pointer
|
2016-04-16 12:19:31 +02:00 |
|
Niels
|
76a5a776eb
|
cleanup after #234
|
2016-04-16 12:19:10 +02:00 |
|
Niels
|
6f0053a254
|
Merge branch 'support-move-iterators' of https://github.com/robertmrk/json into develop
|
2016-04-16 12:12:16 +02:00 |
|
Niels
|
94af8abdff
|
overworked reference token parsing
|
2016-04-13 23:23:54 +02:00 |
|
Niels
|
2cb925c186
|
adding support for escaped reference tokens
|
2016-04-13 17:41:19 +02:00 |
|
Niels
|
726051e9b7
|
very first draft of a JSON pointer API
|
2016-04-11 23:17:03 +02:00 |
|
Niels
|
507322e6f2
|
updated ChangeLog
|
2016-04-10 19:36:09 +02:00 |
|
Niels
|
15f8c848fa
|
fixed typo and indentation
|
2016-04-10 18:23:43 +02:00 |
|
Niels
|
170b70f082
|
Merge pull request #232 from nlohmann/issue228
make serialization locale-independent (fixes #228)
|
2016-04-07 17:16:58 +02:00 |
|
Niels
|
a744c62696
|
made tests independent of "C" locale
|
2016-04-05 22:28:27 +02:00 |
|
Niels
|
0b60d970e9
|
make code independent of concrete locale
|
2016-04-05 22:12:12 +02:00 |
|
Niels
|
31bccc83b9
|
fixed locale problems
|
2016-04-05 21:55:51 +02:00 |
|
Niels
|
43ee70cef8
|
revert changes to master
|
2016-04-05 20:47:47 +02:00 |
|
Niels
|
44a8e9bf35
|
locale-independent dump
|
2016-04-03 16:33:30 +02:00 |
|
Niels
|
9c233be567
|
merged #201
|
2016-04-03 14:08:38 +02:00 |
|
Niels
|
04edafbddc
|
Merge pull request #227 from kevin--/kevin--/noexcept_documentation
fixes #223 by updating README.md
|
2016-03-30 20:21:35 +02:00 |
|
Niels
|
1baa5a7350
|
fixed #225
|
2016-03-30 20:18:34 +02:00 |
|
Niels
|
0951a1f94c
|
Merge pull request #222 from Teemperor/fixAndroid
Added missing cerrno header to fix ERANGE compile error on android
|
2016-03-30 20:12:55 +02:00 |
|
Niels
|
96443b0b97
|
added more thanks to the README file
|
2016-03-30 19:47:08 +02:00 |
|
Niels
|
27530c7840
|
better notes for Android (manually closes #215)
|
2016-03-30 19:42:54 +02:00 |
|
Niels
|
888635b749
|
cleanup after PR #212 and PR #226
|
2016-03-30 19:23:11 +02:00 |
|
Niels
|
54d3cab568
|
Merge pull request #226 from lv-zheng/fix_int64
Use namespace std for int64_t and uint64_t
|
2016-03-29 10:35:24 +02:00 |
|
Niels
|
2f63e5fb45
|
added copyright information to files to make release more self-contained
|
2016-03-25 17:41:36 +01:00 |
|
Niels
|
c6a6a024f7
|
fixes #214
|
2016-03-06 20:03:05 +01:00 |
|
Niels
|
10a884473e
|
fixed #217
|
2016-03-04 07:30:08 +01:00 |
|
Niels
|
8ee3d24046
|
Merge pull request #218 from Annihil/master
Corrected readme
|
2016-03-04 07:26:27 +01:00 |
|