Commits · 6402077ac25d73b2421acfb40529561eabd13086 · Libraries / json

18 Jan, 2018 1 commit
- Merge pull request #876 from nlohmann/feature/rfc7396 · 6402077a
  Niels Lohmann authored Jan 18, 2018
```
JSON Merge Patch (RFC 7396)
```
  6402077a
14 Jan, 2018 8 commits
- 🔨 clean up · 3ac67456
  Niels Lohmann authored Jan 14, 2018
  
  3ac67456
- Merge pull request #911 from theodelrieu/fix/cmake_install · d9446b0e
  Niels Lohmann authored Jan 14, 2018
```
Fix/cmake install
```
  d9446b0e
- 🔨 removed failing amalgamation test · 06cddd37
  Niels Lohmann authored Jan 14, 2018
  
  06cddd37
- 📝 overworked documentation wrt. amalgamation #906 · 411c16cb
  Niels Lohmann authored Jan 14, 2018
  
  411c16cb
- 📝 it's 2018 · fea5f379
  Niels Lohmann authored Jan 14, 2018
  
  fea5f379
- ♻ adjusted code to split headers · 541b4613
  Niels Lohmann authored Jan 14, 2018
  
  541b4613
- Merge branch 'develop' into feature/rfc7396 · 0e8f01a9
  Niels Lohmann authored Jan 14, 2018
  
  0e8f01a9
- 🚧 added check whether code is amalgamated · 420dcf1f
  Niels Lohmann authored Jan 14, 2018
  
  420dcf1f
13 Jan, 2018 5 commits
- cmake: add option to use/install the non-amalgamated version · 5775084f
  Théo DELRIEU authored Jan 13, 2018
  
  5775084f
- move amalgamate tool to third_party folder · 84bffd5d
  Théo DELRIEU authored Jan 13, 2018
  
  84bffd5d
- cmake: add back trailing slash to NLOHMANN_JSON_SOURCE_DIR · 922b56e4
  Théo DELRIEU authored Jan 13, 2018
  
  922b56e4
- 🚨 removed linter warnings for Python code · a66b2d20
  Niels Lohmann authored Jan 13, 2018
  
  a66b2d20
- ➕ added amalgamate Python script · f4a55f26
  Niels Lohmann authored Jan 13, 2018
  
  f4a55f26
10 Jan, 2018 1 commit
- 🔨 some clean up · 85173f56
  Niels Lohmann authored Jan 10, 2018
  
  85173f56
09 Jan, 2018 3 commits
- ➖ ➕ replaces amalgamation tool · ce53537b
  Niels Lohmann authored Jan 09, 2018
```
The tool used before created a lot of duplicates inside the generated amalgamation. The new tool is a single Python file which seems to do the same job.
```
  ce53537b
- ♻ reorganized code · 0a2920e0
  Niels Lohmann authored Jan 09, 2018
  
  0a2920e0
- Merge pull request #700 from theodelrieu/refactor/split_it · b67e00b9
  Niels Lohmann authored Jan 09, 2018
```
Refactor/split it
```
  b67e00b9
08 Jan, 2018 22 commits
- add single_header CMake target · 7e4ee23f
  Théo DELRIEU authored Aug 14, 2017
  
  7e4ee23f
- add missing includes, put back include comments · 57d822b6
  Théo DELRIEU authored Aug 14, 2017
  
  57d822b6
- add adl_serializer.hpp · 9cab30cf
  Théo DELRIEU authored Aug 14, 2017
  
  9cab30cf
- add detail/json_ref.hpp · 8e9714fe
  Théo DELRIEU authored Aug 14, 2017
  
  8e9714fe
- add detail/serializer.hpp · a3473fda
  Théo DELRIEU authored Aug 14, 2017
  
  a3473fda
- add detail/parsing/binary_writer.hpp · c117515e
  Théo DELRIEU authored Aug 14, 2017
  
  c117515e
- add detail/parsing/binary_reader.hpp · d620f76f
  Théo DELRIEU authored Aug 14, 2017
  
  d620f76f
- add detail/parsing/output_adapters.hpp · 4dbb433a
  Théo DELRIEU authored Aug 14, 2017
  
  4dbb433a
- add detail/iterators/json_reverse_iterator.hpp · ae6f6604
  Théo DELRIEU authored Aug 14, 2017
  
  ae6f6604
- add detail/iterators/iteration_proxy.hpp · 5fc9ef2b
  Théo DELRIEU authored Aug 14, 2017
  
  5fc9ef2b
- add detail/iterators/iter_impl.hpp · bf06cf6c
  Théo DELRIEU authored Aug 14, 2017
  
  bf06cf6c
- add detail/iterators/internal_iterator.hpp · 3e65a652
  Théo DELRIEU authored Aug 14, 2017
  
  3e65a652
- add detail/iterators/primitive_iterator.hpp · 51ecc31d
  Théo DELRIEU authored Aug 14, 2017
  
  51ecc31d
- add detail/parsing/parser.hpp · 9ea25685
  Théo DELRIEU authored Aug 14, 2017
  
  9ea25685
- add detail/parsing/lexer.hpp · 3a0743db
  Théo DELRIEU authored Aug 14, 2017
  
  3a0743db
- add detail/parsing/input_adapters.hpp · 7ab3e8d7
  Théo DELRIEU authored Aug 14, 2017
  
  7ab3e8d7
- add detail/conversions/to_json.hpp · 21881606
  Théo DELRIEU authored Aug 14, 2017
  
  21881606
- add detail/conversions/from_json.hpp · e0c02c14
  Théo DELRIEU authored Aug 14, 2017
  
  e0c02c14
- add detail/value_t.hpp · 7056b375
  Théo DELRIEU authored Aug 14, 2017
  
  7056b375
- add detail/exceptions.hpp · 8c555db9
  Théo DELRIEU authored Aug 14, 2017
  
  8c555db9
- add detail/meta.hpp · f364f5ac
  Théo DELRIEU authored Aug 14, 2017
  
  f364f5ac
- add detail/macro_{un}scope.hpp · d686713f
  Théo DELRIEU authored Aug 14, 2017
  
  d686713f