aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util/internal
Commit message (Expand)AuthorAge
* Merge pull request #4608 from khuzemap/masterGravatar Feng Xiao2018-06-25
|\
* \ Merge pull request #4813 from htuch/fix-any-in-mapGravatar Feng Xiao2018-06-21
|\ \
* | | Added TODO for grouping options.Gravatar Harvey Tuch2018-06-21
| * | protostream_objectwriter: fix bug when Any is directly embedded in a map.Gravatar Harvey Tuch2018-06-21
* | | protostream_objectsource: preserve print options across Any.Gravatar Harvey Tuch2018-06-21
|/ /
| * Add "override" for overridden virtual functionsGravatar Khuzema Pithewan2018-06-19
* | proto_writer.h: RenderBytes is an override. Marking it. (#4707)Gravatar medinandres2018-06-18
|/
* Merge branch 'master' into fixbug_enum2json2Gravatar stone47742018-03-22
|\
* | Use the first enum value instead of 0 in DefaultValueObjectWriter::FindEnumDe...Gravatar stone47742018-03-21
* | Fix bug: whether always_print_enums_as_ints is true or false, it always print...Gravatar stone47742018-03-19
| * Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
| |\ | |/ |/|
| * Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
* | The JsonParseOptions::ignore_unknown_fields option behavior treatsGravatar Alexey Malov2018-02-12
|/
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
* Merge from google internalGravatar Jisi Liu2017-10-18
* Move namespace closing brace inside the header guard blockGravatar Francois Marier2017-10-12
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* Merge pull request #2867 from mojoBrendan/masterGravatar Feng Xiao2017-03-17
|\
* \ Merge pull request #2837 from anandolee/masterGravatar Jie Luo2017-03-17
|\ \
| | * Add option to preserve original proto field namesGravatar Brendan McCarthy2017-03-17
| | * Add use_snake_case_for_field_names option to JsonPrintOptionsGravatar Brendan McCarthy2017-03-17
| |/ |/|
| * DefaultValueObjectWriter should populate oneof message fieldGravatar Jie Luo2017-03-10
* | Use per-type table to lookup JSON name.Gravatar Feng Xiao2017-03-09
|/
* Add an option to always print enums as ints in Json APIGravatar Sanchay Harneja2017-02-18
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
* Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| * Add LL to large constantGravatar zhsyourai2016-11-18
| * Made helper code also consider package name 'proto2' when dealing with Messag...Gravatar guptasu2016-11-10
|/
* Fix MSVC stack overflow issue.Gravatar Feng Xiao2016-10-10
* Fix VS test failures.Gravatar Feng Xiao2016-10-10
* Reduce test length to avoid stack overflow on VS.Gravatar Feng Xiao2016-10-10
* Integrate internal changesGravatar Bo Yang2016-10-10
* Fixes static analyzer issues from xcode.Gravatar Sergio Campama2016-09-20
* fix #1342 cause by ownership issuesGravatar mike070262016-09-01
* Restore New*Callback into google::protobuf namespace since these are used by ...Gravatar Srivats P2016-08-29
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
* Merge pull request #1753 from xfxyjwf/fixupGravatar Jisi Liu2016-07-07
|\
| * Fix data member declaration order.Gravatar Feng Xiao2016-07-06
* | Fix spelling in strings and commentsGravatar Otto Kekäläinen2016-07-03
|/
* Merge pull request #1704 from lizan/json_parse_optionsGravatar Feng Xiao2016-07-01
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| * Add JsonParseOptions to ignore unknown fieldsGravatar Lizan Zhou2016-06-28
|/
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
* Do not use C++11 unicode escape in unittest.Gravatar Jisi Liu2016-04-01
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
* Fix for Visual Studio 2008.Gravatar Feng Xiao2015-12-30