aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix memory leak when creating map field via array.Bo Yang2017-12-042-2/+6
* Fix memory leak when creating repeated field via array.Bo Yang2017-12-012-2/+6
* Remove duplicate typedef. (#3975)Paul Yang2017-11-301-19/+7
* Provide discardUnknonwnFields API in php (#3976)Paul Yang2017-11-305-0/+27
* Update version for 3.5.0.post1Jisi Liu2017-11-221-1/+1
* Merge pull request #3941 from google/anandolee-patch-2Jisi Liu2017-11-221-1/+10
|\
| * Add _file_desc_by_toplevel_extension backJie Luo2017-11-221-1/+10
|/
* Update version number for php c extension (#3896)Paul Yang2017-11-152-4/+20
* Merge pull request #3895 from pherl/3.5.xJisi Liu2017-11-151-1/+1
|\
| * Add protobuf-all in post releaseJisi Liu2017-11-151-1/+1
* | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886)Paul Yang2017-11-151-4/+3
|/
* Update protoc-artfactsJisi Liu2017-11-131-5/+6
* Merge branch '3.5.x' of github.com:google/protobuf into 3.5.xJisi Liu2017-11-135-9/+67
|\
| * Merge pull request #3868 from pherl/3.5.xv3.5.0Jisi Liu2017-11-1313-29/+22
| |\
| * | All integer types should accept null in json. (#3869)Paul Yang2017-11-132-5/+22
| * | Merge pull request #3867 from jtattermusch/update_changelogJisi Liu2017-11-101-0/+1
| |\ \
| | * | update changelogJan Tattermusch2017-11-101-0/+1
| |/ /
| * | Merge pull request #3861 from jtattermusch/backport_3858Jisi Liu2017-11-102-4/+44
| |\ \
| | * | ParseFrom<T> for array slice is missingJan Tattermusch2017-11-101-0/+14
| | * | check already performed by MergeFromJan Tattermusch2017-11-101-5/+0
| | * | allow message parsing from an array sliceJan Tattermusch2017-11-102-0/+31
| |/ /
* | / Update release dateJisi Liu2017-11-131-3/+3
| |/ |/|
* | Support win32 long path for cross compiled buildJisi Liu2017-11-1013-29/+22
|/
* Fix arm64 nameJisi Liu2017-11-091-2/+2
* Supports Arm64 (aarch64) protoc artifactsJisi Liu2017-11-092-1/+16
* Merge pull request #3854 from pherl/3.5.xJisi Liu2017-11-084-131/+2
|\
| * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-084-131/+2
* | Provide util funtions to figure out correct php class names. (#3850)Paul Yang2017-11-082-9/+36
|/
* Merge pull request #3835 from pherl/3.5.xJisi Liu2017-11-0826-43/+118
|\
| * Fix java code exampleJisi Liu2017-11-081-2/+2
| * Changelog for 3.5.0Jisi Liu2017-11-081-0/+75
| * Update generated descritpors.Jisi Liu2017-11-0212-24/+24
| * Update version number to 3.5.0Jisi Liu2017-11-0213-19/+19
* | Fix php well known type conformance tests (#3828) (#3840)Paul Yang2017-11-0412-164/+520
|/
* 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