aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Add ObjC build to travis setupGravatar Thomas Van Lenten2015-11-09
* Merge pull request #954 from jskeet/blank-lines-in-commentsGravatar Jan Tattermusch2015-11-08
|\
* \ Merge pull request #949 from thomasvl/newer_simsGravatar Paul Yang2015-11-06
|\ \
| | * Generated code for previous commit.Gravatar Jon Skeet2015-11-06
| | * Stop removing all blank lines in doc comments.Gravatar Jon Skeet2015-11-06
| |/ |/|
* | Merge pull request #941 from jskeet/recursion-limitGravatar Jan Tattermusch2015-11-05
|\ \
* \ \ Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtimeGravatar Feng Xiao2015-11-05
|\ \ \
| | | * Tweaks to the Mac build scriptGravatar Thomas Van Lenten2015-11-05
| |_|/ |/| |
| * | include plugin.proto and generated code in protobuf-javaGravatar Joshua Humphries2015-11-05
|/ /
| * Reimplement JSON recursion by detecting the depth in the tokenizer.Gravatar Jon Skeet2015-11-05
* | Merge pull request #940 from jskeet/json-namesGravatar Jon Skeet2015-11-05
|\ \
* \ \ Merge pull request #942 from jskeet/json-exceptionGravatar Jan Tattermusch2015-11-05
|\ \ \
* \ \ \ Merge pull request #943 from thomasvl/conformanceGravatar Paul Yang2015-11-05
|\ \ \ \
| | * | | Created a new exception for JSON failures.Gravatar Jon Skeet2015-11-05
| |/ / / |/| | |
| * | | Update the Mac build script to include the conformance testsGravatar Thomas Van Lenten2015-11-04
|/ / /
| | * Add recursion limit handling to JSON parsing.Gravatar Jon Skeet2015-11-04
| |/ |/|
| * Move the creation of the "fields by JSON name" dictionary to the descriptor.Gravatar Jon Skeet2015-11-04
|/
* Merge pull request #923 from jskeet/json-parsingGravatar Jon Skeet2015-11-03
|\
* \ Merge pull request #936 from andrewharp/patch-1Gravatar Feng Xiao2015-11-03
|\ \
* \ \ Merge pull request #939 from dougkwan/masterGravatar Feng Xiao2015-11-03
|\ \ \
| * | | Add support for POWER LinuxGravatar Doug Kwan2015-11-03
|/ / /
| * / Build protoc for host platform to enable cross-compilation.Gravatar Andrew Harp2015-11-03
|/ /
| * Implement JSON parsing in C#.Gravatar Jon Skeet2015-11-03
|/
* Merge pull request #930 from pherl/bazel_testGravatar Jisi Liu2015-11-02
|\
* \ Merge pull request #931 from xfxyjwf/fix_compileGravatar Feng Xiao2015-11-02
|\ \
| * | Fix compilation errors when built internally.Gravatar Feng Xiao2015-11-02
|/ /
| * add warning notes for cc|py_proto_library rules.Gravatar Jisi Liu2015-11-02
|/
* Merge pull request #929 from jskeet/unsafe-internalGravatar Jan Tattermusch2015-11-02
|\
| * Make BytesString.Unsafe internal (which it should have been all along)Gravatar Jon Skeet2015-11-02
* | Merge pull request #924 from bbarenblat/masterGravatar Feng Xiao2015-10-31
|\ \ | |/ |/|
| * Correct spellingGravatar Benjamin Barenblat2015-10-30
|/
* Merge pull request #905 from jskeet/wrapper-clearGravatar Jan Tattermusch2015-10-30
|\
| * Fix clearing wrapper type fields with reflection.Gravatar Jon Skeet2015-10-30
|/
* Merge pull request #922 from randomascii/masterGravatar Feng Xiao2015-10-29
|\
| * Get VS 2015 to use const int definitionsGravatar Bruce Dawson2015-10-29
|/
* Merge pull request #861 from haberman/pywarningsGravatar Joshua Haberman2015-10-28
|\
| * Pass $CC environment variable through tox.Gravatar Josh Haberman2015-10-28
| * Special-case Clang-only warning flags to Clang.Gravatar Josh Haberman2015-10-28
| * Disable some more warnings to be warnings-free.Gravatar Josh Haberman2015-10-28
| * Fixed compile errors after rebase.Gravatar Josh Haberman2015-10-28
| * Removed all warnings from the Python/C++ build.Gravatar Josh Haberman2015-10-28
|/
* Merge pull request #915 from pherl/masterGravatar Jisi Liu2015-10-27
|\
| * add default_runtime attribute to cc|py rules.Gravatar Jisi Liu2015-10-27
|/
* Merge pull request #908 from jskeet/oneof-equalityGravatar Jan Tattermusch2015-10-24
|\
| * Generated code for previous commit (oneof case contributing to hash code and ...Gravatar Jon Skeet2015-10-24
| * Include the oneof-case in equality and hash code generated code.Gravatar Jon Skeet2015-10-24
* | Merge pull request #904 from matthew-wu/masterGravatar Jisi Liu2015-10-23
|\ \ | |/ |/|
| * Change the #include for any.h to use angle brackets instead of quotes, to be ...Gravatar Matthew Wu2015-10-22
|/
* Merge pull request #903 from pherl/bazel_testGravatar Jisi Liu2015-10-22
|\
| * Update comments.Gravatar Jisi Liu2015-10-22