aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adding experimental runtimejava_experimentalnmittler2016-10-0141-3/+12403
* 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
* | Fix java compatibilty tests.Feng Xiao2016-09-221-350/+1
| * update files to include php generatorsJisi Liu2016-09-223-1/+7
| * Update minimum support php version to 5.5Charlene2016-09-211-1/+1
|/
* Fix bugs for internal integration.Bo Yang2016-09-221-3/+3
* Fix hash computation for JRuby's RubyMessageBrendan Ribera2016-09-221-2/+17
* Fix travis, jenkins environment issues.Bo Yang2016-09-213-3/+3
* Added new has_bits.h file to cmake/extract_includes.bat.in (#2152)Adam Cozzette2016-09-211-0/+1
* Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) (...Adam Cozzette2016-09-211-7/+3
* Fix bugs for csharp and ruby for internal integration.Bo Yang2016-09-212-217/+215
* Fix python bugs for internal integration.Bo Yang2016-09-213-5/+13
* Bump library veriosn to 3.1Bo Yang2016-09-2125-166/+127
* Fix bugs for internal integration.Bo Yang2016-09-209-1586/+11
* Fix gson dependency.Bo Yang2016-09-202-2/+2
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-09-2015-15/+15
* Fix for maps_test.js in JavaScript. (#2145)Joshua Haberman2016-09-202-63/+31
* Fix bugs for internal integration.Bo Yang2016-09-194-41/+49
* Use a custom dictionary to avoid NSNumber operations.Thomas Van Lenten2016-09-191-16/+31
* Remove the custom key functions and just use the system provided defaults.Thomas Van Lenten2016-09-191-40/+3
* Integrate internal changesBo Yang2016-09-19280-8143/+19655
* Merge pull request #2037 from abscondment/fix-2036-ruby-hashJoshua Haberman2016-09-182-8/+9
|\
| * fix #2036: use `rb_hash_*` to accumulate hashesBrendan Ribera2016-08-301-7/+5
| * failing test for #2036:Brendan Ribera2016-08-301-1/+4