aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #2130 from kilink/substring-comment-fixFeng Xiao2016-09-161-3/+3
|\ \
| * | Fix erroneous comment regarding String.substringPatrick Strawderman2016-09-161-3/+3
|/ /
* | Some php engine implementation doesn't have return_value_ptr properly set. Ex...Bo Yang2016-09-151-1/+1
* | Auto-generate proto files for tests.Bo Yang2016-09-154-1424/+14
* | Add back missing test proto files.Bo Yang2016-09-151-0/+7
* | Merge pull request #2112 from pherl/mergeJisi Liu2016-09-1541-20/+185
|\ \
| * \ Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-1441-20/+185
| |\ \
| | * \ Merge pull request #2096 from pherl/3.0.xJisi Liu2016-09-081-25/+33
| | |\ \
| | | * | More complete nil/reset tests within a oneofThomas Van Lenten2016-09-081-6/+12
| | | * | Fix some constants to be correct for the message class in use.Thomas Van Lenten2016-09-081-21/+23
| | |/ /
| | * | Merge pull request #2087 from khingblue/fix-unused-paramJisi Liu2016-09-0813-0/+55
| | |\ \
| | | * | Fix #2032 unused parameter 'deterministic'Khing2016-09-0813-0/+55
| | |/ /
| | * | Merge pull request #2083 from pherl/3.0.xJisi Liu2016-09-071-1/+1
| | |\ \
| | | * | Merge pull request #1884 from hochhaus/valueWriterFnJoshua Haberman2016-09-071-1/+1
| | |/ /
| | * | Merge pull request #2077 from pherl/3.0.xv3.0.2Jisi Liu2016-09-061-1/+1
| | |\ \
| | | * | Update release date in the change logJisi Liu2016-09-061-1/+1
| | |/ /
| | * | Merge pull request #2062 from pherl/3.0.2Jisi Liu2016-09-0611-11/+11
| | |\ \
| | | * | Bump version number to 3.0.2Jisi Liu2016-09-0211-11/+11
| | * | | Merge pull request #2061 from pherl/changelogJisi Liu2016-09-061-0/+20
| | |\ \ \ | | | |/ / | | |/| |
| | | * | ruby, js and c# changesJisi Liu2016-09-021-2/+6