aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 3.1.x into master.Bo Yang2016-10-137-32/+84
|\
| * Fix the bug that message without namespace is not found in the descriptor poo...Paul Yang2016-10-116-23/+83
| * Merge pull request #2203 from mrry/msvc_fixFeng Xiao2016-10-111-9/+1
| |\
| | * Fix MSVC build when HAVE_LONG_LONG is defined.Derek Murray2016-09-291-9/+1
| * | Fix python_cpp test on Mac. Link staticly when building extension, so that th...Paul Yang2016-10-072-2/+3
| * | Add csharp/build_tools.sh for dist check.Bo Yang2016-10-061-0/+1
| * | Fix compile error for php on Mac.Bo Yang2016-10-0511-39/+55
| * | Fix segmentation fault when ZTS is defined.Bo Yang2016-10-055-34/+39
| * | PHP: fix ZTS tsrm_ls errors (#2189)Stanley Cheung2016-10-046-59/+69
| * | Merge pull request #2193 from acozzette/common-js-fixAdam Cozzette2016-10-044-14/+44
| |\ \
| | * | Fixed references to foreign nested messages with CommonJS-style importsAdam Cozzette2016-09-274-14/+44
| * | | Add test for php zts build.Bo Yang2016-10-041-4/+16
| * | | Prepare jenkins for testing php zts build.Bo Yang2016-10-041-0/+6
| * | | Merge pull request #2204 from acozzette/enum-namesAdam Cozzette2016-10-042-9/+27
| |\ \ \
| | * | | Do strict enum name checking only for proto3Adam Cozzette2016-10-042-9/+27
| |/ / /
| * | | Add travis test on Mac for php.Bo Yang2016-10-032-9/+20
| * | | Test php5.5_c test on jenkinsBo Yang2016-10-033-30/+36
| * | | Trigger automated tests for php.Bo Yang2016-09-301-0/+6
| * | | Set up environment for php automated tests.Bo Yang2016-09-301-6/+46
| * | | Add php test script for automated tests.Bo Yang2016-09-301-8/+63
| | |/ | |/|
| * | Add script to build Google.Protobuf.Tools for csharp.Bo Yang2016-09-281-0/+52
| * | Merge pull request #2196 from haberman/nodefixJoshua Haberman2016-09-281-0/+12
| |\ \ | | |/ | |/|
| | * Added alias getFieldProto3 as used by older generated code.Josh Haberman2016-09-281-0/+12
| |/
| * Fixing inconsistent php version number.Bo Yang2016-09-262-2/+2
| * Merge pull request #2181 from google/jtattermusch-patch-2Feng Xiao2016-09-261-3/+0
| |\
| | * Update README.mdJan Tattermusch2016-09-261-3/+0
| |/
| * Fix MSVC stack overflow issue.Feng Xiao2016-09-231-0/+5
| * Add php files for make dist.v3.1.0-alpha-1v3.1.0Bo Yang2016-09-234-4/+55
| * Update change log for 3.1.0 (#2173)Paul Yang2016-09-231-0/+80
| * Merge pull request #2175 from xfxyjwf/fix_jsonFeng Xiao2016-09-233-7/+25
| |\
| | * Force a rebuild of Jenkins docker image.Feng Xiao2016-09-231-1/+1
| | * Fix VS test failures.Feng Xiao2016-09-232-6/+24
| * | php: support 5.5.9 for pecl extension (#2174)Stanley Cheung2016-09-231-1/+1
| |/
| * Merge pull request #2171 from xfxyjwf/fix_jsonFeng Xiao2016-09-232-6/+6
| |\
| | * Use "appveyor DownloadFile"Feng Xiao2016-09-231-3/+3
| | * Reduce test length to avoid stack overflow on VS.Feng Xiao2016-09-231-3/+3
| * | Update php supported version.Bo Yang2016-09-231-3/+3
| |/
| * Fix python cpp.Bo Yang2016-09-235-15/+13
| * Merge pull request #2167 from xfxyjwf/fix_vsFeng Xiao2016-09-2328-462/+748
| |\
| | * Fix Visual Studio compile issues.Feng Xiao2016-09-2328-462/+748
| |/
| * Merge pull request #2170 from pherl/3.1.xJisi Liu2016-09-2314-13/+112
| |\
| | * Fix default instance destructorJisi Liu2016-09-2314-13/+112
| | * Merge branch '3.1.x' of github.com:google/protobuf into 3.1.xJisi Liu2016-09-2323-588/+371
| | |\ | | |/ | |/|
| * | Update version number.Bo Yang2016-09-221-1/+1
| * | Bump library version to 11Bo Yang2016-09-221-2/+2
| * | Add back removed descriptor field.Bo Yang2016-09-224-195/+321
| * | Modify php api version and minimum supported php version.Bo Yang2016-09-221-6/+7
| * | PHP: support 7.0 on PHP implementation (#2162)Stanley Cheung2016-09-222-22/+27
| * | update files to include php generators (#2165)Jisi Liu2016-09-223-1/+7
| * | Update version number.Feng Xiao2016-09-2213-13/+13