aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util
Commit message (Expand)AuthorAge
* typoGravatar Brady Killeen2018-04-26
* 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
* | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonGravatar Feng Xiao2018-02-26
|\ \ | |/ |/|
| * The JsonParseOptions::ignore_unknown_fields option behavior treatsGravatar Alexey Malov2018-02-12
* | Removed using statements from common.hGravatar Adam Cozzette2018-01-26
|/
* Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
|\
* | line breaks adjstedGravatar Ubuntu2017-12-20
* | formatting issuesGravatar Ubuntu2017-12-20
| * Replace C++11 only method std::map::atGravatar Jisi Liu2017-12-19
* | resolve issue 4032 and added a unit testGravatar Ubuntu2017-12-19
* | Clarify default value behavior in JSON conversion.Gravatar Feng Xiao2017-12-12
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
|/
* Merge from google internalGravatar Jisi Liu2017-10-18
* Fix undefined memory management found by Clang's sanitizers.Gravatar John Millikin2017-10-16
* Move namespace closing brace inside the header guard blockGravatar Francois Marier2017-10-12
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\
* | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| * Removing undefined behavior and compiler warnings (#1315)Gravatar brian-peloton2017-05-23
|/
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\
* \ Merge pull request #3018 from acozzette/using-namespace-stdGravatar Adam Cozzette2017-04-26
|\ \
| * | Remove "using namespace std" from stubs/common.hGravatar Adam Cozzette2017-04-26
* | | Remove unused constants.Gravatar Jakob Buchgraber2017-04-25
|/ /
| * Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/
* Merge pull request #2861 from byronyi/#710Gravatar Adam Cozzette2017-03-20
|\
* \ Merge pull request #2867 from mojoBrendan/masterGravatar Feng Xiao2017-03-17
|\ \
* \ \ Merge pull request #2837 from anandolee/masterGravatar Jie Luo2017-03-17
|\ \ \
| | | * Update delimited_message_util_test.ccGravatar Bairen Yi2017-03-18
| | * | 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
| |/ / |/| |
| | * fix several issuesGravatar Byron Yi2017-03-17
| | * add LIBPROTOBUF_EXPORT to make msvc happyGravatar Byron Yi2017-03-16
| | * migrate delimited messages functions to util packageGravatar Byron Yi2017-03-16
| |/ |/|
| * DefaultValueObjectWriter should populate oneof message fieldGravatar Jie Luo2017-03-10
* | Use per-type table to lookup JSON name.Gravatar Feng Xiao2017-03-09
|/
* Remove the use of C++11 features.Gravatar Feng Xiao2017-02-27
* Merge pull request #2355 from xfxyjwf/fixjsonGravatar Feng Xiao2017-02-24
|\
* | Add an option to always print enums as ints in Json APIGravatar Sanchay Harneja2017-02-18
* | JsonUtilTest: Add ParsePrimitiveMapIn subtestGravatar Konstantin Podsvirov2017-02-11
* | 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
| | * Speed up JSON parsing.Gravatar Feng Xiao2016-11-10
| |/ |/|
| * 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