aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #980 from thomasvl/obj_conformanceThomas Van Lenten2015-11-237-7/+245
|\
| * Add support for the conformance test for objc when run on OS XThomas Van Lenten2015-11-187-7/+245
* | Merge pull request #990 from jskeet/namingJon Skeet2015-11-2229-245/+208
|\ \
| * | Generated code changes for previous commit (basically InternalBuildGeneratedF...Jon Skeet2015-11-2221-22/+22
| * | Tidy up reflection in advance of attempting to implement DynamicMessage.Jon Skeet2015-11-2210-225/+188
|/ /
* | Merge pull request #994 from jskeet/type-registryJon Skeet2015-11-224-0/+279
|\ \
| * | Added the type registry in advance of implementing Any support.Jon Skeet2015-11-214-0/+279
|/ /
* | Merge pull request #988 from gabikliot/CSharp-SampleUsage-Big-FixJan Tattermusch2015-11-191-2/+5
|\ \
| * | Removed redundant comment.Gabriel Kliot2015-11-191-1/+0
| * | Fixed a bug in CSharp SampleUsage.Gabriel Kliot2015-11-181-1/+5
| |/
* | Merge pull request #989 from jskeet/rename-umbrellaJan Tattermusch2015-11-1910-42/+37
|\ \
| * | Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-1910-42/+37
* | | Merge pull request #977 from lberki/masterJisi Liu2015-11-191-0/+2
|\ \ \ | |/ / |/| |
| * | add headersLukacs T. Berki2015-11-161-0/+2
* | | Merge pull request #974 from jskeet/parserJon Skeet2015-11-1925-122/+244
|\ \ \
| * | | Finished an implementation commentJon Skeet2015-11-191-1/+3
| * | | Generated code from previous commit.Jon Skeet2015-11-1920-105/+107
| * | | Introduce a Parser property into MessageDescriptor, and populate it from gene...Jon Skeet2015-11-195-17/+135
|/ / /
* | | Merge pull request #944 from jskeet/umbrella-classnameJon Skeet2015-11-1931-524/+454
|\ \ \ | |_|/ |/| |
| * | Generated code changes and manual changes for previous commit.Jon Skeet2015-11-0928-468/+442
| * | Change how the reflection descriptor class is generated.Jon Skeet2015-11-093-56/+12
* | | 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
|\ \ \