Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix java compatibilty tests. | Feng Xiao | 2016-10-10 | 1 | -350/+1 |
| | | | | Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61 | ||||
* | update files to include php generators | Jisi Liu | 2016-10-10 | 2 | -0/+4 |
| | |||||
* | Update minimum support php version to 5.5 | Charlene | 2016-10-10 | 1 | -1/+1 |
| | |||||
* | Fix bugs for internal integration. | Bo Yang | 2016-10-10 | 1 | -3/+3 |
| | |||||
* | Fix travis, jenkins environment issues. | Bo Yang | 2016-10-10 | 3 | -3/+3 |
| | |||||
* | Added new has_bits.h file to cmake/extract_includes.bat.in (#2152) | Adam Cozzette | 2016-10-10 | 1 | -0/+1 |
| | | | | This is necessary so that the CMake build knows to include this header file in the installation include/ directory. | ||||
* | Fixed quadratic behavior in JSPB deserialization of repeated fields (#2117) ↵ | Adam Cozzette | 2016-10-10 | 1 | -7/+3 |
| | | | | | | | | | (#2146) Currently deserialization of a non-packed binary repeated field is quadratic in the number of elements, because each time we parse a new element we copy over all elements we have parsed so far. This CL fixes the performance problem by having the generated deserialization code just call addX() instead of using getX() and setX(). | ||||
* | Fix bugs for csharp and ruby for internal integration. | Bo Yang | 2016-10-10 | 2 | -217/+215 |
| | |||||
* | Fix python bugs for internal integration. | Bo Yang | 2016-10-10 | 3 | -5/+13 |
| | |||||
* | Bump library veriosn to 3.1 | Bo Yang | 2016-10-10 | 25 | -166/+127 |
| | |||||
* | Fix bugs for internal integration. | Bo Yang | 2016-10-10 | 9 | -1585/+8 |
| | |||||
* | Bump version number to 3.1.0-alpha-1. | Bo Yang | 2016-10-10 | 14 | -14/+14 |
| | |||||
* | Fix for maps_test.js in JavaScript. (#2145) | Joshua Haberman | 2016-10-10 | 2 | -63/+31 |
| | | | | | Had to strip out some JSPB-format test code, but also added some .proto test messages that had been improperly stripped out. | ||||
* | Fix bugs for internal integration. | Bo Yang | 2016-10-10 | 4 | -41/+49 |
| | |||||
* | Integrate internal changes | Bo Yang | 2016-10-10 | 280 | -8143/+19647 |
| | |||||
* | Merge pull request #2236 from hochhaus/master | Feng Xiao | 2016-10-09 | 3 | -10/+18 |
|\ | | | | | Silence compile warnings in bazel | ||||
| * | Silence compile warnings in bazel | Andy Hochhaus | 2016-10-09 | 3 | -10/+18 |
|/ | |||||
* | Merge pull request #2229 from xfxyjwf/fixbuild | Feng Xiao | 2016-10-06 | 2 | -4/+0 |
|\ | | | | | Remove missing files from build. | ||||
| * | Remove inexist files from build. | Feng Xiao | 2016-10-06 | 2 | -4/+0 |
|/ | |||||
* | update files to include php generators (#2165) | Jisi Liu | 2016-10-06 | 3 | -1/+7 |
| | |||||
* | Merge pull request #2199 from JasonLunn/patch-1 | Joshua Haberman | 2016-10-04 | 3 | -35/+5 |
|\ | | | | | Set platform to "java" under JRuby | ||||
| * | Add development dependency requirements | Jason Lunn | 2016-09-29 | 1 | -4/+4 |
| | | | | | | Uses values from the removed `Gemfile.lock` as a baseline for version requirements, though it has been observed to work with the latest versions of all the referenced gems - see https://travis-ci.org/google/protobuf/builds/163625616 for details | ||||
| * | Remove hanging reference to Gemfile.lock | Jason Lunn | 2016-09-29 | 1 | -1/+0 |
| | | |||||
| * | Delete Gemfile.lock | Jason Lunn | 2016-09-29 | 1 | -30/+0 |
| | | | | | | Avoid [failures in travis](https://travis-ci.org/google/protobuf/jobs/163611664) under jruby | ||||
| * | Set platform to "java" under JRuby | Jason Lunn | 2016-09-29 | 1 | -0/+1 |
| | | | | | | Proposed fix for #1594 | ||||
* | | Merge pull request #2218 from thomasvl/xcode8_updates | Thomas Van Lenten | 2016-10-03 | 9 | -175/+205 |
|\ \ | | | | | | | Update the ObjC projects for Xcode 8 | ||||
| * | | Update the ObjC projects for Xcode 8 | Thomas Van Lenten | 2016-10-03 | 9 | -175/+205 |
|/ / | | | | | | | | | | | | | | | | | | | - Let Xcode 8 update settings on the projects/schemes. - Migrate Swift tests to Swift 3 syntax. - Update the build/test script: - Require Xcode 8 (because of the Swift 3 requirement for tests) - Update the devices to what Xcode 8 has (8.x simulator seem to fail even though they can be downloaded in Xcode 8) - Update the travis images to ones with Xcode 8. | ||||
* | | Merge pull request #2206 from acozzette/gitignore | Adam Cozzette | 2016-09-30 | 1 | -1/+10 |
|\ \ | |/ |/| | Updated .gitignore with Java and JavaScript build artifacts | ||||
| * | Updated .gitignore with Java and JavaScript build artifacts | Adam Cozzette | 2016-09-29 | 1 | -1/+10 |
|/ | |||||
* | Merge pull request #2197 from thomasvl/swift_docs | Thomas Van Lenten | 2016-09-28 | 1 | -674/+0 |
|\ | | | | | Drop the swift docs directory (and content). | ||||
| * | Drop the swift docs directory (and content). | Thomas Van Lenten | 2016-09-28 | 1 | -674/+0 |
|/ | | | | | Since the official home is looking like it will be in another repo, it makes more sense for the relevant docs to live there instead. | ||||
* | Merge pull request #2192 from google/3.0.x | Jisi Liu | 2016-09-27 | 13 | -13/+13 |
|\ | | | | | Merge 3.0.x into master. | ||||
| * | Merge pull request #2157 from google/csharp_remove_beta_notice3.0.x | Jan Tattermusch | 2016-09-22 | 1 | -3/+0 |
| |\ | | | | | | | Update README.md | ||||
| | * | Update README.md | Jan Tattermusch | 2016-09-22 | 1 | -3/+0 |
| |/ | |||||
| * | Merge pull request #2111 from pherl/3.0.x | Jisi Liu | 2016-09-15 | 13 | -13/+13 |
| |\ | | | | | | | Fix the version number for 3.0.2 | ||||
| | * | Update generated files. | Jisi Liu | 2016-09-14 | 12 | -12/+12 |
| | | | |||||
| | * | Fix the version number for 3.0.2 | Jisi Liu | 2016-09-13 | 1 | -1/+1 |
| |/ | |||||
* | | Added C++ benchmark. (#1525) | Joshua Haberman | 2016-09-23 | 9 | -1/+265 |
| | | |||||
* | | Merge pull request #2153 from haberman/generatechangelog | Feng Xiao | 2016-09-23 | 1 | -0/+65 |
|\ \ | | | | | | | Added convenient script for generating changelog draft. | ||||
| * | | Added convenient script for generating changelog draft. | Josh Haberman | 2016-09-21 | 1 | -0/+65 |
| | | | |||||
* | | | Merge pull request #2159 from google/jtattermusch-patch-1 | Jan Tattermusch | 2016-09-22 | 1 | -3/+0 |
|\ \ \ | | | | | | | | | Update README.md | ||||
| * | | | Update README.md | Jan Tattermusch | 2016-09-22 | 1 | -3/+0 |
|/ / / | |||||
* | | | Fix gson dependency. | Bo Yang | 2016-09-21 | 2 | -2/+2 |
| | | | | | | | | | | | | gson 2.3 has internal bug that it doesn't work with some versions of maven. | ||||
* | | | Merge pull request #2035 from sergiocampama/cpp | Feng Xiao | 2016-09-21 | 5 | -4/+7 |
|\ \ \ | |/ / |/| | | Fixes static analyzer issues from xcode. | ||||
| * | | Fixes static analyzer issues from xcode. | Sergio Campama | 2016-09-20 | 5 | -4/+7 |
| | | | |||||
* | | | Merge pull request #2149 from khingblue/remove-obsoleted-project | Feng Xiao | 2016-09-21 | 1 | -1/+0 |
|\ \ \ | |/ / |/| | | Remove obsoleted project of j2me | ||||
| * | | Remove obsoleted project of j2me | Khing | 2016-09-21 | 1 | -1/+0 |
|/ / | |||||
* | | Merge pull request #2144 from abscondment/fix-jruby-hash | Joshua Haberman | 2016-09-20 | 1 | -2/+17 |
|\ \ | | | | | | | Fix hash computation for JRuby's RubyMessage | ||||
| * | | Fix hash computation for JRuby's RubyMessage | Brendan Ribera | 2016-09-20 | 1 | -2/+17 |
|/ / | | | | | | | | | | | | | | | | | | | `System.identityHashCode` returns a hash that does not consider a Message's values. This means two Messages with identical values will not have identical hashCodes. This patch uses the pattern from RubyMap to combine the hashCodes from all values in a given message and produce a unique, consistent, value-based hash. | ||||
* | | Merge pull request #2137 from thomasvl/objc_extensions_tweak | Thomas Van Lenten | 2016-09-19 | 2 | -56/+34 |
|\ \ | | | | | | | Objc extensions tweaks |