aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add support for the conformance test for objc when run on OS XThomas Van Lenten2015-11-187-7/+245
* Merge pull request #984 from thomasvl/prefix_validation_tweaksThomas Van Lenten2015-11-181-50/+51
|\
| * Reorder the checks so anything in the expected file is an implicit whitelisting.Thomas Van Lenten2015-11-171-50/+51
* | Merge pull request #982 from pherl/bazel_testJisi Liu2015-11-171-0/+1
|\ \ | |/ |/|
| * Make the cc wkt proto target public.Jisi Liu2015-11-171-0/+1
* | Merge pull request #978 from thomasvl/conformance_tweaksJoshua Haberman2015-11-173-4/+17
|\ \
| * | Cleanups of deps and ignores for conformanceThomas Van Lenten2015-11-163-4/+17
|/ /
* | Merge pull request #960 from thomasvl/xctool_supportThomas Van Lenten2015-11-091-6/+43
|\ \
| * | Switch ObjC Travis testing to using xctoolThomas Van Lenten2015-11-091-6/+43
|/ /
* | Merge pull request #959 from thomasvl/travis_mac2Thomas Van Lenten2015-11-092-1/+34
|\ \
| * | Add ObjC build to travis setupThomas Van Lenten2015-11-092-1/+34
|/ /
* | Merge pull request #954 from jskeet/blank-lines-in-commentsJan Tattermusch2015-11-0811-2/+133
|\ \
| * | Generated code for previous commit.Jon Skeet2015-11-0610-0/+115
| * | Stop removing all blank lines in doc comments.Jon Skeet2015-11-061-2/+18
* | | Merge pull request #949 from thomasvl/newer_simsPaul Yang2015-11-061-17/+51
|\ \ \ | |/ / |/| |
| * | Tweaks to the Mac build scriptThomas Van Lenten2015-11-051-17/+51
* | | Merge pull request #941 from jskeet/recursion-limitJan Tattermusch2015-11-056-15/+135
|\ \ \
| * | | Reimplement JSON recursion by detecting the depth in the tokenizer.Jon Skeet2015-11-054-34/+124
| * | | Add recursion limit handling to JSON parsing.Jon Skeet2015-11-043-44/+74
* | | | Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtimeFeng Xiao2015-11-051-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | include plugin.proto and generated code in protobuf-javaJoshua Humphries2015-11-051-0/+2
|/ / /
* | | Merge pull request #940 from jskeet/json-namesJon Skeet2015-11-052-6/+16
|\ \ \
| * | | Move the creation of the "fields by JSON name" dictionary to the descriptor.Jon Skeet2015-11-042-6/+16
| |/ /
* | | Merge pull request #942 from jskeet/json-exceptionJan Tattermusch2015-11-058-40/+111
|\ \ \
| * | | Created a new exception for JSON failures.Jon Skeet2015-11-058-40/+111
| |/ /
* | | Merge pull request #943 from thomasvl/conformancePaul Yang2015-11-052-1/+6
|\ \ \ | |/ / |/| |
| * | Update the Mac build script to include the conformance testsThomas Van Lenten2015-11-042-1/+6
|/ /
* | Merge pull request #923 from jskeet/json-parsingJon Skeet2015-11-0317-22/+2915
|\ \
| * | Implement JSON parsing in C#.Jon Skeet2015-11-0317-22/+2915
* | | Merge pull request #936 from andrewharp/patch-1Feng Xiao2015-11-031-0/+1
|\ \ \
| * | | Build protoc for host platform to enable cross-compilation.Andrew Harp2015-11-031-0/+1
| |/ /
* | | Merge pull request #939 from dougkwan/masterFeng Xiao2015-11-036-5/+7
|\ \ \ | |/ / |/| |
| * | Add support for POWER LinuxDoug Kwan2015-11-036-5/+7
|/ /
* | Merge pull request #930 from pherl/bazel_testJisi Liu2015-11-021-0/+8
|\|
| * add warning notes for cc|py_proto_library rules.Jisi Liu2015-11-021-0/+8
* | Merge pull request #931 from xfxyjwf/fix_compileFeng Xiao2015-11-023-3/+4
|\ \ | |/ |/|
| * Fix compilation errors when built internally.Feng Xiao2015-11-023-3/+4
|/
* Merge pull request #929 from jskeet/unsafe-internalJan Tattermusch2015-11-021-3/+3
|\
| * Make BytesString.Unsafe internal (which it should have been all along)Jon Skeet2015-11-021-3/+3
* | Merge pull request #924 from bbarenblat/masterFeng Xiao2015-10-317-7/+7
|\ \ | |/ |/|
| * Correct spellingBenjamin Barenblat2015-10-307-7/+7
|/
* Merge pull request #905 from jskeet/wrapper-clearJan Tattermusch2015-10-303-2/+12
|\
| * Fix clearing wrapper type fields with reflection.Jon Skeet2015-10-303-2/+12
|/
* Merge pull request #922 from randomascii/masterFeng Xiao2015-10-297-70/+72
|\
| * Get VS 2015 to use const int definitionsBruce Dawson2015-10-297-70/+72
|/
* Merge pull request #861 from haberman/pywarningsJoshua Haberman2015-10-2813-139/+138
|\
| * Pass $CC environment variable through tox.Josh Haberman2015-10-281-0/+1
| * Special-case Clang-only warning flags to Clang.Josh Haberman2015-10-282-4/+4
| * Disable some more warnings to be warnings-free.Josh Haberman2015-10-281-1/+2
| * Fixed compile errors after rebase.Josh Haberman2015-10-281-3/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 05:55:30 +0000