aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/internal
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fixbug_enum2json2stone47742018-03-2223-253/+274
|\
| * Merge branch 'master' into down-integrateAdam Cozzette2018-03-134-6/+14
| |\
| * | Integrated internal changes from GoogleAdam Cozzette2018-03-1323-253/+274
* | | Use the first enum value instead of 0 in DefaultValueObjectWriter::FindEnumDe...stone47742018-03-211-1/+1
* | | Fix bug: whether always_print_enums_as_ints is true or false, it always print...stone47742018-03-192-17/+34
| |/ |/|
* | The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-124-6/+14
|/
* Integrated internal changes from GoogleAdam Cozzette2017-12-017-50/+33
* Merge from google internalJisi Liu2017-10-183-28/+50
* Move namespace closing brace inside the header guard blockFrancois Marier2017-10-121-1/+1
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-1/+1
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-187-18/+49
* Down-integrate from google3.Feng Xiao2017-03-2914-201/+204
* Merge pull request #2867 from mojoBrendan/masterFeng Xiao2017-03-174-8/+41
|\
| * Add option to preserve original proto field namesBrendan McCarthy2017-03-176-24/+43
| * Add use_snake_case_for_field_names option to JsonPrintOptionsBrendan McCarthy2017-03-172-2/+16
* | Merge pull request #2837 from anandolee/masterJie Luo2017-03-171-2/+3
|\ \ | |/ |/|
| * DefaultValueObjectWriter should populate oneof message fieldJie Luo2017-03-101-2/+3
* | Use per-type table to lookup JSON name.Feng Xiao2017-03-093-10/+45
|/
* Add an option to always print enums as ints in Json APISanchay Harneja2017-02-183-0/+34
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-316-46/+33
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-174-14/+31
|\
| * Add LL to large constantzhsyourai2016-11-181-4/+4
| * Made helper code also consider package name 'proto2' when dealing with Messag...guptasu2016-11-103-10/+27
* | Integrated internal changes from GoogleAdam Cozzette2016-11-1716-75/+117
|/
* Fix MSVC stack overflow issue.Feng Xiao2016-10-101-0/+5
* Fix VS test failures.Feng Xiao2016-10-101-6/+16
* Reduce test length to avoid stack overflow on VS.Feng Xiao2016-10-101-3/+3
* Integrate internal changesBo Yang2016-10-1028-231/+1198
* Fixes static analyzer issues from xcode.Sergio Campama2016-09-202-3/+0
* fix #1342 cause by ownership issuesmike070262016-09-011-1/+4
* Restore New*Callback into google::protobuf namespace since these are used by ...Srivats P2016-08-291-1/+1
* Integrate from internal code base.Feng Xiao2016-07-135-23/+94
* Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-071-2/+2
|\
| * Fix data member declaration order.Feng Xiao2016-07-061-2/+2
* | Fix spelling in strings and commentsOtto Kekäläinen2016-07-031-1/+1
|/
* Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-015-4/+140
|\
| * Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-285-4/+140
* | Integrated internal changes from GoogleAdam Cozzette2016-06-2912-33/+95
|/
* Down integrate from Google internal.Jisi Liu2016-04-287-30/+369
* Do not use C++11 unicode escape in unittest.Jisi Liu2016-04-011-1/+1
* Integrate google internal changes.Jisi Liu2016-03-3023-186/+980
* Integrate from google internal.Jisi Liu2016-01-291-0/+29
* Fix for Visual Studio 2008.Feng Xiao2015-12-301-2/+6
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-282-222/+0
* Make conformance tests build for C++ and Java.Feng Xiao2015-12-161-2/+2
* Remove the usage of C++11 override.Feng Xiao2015-12-141-2/+2
* Down-integrate from internal code base.Feng Xiao2015-12-1124-1613/+2155
* Fix compilation errors when built internally.Feng Xiao2015-11-022-2/+2
* Correct spellingBenjamin Barenblat2015-10-301-1/+1
* Merge pull request #815 from TeBoring/third-partyPaul Yang2015-10-092-2/+7
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 03:48:33 +0000