aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Fix gson dependency.Bo Yang2016-09-212-2/+2
* | | Merge pull request #2035 from sergiocampama/cppFeng Xiao2016-09-215-4/+7
|\ \ \ | |/ / |/| |
| * | Fixes static analyzer issues from xcode.Sergio Campama2016-09-205-4/+7
* | | Merge pull request #2149 from khingblue/remove-obsoleted-projectFeng Xiao2016-09-211-1/+0
|\ \ \ | |/ / |/| |
| * | Remove obsoleted project of j2meKhing2016-09-211-1/+0
|/ /
* | Merge pull request #2144 from abscondment/fix-jruby-hashJoshua Haberman2016-09-201-2/+17
|\ \
| * | Fix hash computation for JRuby's RubyMessageBrendan Ribera2016-09-201-2/+17
|/ /
* | Merge pull request #2137 from thomasvl/objc_extensions_tweakThomas Van Lenten2016-09-192-56/+34
|\ \
| * | 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
|/ /
* | 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
| | | * | objc change logJisi Liu2016-09-021-0/+16
| | * | | Merge pull request #1862 from pherl/3.0.0-GAJisi Liu2016-09-025-16/+18
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Bring C#'s ToPascalCase method in line with C++.Jon Skeet2016-07-272-2/+16
| | | * | Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
| | * | | Merge pull request #1978 from pherl/cpJisi Liu2016-09-021-1/+1
| | |\ \ \
| | | * | | Add a jenkins test status badge.Feng Xiao2016-08-181-1/+1
| | * | | | Merge pull request #2026 from pherl/cpjsJisi Liu2016-09-026-14/+66
| | |\ \ \ \
| | | * | | | Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-311-5/+5
| | | * | | | Merge pull request #2012 from haberman/rubymapgcfixJoshua Haberman2016-08-304-9/+59
| | | * | | | Fix missing import of jspb.Map (#1885)Guillaume Egles2016-08-291-0/+2
| | |/ / / /
| | * | | | Merge pull request #2014 from pherl/fixgmockJisi Liu2016-08-262-7/+18
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Update gmock links.Feng Xiao2016-08-261-4/+9
| | | * | | Update links in appveyor.ymlFeng Xiao2016-08-261-3/+9
| | |/ / /
| | * | | Merge pull request #1977 from thomasvl/bump_cocoapod_specThomas Van Lenten2016-08-181-1/+2
| | |\ \ \
| | | * | | Bump the version in prep for the 3.0.2 tag being cutThomas Van Lenten2016-08-171-1/+2
| | |/ / /
| | * | | Merge pull request #1975 from pherl/cpThomas Van Lenten2016-08-1739-1687/+10969
| | |\ \ \
| | | * | | Record zero for "has" for proto3 if in a oneof.Thomas Van Lenten2016-08-173-29/+296