j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • dad4916f9e Merge pull request #654 from ryanjmulder/develop Niels Lohmann 2017-07-12 07:58:45 +0200
  • 486f3a2d16 restore necessary comman in documentation of dump Ryan Mulder 2017-07-11 14:18:02 -0400
  • 40461c6c55 update comment on dump to not indicate that ensure_ascii is true by default Ryan Mulder 2017-07-11 13:59:07 -0400
  • 71597be294 add ensure_ascii parameter to dump. #330 Ryan Mulder 2017-07-11 13:41:56 -0400
  • cd800522e4 Rename BuildTests to JSON_BuildTests Oleg Endo 2017-07-11 22:57:49 +0900
  • 7dee868a42 Merge pull request #643 from theodelrieu/refacto/split_basic_json Niels Lohmann 2017-07-09 23:12:35 +0200
  • 8585d35c92
         move serializer outside of basic_json Théo DELRIEU 2017-07-09 17:43:59 +0200
  • acff23efb2
         move binary_{reader,writer} outside of basic_json Théo DELRIEU 2017-07-09 17:31:25 +0200
  • bb752fd30c
         move json_reverse_iterator outside of basic_json Théo DELRIEU 2017-07-09 17:20:03 +0200
  • 0ba98b6fe0
         move internal_iterator/iter_impl/iteration_proxy outside of basic_json Théo DELRIEU 2017-07-09 16:53:36 +0200
  • 00d6e27194
         move primitive_iterator outside of basic_json Théo DELRIEU 2017-07-01 20:18:42 +0200
  • 8e681d1e57
         move lexer/parser outside of basic_json Théo DELRIEU 2017-07-09 16:38:24 +0200
  • 15625ca4a7
         move input adapters outside of basic_json Théo DELRIEU 2017-07-01 20:01:28 +0200
  • a332142194
         move json_pointer outside of basic_json Théo DELRIEU 2017-07-01 19:52:18 +0200
  • fe086d7432
         forward declare basic_json, add two macros Théo DELRIEU 2017-07-01 19:44:05 +0200
  • d3496347fc
         👷 removing Clang 3.9 and 4.0 Niels Lohmann 2017-07-09 12:19:14 +0200
  • 504012a3db
         📝 cleanup after #650 Niels Lohmann 2017-07-09 11:51:38 +0200
  • a0e0579374 Merge pull request #650 from olegendo/develop Niels Lohmann 2017-07-09 11:12:46 +0200
  • 1b2fabe802
         👷 adding two recent Clang versions Niels Lohmann 2017-07-09 11:10:18 +0200
  • e3bb156f82 fix typo Oleg Endo 2017-07-09 15:20:28 +0900
  • b753cb6ee7 use std::make_shared Oleg Endo 2017-07-09 15:19:08 +0900
  • f0ca96d462 include <iosfwd> instead of <iostream> Oleg Endo 2017-07-09 15:04:49 +0900
  • f1c543cb7b
         👷 added GCC7 Niels Lohmann 2017-07-08 22:59:19 +0200
  • 7b05e1a687
         🔨 improved performance in dump for deeply nested values Niels Lohmann 2017-07-08 22:59:04 +0200
  • f697fec522
         📝 fixed documentation Niels Lohmann 2017-07-08 22:16:45 +0200
  • 87bccbc335
         🔨 removed exception parse_error.111 Niels Lohmann 2017-07-08 21:35:13 +0200
  • b38ecb5ca9
         🔨 simplified binary write Niels Lohmann 2017-07-08 20:31:13 +0200
  • b3ac36db93
         🔨 excluded uncovered lines Niels Lohmann 2017-07-08 18:34:08 +0200
  • e67df7c385
         Merge branch 'feature/undo_171' into develop Niels Lohmann 2017-07-08 16:34:00 +0200
  • 552622343e
         📝 fixed typos Niels Lohmann 2017-07-08 16:18:27 +0200
  • 566f6dcf30
         🔥 removing usused functions #645 Niels Lohmann 2017-07-08 13:33:13 +0200
  • 6f12749ef6
         📝 added version string for Xcode 9 Niels Lohmann 2017-07-08 12:55:05 +0200
  • ac42333749
         ⬆️ Catch v1.9.6 Niels Lohmann 2017-07-08 12:11:45 +0200
  • 015c88783e
         🔨 fixed a pedantic warning Niels Lohmann 2017-07-08 12:03:12 +0200
  • df2feabb72
         👷 added Xcode 9 beta Niels Lohmann 2017-07-08 11:57:09 +0200
  • 63ecbfd36b
         ✅ re-added test Niels Lohmann 2017-07-07 23:38:04 +0200
  • 07b78c993c
         🐛 fixed undefined behavior bug Niels Lohmann 2017-07-07 23:37:16 +0200
  • 8b123107c0
         🔨 fixed some pedantic GCC warnings Niels Lohmann 2017-07-07 22:41:22 +0200
  • 32065c8045
         📝 fix for #639 Niels Lohmann 2017-07-07 21:16:33 +0200
  • e99b783def
         🔨 simplifying scanner Niels Lohmann 2017-06-22 16:40:15 +0200
  • 3dc5d95422
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-06-21 18:55:28 +0200
  • b9a8425cc8
         📝 cleanup after #629 and #630 Niels Lohmann 2017-06-21 18:55:25 +0200
  • 5ee651c387 Merge pull request #630 from Chocobo1/doc_neq Niels Lohmann 2017-06-21 18:54:18 +0200
  • dad6051f37 Merge pull request #629 from Chocobo1/c4819 Niels Lohmann 2017-06-21 18:54:03 +0200
  • 4b5433578a
         ✅ added progress output for Unicode tests Niels Lohmann 2017-06-21 18:50:11 +0200
  • 0395f3fdfb fix typo Chocobo1 2017-06-21 21:41:20 +0800
  • 66ffac9e8a Fix MSVC warning C4819 Chocobo1 2017-06-21 16:17:10 +0800
  • 6f3bebff5c
         🔨 removed unexpect function Niels Lohmann 2017-06-21 07:26:50 +0200
  • 2fd214c14b
         🔨 adjusted pedantic flags Niels Lohmann 2017-06-20 23:05:37 +0200
  • e7695306f1
         🔨 fixed a warning Niels Lohmann 2017-06-20 22:58:02 +0200
  • 84f2e64a7c
         ✅ improved coverage Niels Lohmann 2017-06-20 22:35:31 +0200
  • 9add24ff10
         🔨 fixed a warning Niels Lohmann 2017-06-20 22:20:41 +0200
  • 2f007ca092
         ✅ improved coverage Niels Lohmann 2017-06-20 22:03:36 +0200
  • a5c27ede32
         🔨 fixed a warning Niels Lohmann 2017-06-20 21:39:36 +0200
  • 7c2a187258
         ✅ improved test coverage Niels Lohmann 2017-06-20 21:09:26 +0200
  • e191dd833f
         🔨 fixed warning about pointer members Niels Lohmann 2017-06-20 21:09:05 +0200
  • 82b95ca664
         🔨 simplified error handling in parser Niels Lohmann 2017-06-20 20:14:18 +0200
  • f2cdb3d594
         ⬆️ Catch v1.9.5 Niels Lohmann 2017-06-20 20:13:56 +0200
  • c2044205ef
         📝 updated used compilers Niels Lohmann 2017-06-20 16:12:14 +0200
  • c2db4a118d
         👷 update Travis to use Ubuntu Trusty 14.04 images Niels Lohmann 2017-06-19 21:51:24 +0200
  • 70b7455a13
         🔨 minor change Niels Lohmann 2017-06-19 21:50:36 +0200
  • 4e6f548c0b Merge pull request #624 from theodelrieu/feature/pair_tuple_conversions Niels Lohmann 2017-06-19 17:31:10 +0200
  • 08d781058c
         add from_json support for std::array Théo DELRIEU 2017-06-19 12:03:38 +0200
  • 6e4910d5c5
         add pair/tuple conversions Théo DELRIEU 2017-06-17 14:24:07 +0200
  • 112a6f4e53
         🔨 replaced lexer's error message by const char* Niels Lohmann 2017-06-18 13:03:14 +0200
  • 747f7d36d1
         Merge branch 'develop' of https://github.com/nlohmann/json into develop Niels Lohmann 2017-06-18 00:00:36 +0200
  • b79a1a2678
         📝 update after #626 Niels Lohmann 2017-06-18 00:00:31 +0200
  • 7b97100ffd Merge pull request #626 from koemeet/bugfix/vs2017-min-macro-fix Niels Lohmann 2017-06-17 23:58:13 +0200
  • 04a1666ef2 Add parentheses around std::min so it bypasses the macro introduced by windows.h. Steffen Brem 2017-06-17 22:01:18 +0200
  • 1fbb82de89
         🔨 using std::array to buffer input Niels Lohmann 2017-06-17 20:47:53 +0200
  • 889006f006
         ✅ regression test for #600 Niels Lohmann 2017-06-17 13:37:04 +0200
  • e1ca484bc1
         📝 added note about Conan #566 Niels Lohmann 2017-06-17 11:20:09 +0200
  • b27d2adcbe
         ✨ accept functions to check if input is valid JSON #458 Niels Lohmann 2017-06-16 19:23:55 +0200
  • d415293d41 Merge pull request #615 from theodelrieu/develop Niels Lohmann 2017-06-16 18:16:20 +0200
  • c98364834f
         remove std::pair support Théo DELRIEU 2017-06-13 11:11:29 +0200
  • fd4a0ecabc
         Merge branch 'feature/ifstream' into develop Niels Lohmann 2017-06-13 08:41:14 +0200
  • 88dc7c11fa
         🔨 fixed a warning Niels Lohmann 2017-06-12 19:58:44 +0200
  • afb959a083
         🔨 removed nonportable code Niels Lohmann 2017-06-12 19:02:08 +0200
  • ac793e957f
         🔨 trying to fix #367 Niels Lohmann 2017-06-12 18:58:58 +0200
  • 5fa5c17bc6
         ✏️ cleanup after #595 Niels Lohmann 2017-06-10 18:29:16 +0200
  • 6caad48e44 Merge pull request #595 from HenryRLee/iterator_arithmetic Niels Lohmann 2017-06-10 18:26:48 +0200
  • e12c2ee6a8 Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-09 20:47:42 +1000
  • 52f934cbbf Merge pull request #609 from theodelrieu/develop Niels Lohmann 2017-06-07 16:38:23 +0200
  • cea39dfaa8
         fix #600 Théo DELRIEU 2017-06-06 14:18:32 +0200
  • 6661ec755b Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-07 18:01:46 +1000
  • 0f065edff6 Revert a change in reverse iterator to pass the test cases HenryLee 2017-06-07 18:01:01 +1000
  • 92ef19696a
         ✏️ cleanup after #598 Niels Lohmann 2017-06-06 20:48:11 +0200
  • bfdf0d1ce6 Merge pull request #598 from HenryRLee/issue550 Niels Lohmann 2017-06-06 20:41:42 +0200
  • 85de93ba93
         add std::pair<CompatibleStringType, T> support Théo DELRIEU 2017-06-06 13:44:35 +0200
  • c98169d0d5 Revert "Change iterator category to random access" HenryLee 2017-06-05 21:59:17 +1000
  • fb91aa81da Merge branch 'develop' into iterator_arithmetic HenryLee 2017-06-05 20:24:21 +1000
  • 2ba554e442 Merge branch 'develop' into issue550 HenryLee 2017-06-05 20:24:08 +1000
  • 1a9d76679a
         🐛 fixed the issue with GCC7 #590 Niels Lohmann 2017-06-04 18:40:32 +0200
  • d19c5ced4b
         🐛 skipping BOM for iterators #602 Niels Lohmann 2017-06-02 12:38:32 +0200
  • c043ba6978
         🔥 removed failing test #529 Niels Lohmann 2017-06-01 07:32:39 +0200
  • f2e1643039 Add test cases for iterator to const iterator assignment HenryLee 2017-05-31 00:50:40 +1000
  • 2d5f0c0549 Redefine the converting assignment in iterator HenryLee 2017-05-31 00:50:14 +1000
  • c09a4cbbd7 Add test cases for iterator to const iterator conversion HenryLee 2017-05-31 00:31:16 +1000
  • 0a51fb22ed Fix indentation HenryLee 2017-05-30 23:37:24 +1000
  • 881cd3f420 Remove the iter_impl<const basic_json> copy constructor and copy assignment HenryLee 2017-05-30 20:57:22 +1000