aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Update csharp and php descriptorGravatar Jisi Liu2017-07-18
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\
* \ Merge pull request #3023 from acozzette/minGravatar Adam Cozzette2017-04-27
|\ \
| * | Fully qualify min as std::min in wire_format_lite.ccGravatar Adam Cozzette2017-04-27
|/ /
| * Add prefix to enum value with reserved name. (#3020)Gravatar Paul Yang2017-04-26
* | Merge pull request #3018 from acozzette/using-namespace-stdGravatar Adam Cozzette2017-04-26
|\ \
* \ \ Merge pull request #3015 from buchgr/unused-constsGravatar Feng Xiao2017-04-26
|\ \ \
| | * | Remove "using namespace std" from stubs/common.hGravatar Adam Cozzette2017-04-26
| |/ / |/| |
| | * Add a test case for nested enum, which was missed previously. (#3010)Gravatar Paul Yang2017-04-25
| * | Remove unused constants.Gravatar Jakob Buchgraber2017-04-25
|/ /
* | Merge pull request #3008 from postmasters/patch-1Gravatar Feng Xiao2017-04-24
|\ \
| | * Add nested enum descriptor in php rumtime. (#3009)Gravatar Paul Yang2017-04-24
| | * Update php version number to 3.3.0 (#3001)Gravatar Paul Yang2017-04-24
| * | Add a link to dart-lang/protobufGravatar postmasters2017-04-24
|/ /
| * Throw exception when parsing invalid data. (#3000)Gravatar Paul Yang2017-04-21
| * Merge pull request #2996 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-20
| |\
| * | Allow proto files to import descriptor.proto (#2995)Gravatar Paul Yang2017-04-20
| | * Fix python3 issue.Gravatar Feng Xiao2017-04-20
| |/
* | Merge pull request #2992 from xiaogaozi/patch-1Gravatar Feng Xiao2017-04-20
|\ \
| * | Add gogoprotobuf to third-party add-ons listGravatar Changjian Gao2017-04-20
|/ /
| * Prepend "PB" to generated classes whose name are reserved words. (#2990)Gravatar Paul Yang2017-04-20
| * Add test for nested enum for php (#2989)Gravatar Paul Yang2017-04-19
| * Enum defined without package have incorrect class name. (#2988)Gravatar Paul Yang2017-04-19
| * Make PHP c extension work with PHP7 (#2951)Gravatar Paul Yang2017-04-19
* | Merge pull request #2508 from yliu120/pass_default_env_to_protocGravatar Feng Xiao2017-04-19
|\ \
* \ \ Merge pull request #2987 from konsumer/patch-1Gravatar Feng Xiao2017-04-19
|\ \ \
* \ \ \ Merge pull request #2982 from mda000/issue2972Gravatar Adam Cozzette2017-04-19
|\ \ \ \
| | * | | Add node-protoc-plugin to "Other Utilities"Gravatar David Konsumer2017-04-18
| |/ / / |/| | |
* | | | Merge pull request #2985 from thomasvl/class_check_tweaksGravatar Thomas Van Lenten2017-04-18
|\ \ \ \
| * | | | Tighten up class usage/checks.Gravatar Thomas Van Lenten2017-04-18
|/ / / /
| * / / Simplify the Element dtor invocation when freeing elements inGravatar Michael Allen2017-04-17
|/ / /
* | | Merge pull request #2950 from anuraaga/dev_ragGravatar Feng Xiao2017-04-12
|\ \ \
| | | * Merge pull request #2967 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-11
| | | |\
| | | | * Cherry-pick cl/152450543Gravatar Feng Xiao2017-04-11
| | | | * Cherry-pick cl/151775298Gravatar Feng Xiao2017-04-11
| | | |/
| | | * Merge pull request #2955 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-11
| | | |\
| | | * | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Gravatar Jie Luo2017-04-10
| | | | * Add include for INT_MAXGravatar Feng Xiao2017-04-08
| | | |/
| | | * Merge pull request #2949 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-07
| | | |\
| * | | | Allow unknown values for Map put*Value methods just like every other enum mut...Gravatar Anuraag Agrawal2017-04-07
|/ / / /
| | | * Cleanup reflection objects for map entry.Gravatar Feng Xiao2017-04-06
* | | | Merge pull request #2937 from anuraaga/dev_rag2Gravatar Adam Cozzette2017-04-06
|\ \ \ \
| | | * | Merge pull request #2942 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-06
| | | |\|
| | | | * Update generated code.Gravatar Feng Xiao2017-04-05
| | | | * Update version number and changelog for 3.3.0Gravatar Feng Xiao2017-04-05
| | | |/
* | | | Merge pull request #2922 from anandolee/masterGravatar Jie Luo2017-04-05
|\ \ \ \
| | * | | Fix test for unexpected type url when parsing Any. Currently, the test fails ...Gravatar Anuraag Agrawal2017-04-05
* | | | | Merge pull request #2933 from mharrend/patch-1Gravatar Adam Cozzette2017-04-04
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #2930 from anuraaga/dev_ragGravatar Adam Cozzette2017-04-04
|\ \ \ \ \ \