aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix up warnings from Xcode 9.1 (#3887)dmaclach2017-11-1625-52/+78
* Update README.md: C extension works on PHP 7 (#3888)Issac Trotts2017-11-151-1/+1
* Merge pull request #3892 from sergiocampama/32bitThomas Van Lenten2017-11-151-1/+1
|\
| * Fixes 32bit tests.Sergio Campama2017-11-151-1/+1
* | Merge pull request #3878 from Yangqing/masterFeng Xiao2017-11-152-12/+27
|\ \
| * | Allow one to omit building libprotoc and protoc binariesYangqing Jia2017-11-132-12/+27
* | | Merge pull request #3891 from thomasvl/travis_cleanupsThomas Van Lenten2017-11-151-39/+8
|\ \ \ | |_|/ |/| |
| * | Remove the allowed_failure for python_cpp as the bug was fixed.Thomas Van Lenten2017-11-151-4/+0
| * | Remove the ruby tests from travis configs.Thomas Van Lenten2017-11-151-8/+0
| * | Update some comments about testing.Thomas Van Lenten2017-11-151-7/+4
| * | Instead of listing and then excluding osx builds, just don't list them.Thomas Van Lenten2017-11-151-20/+4
* | | Merge pull request #3883 from dmaclach/map_optimizationsThomas Van Lenten2017-11-1511-4987/+410
|\ \ \
| * | | codereview cleanupDave MacLachlan2017-11-151-2/+2
| * | | Reduce size of GPBDictionary by getting rid of class creation methodsDave MacLachlan2017-11-1411-4987/+410
| |/ /
* | | Merge pull request #3884 from dmaclach/unsafeThomas Van Lenten2017-11-151-4/+9
|\ \ \
| * | | code review cleanupDave MacLachlan2017-11-151-5/+5
| * | | Simplify getter/setter method implementationsDave MacLachlan2017-11-141-3/+8
| |/ /
* | | Merge pull request #3882 from dmaclach/removeclass2Thomas Van Lenten2017-11-153-11/+13
|\ \ \ | |/ / |/| |
| * | Remove unreferenced 'GPBMessageSignatureProtocol' class.Dave MacLachlan2017-11-143-11/+13
|/ /
* / Remove non-C# options from C#-only test protosJon Skeet2017-11-1410-41/+13
|/
* Merge pull request #3834 from sviterok/patch-1Jisi Liu2017-11-131-1/+1
|\
| * Fix a typo in WKT's test suiteRoman Nekhoroshev2017-11-021-1/+1
* | Update README.mdJisi Liu2017-11-131-4/+7
* | Merge pull request #3875 from hchasestevens/add-hypothesis-protobuf-docFeng Xiao2017-11-131-0/+1
|\ \
| * | Add hypothesis-protobuf library to the 3rd party doc.H. Chase Stevens2017-11-131-0/+1
|/ /
* | MMinor fix-ups to C# tests from changes in earlier commitsJon Skeet2017-11-124-20/+30
* | Regenerated test code for C#Jon Skeet2017-11-126-295/+330
* | Move C#-only test protos to csharp/protosJon Skeet2017-11-128-28/+413
* | Run C# codegen when testing itJon Skeet2017-11-121-3/+5
* | Merge pull request #3858 from jtattermusch/parsing_from_sliceJan Tattermusch2017-11-102-4/+44
|\ \
| * | ParseFrom<T> for array slice is missingJan Tattermusch2017-11-091-0/+14
| * | check already performed by MergeFromJan Tattermusch2017-11-091-5/+0
| * | allow message parsing from an array sliceJan Tattermusch2017-11-092-0/+31
|/ /
* | Merge pull request #3822 from mehrdada/update-benchmark-submoduleJisi Liu2017-11-061-0/+0
|\ \
| * | Update google/benchmark submodule to v1.2Mehrdad Afshari2017-10-301-0/+0
* | | Fix php well known type conformance tests (#3828)Paul Yang2017-11-0312-164/+520
* | | Merge pull request #3839 from thomasvl/message_equalityThomas Van Lenten2017-11-031-3/+4
|\ \ \ | |_|/ |/| |
| * | When comparing message, require them to have the same descriptor.Thomas Van Lenten2017-11-031-3/+4
|/ /
* / Fix merging with message-valued oneofJon Skeet2017-10-3113-12/+417
|/
* Merge pull request #3817 from xuwei-k/joda-urlFeng Xiao2017-10-304-4/+4
|\
| * update joda-time javadoc urlxuwei-k2017-10-304-4/+4
|/
* Add parser settings WithXyz methodsJon Skeet2017-10-281-0/+17
* Add JsonParser setting to ignore unknown field valuesJon Skeet2017-10-284-7/+95
* Merge pull request #3722 from timou/cmake-windows-cleanJisi Liu2017-10-271-1/+20
|\
| * Sort MSVC warning suppressionsTim Ebringer2017-10-211-1/+17
| * Suppress VS2017 compiler/linker warningsTim Ebringer2017-10-061-1/+4
* | Reserve unknown in Ruby (#3763)Paul Yang2017-10-2612-832/+2034
* | Add missing filesJisi Liu2017-10-261-0/+38
* | Merge pull request #3804 from pherl/mergeJisi Liu2017-10-263-2/+7
|\ \
| * \ Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-253-2/+7
| |\ \