aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-1014-14/+14
* Fix for maps_test.js in JavaScript. (#2145)Joshua Haberman2016-10-102-63/+31
* Fix bugs for internal integration.Bo Yang2016-10-104-41/+49
* Integrate internal changesBo Yang2016-10-10280-8143/+19647
* Merge pull request #2236 from hochhaus/masterFeng Xiao2016-10-093-10/+18
|\
| * Silence compile warnings in bazelAndy Hochhaus2016-10-093-10/+18
|/
* Merge pull request #2229 from xfxyjwf/fixbuildFeng Xiao2016-10-062-4/+0
|\
| * Remove inexist files from build.Feng Xiao2016-10-062-4/+0
|/
* update files to include php generators (#2165)Jisi Liu2016-10-063-1/+7
* Merge pull request #2199 from JasonLunn/patch-1Joshua Haberman2016-10-043-35/+5
|\
| * Add development dependency requirementsJason Lunn2016-09-291-4/+4
| * Remove hanging reference to Gemfile.lockJason Lunn2016-09-291-1/+0
| * Delete Gemfile.lockJason Lunn2016-09-291-30/+0
| * Set platform to "java" under JRubyJason Lunn2016-09-291-0/+1
* | Merge pull request #2218 from thomasvl/xcode8_updatesThomas Van Lenten2016-10-039-175/+205
|\ \
| * | Update the ObjC projects for Xcode 8Thomas Van Lenten2016-10-039-175/+205
|/ /
* | Merge pull request #2206 from acozzette/gitignoreAdam Cozzette2016-09-301-1/+10
|\ \ | |/ |/|
| * Updated .gitignore with Java and JavaScript build artifactsAdam Cozzette2016-09-291-1/+10
|/
* Merge pull request #2197 from thomasvl/swift_docsThomas Van Lenten2016-09-281-674/+0
|\
| * Drop the swift docs directory (and content).Thomas Van Lenten2016-09-281-674/+0
|/
* Merge pull request #2192 from google/3.0.xJisi Liu2016-09-2713-13/+13
|\
| * Merge pull request #2157 from google/csharp_remove_beta_notice3.0.xJan Tattermusch2016-09-221-3/+0
| |\
| | * Update README.mdJan Tattermusch2016-09-221-3/+0
| |/
| * Merge pull request #2111 from pherl/3.0.xJisi Liu2016-09-1513-13/+13
| |\
| | * Update generated files.Jisi Liu2016-09-1412-12/+12
| | * Fix the version number for 3.0.2Jisi Liu2016-09-131-1/+1
| |/
* | Added C++ benchmark. (#1525)Joshua Haberman2016-09-239-1/+265
* | Merge pull request #2153 from haberman/generatechangelogFeng Xiao2016-09-231-0/+65
|\ \
| * | Added convenient script for generating changelog draft.Josh Haberman2016-09-211-0/+65
* | | Merge pull request #2159 from google/jtattermusch-patch-1Jan Tattermusch2016-09-221-3/+0
|\ \ \
| * | | Update README.mdJan Tattermusch2016-09-221-3/+0
|/ / /
* | | 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
|\ \ \