aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * \ Merge pull request #3758 from spinorx/3.4.xJisi Liu2017-10-201-43/+2
| | |\ \
| | | * | Fix iOS cc_library build for protobuf.Param Reddy2017-10-151-43/+2
| | * | | Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-184-2/+45
| | |\ \ \
| | | * | | Add TODOJisi Liu2017-08-311-0/+3
| | | * | | Fix dist checkJisi Liu2017-08-311-0/+1
| | | * | | Add @Deprecated annotation support for proto file.Jisi Liu2017-08-313-2/+41
| | * | | | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Jisi Liu2017-10-181-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Clang warning cleanup for unused parameter.drivehappy2017-09-141-1/+1
* | | | | | Merge pull request #3791 from signalwerk/patch-1Adam Cozzette2017-10-261-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | To be clear that we set a new variableStefan Huber2017-10-241-1/+1
* | | | | | Merge pull request #3787 from sergiocampama/coverageThomas Van Lenten2017-10-245-85/+182
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improves coverage of GPBCodedInputStreamSergio Campama2017-10-245-85/+182
|/ / / / /
* | | | | Merge pull request #3757 from spinorx/masterJisi Liu2017-10-201-43/+2
|\ \ \ \ \
| * | | | | Fix iOS cc_library build for protobuf.Param Reddy2017-10-151-43/+2
* | | | | | Merge pull request #3743 from Schtolc/masterJisi Liu2017-10-191-3/+3
|\ \ \ \ \ \
| * | | | | | CodedInputStream::SetTotalBytesLimit description fixPavel2017-10-121-3/+3
* | | | | | | Merge pull request #3754 from toanju/gcc-fallthroughJisi Liu2017-10-191-0/+2
|\ \ \ \ \ \ \
| * | | | | | | fix implicit fallthrough in gcc 7Tobias Jungel2017-10-151-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3770 from pherl/3.5-integrateJisi Liu2017-10-19114-3115/+3684
|\ \ \ \ \ \ \
| * | | | | | | Fix Java 1.6 compileJisi Liu2017-10-181-2/+2
| * | | | | | | Fix JS conformance testsJisi Liu2017-10-181-6/+0
| * | | | | | | Fix bazel buildJisi Liu2017-10-182-4/+3
| * | | | | | | Update descriptor protosJisi Liu2017-10-184-4/+20
| * | | | | | | Merge branch 'master' of github.com:google/protobufJisi Liu2017-10-181-13/+21
| |\ \ \ \ \ \ \
| * | | | | | | | Merge from google internalJisi Liu2017-10-18107-3101/+3661
* | | | | | | | | Merge pull request #3751 from uykusuz/masterJisi Liu2017-10-181-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixes issue #3750Boris Broenner2017-10-141-0/+4
| | |_|/ / / / / / | |/| | | | | | |