aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add nested enum descriptor in php rumtime. (#3009)v3.3.0rc1Paul Yang2017-04-243-1/+11
* Update php version number to 3.3.0 (#3001)Paul Yang2017-04-242-6/+22
* Throw exception when parsing invalid data. (#3000)Paul Yang2017-04-216-49/+297
* Merge pull request #2996 from xfxyjwf/3.3.xFeng Xiao2017-04-201-1/+1
|\
| * Fix python3 issue.Feng Xiao2017-04-201-1/+1
* | Allow proto files to import descriptor.proto (#2995)Paul Yang2017-04-208-5/+51
|/
* Prepend "PB" to generated classes whose name are reserved words. (#2990)Paul Yang2017-04-208-61/+163
* Add test for nested enum for php (#2989)Paul Yang2017-04-194-0/+22
* Enum defined without package have incorrect class name. (#2988)Paul Yang2017-04-195-53/+54
* Make PHP c extension work with PHP7 (#2951)Paul Yang2017-04-1923-1187/+1891
* Merge pull request #2967 from xfxyjwf/3.3.xFeng Xiao2017-04-118-4/+528
|\
| * Cherry-pick cl/152450543Feng Xiao2017-04-118-2/+472
| * Cherry-pick cl/151775298Feng Xiao2017-04-112-2/+56
|/
* Merge pull request #2955 from xfxyjwf/3.3.xFeng Xiao2017-04-111-0/+1
|\
| * Add include for INT_MAXFeng Xiao2017-04-081-0/+1
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-104-8/+45
|/
* Merge pull request #2949 from xfxyjwf/3.3.xFeng Xiao2017-04-072-0/+10
|\
| * Cleanup reflection objects for map entry.Feng Xiao2017-04-062-0/+10
* | Merge pull request #2942 from xfxyjwf/3.3.xFeng Xiao2017-04-0624-42/+150
|\|
| * Update generated code.Feng Xiao2017-04-0513-26/+26
| * Update version number and changelog for 3.3.0Feng Xiao2017-04-0511-16/+124
|/
* Update Java conformance failure list.Feng Xiao2017-03-311-1/+0
* Use "git reset --hard" to actually reset the code.Feng Xiao2017-03-312-3/+3
* Update jenkins Java dependencies.Feng Xiao2017-03-311-1/+1
* Update Java version number and dependency.Feng Xiao2017-03-303-4/+10
* Update objective-c conformance failure list.Feng Xiao2017-03-301-2/+4
* Fix C++ distcheck.Feng Xiao2017-03-301-0/+2
* Fix MSVC DLL build.Feng Xiao2017-03-306-8/+10
* Update python conformance failure list.Feng Xiao2017-03-301-3/+0
* Update jenkins Java maven dependencies.Feng Xiao2017-03-301-1/+1
* Update C# conformance failure list.Feng Xiao2017-03-291-0/+4
* Update python conformance failure list.Feng Xiao2017-03-292-1181/+0
* Fix Java build.Feng Xiao2017-03-294-4/+11
* Update BUILD file for C# tests.Feng Xiao2017-03-291-0/+4
* Fix C++ build for down-integration.Feng Xiao2017-03-298-49/+134
* Down-integrate from google3.Feng Xiao2017-03-29251-5181/+13289
* Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
* Merge pull request #2919 from thomasvl/drop_dispatchThomas Van Lenten2017-03-292-17/+20
|\
| * Remove the use of dispatch_once that is heap backed.Thomas Van Lenten2017-03-292-17/+20
|/
* Merge pull request #2918 from thomasvl/xcode_8_3Thomas Van Lenten2017-03-291-0/+8
|\
| * Add support for Xcode 8.3 to the build helper.Thomas Van Lenten2017-03-291-0/+8
|/
* Merge pull request #2913 from thomasvl/conformance_ignoresThomas Van Lenten2017-03-291-0/+2
|\
| * Add some new ignores for things generated in conformance.Thomas Van Lenten2017-03-281-0/+2
* | Fix gcc warning when using map (#2213)drivehappy2017-03-281-1/+3
* | Merge pull request #2914 from acozzette/naclAdam Cozzette2017-03-281-1/+8
|\ \ | |/ |/|
| * Added a workaround to allow building for NaClAdam Cozzette2017-03-281-1/+8
|/
* Merge pull request #2912 from thomasvl/objc_recursion_limitThomas Van Lenten2017-03-282-10/+23
|\
| * Raise the recursion limit to 100 to match other languages.Thomas Van Lenten2017-03-282-10/+23
|/
* Merge pull request #2858 from haberman/gopackageJoshua Haberman2017-03-272-4/+5
|\
| * Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4