Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | Use a custom dictionary to avoid NSNumber operations. | Thomas Van Lenten | 2016-09-19 | 1 | -16/+31 |
| | | | | | | | | | | | | | | | For the secondary dictionary, use a custom CFDictionary with integer keys to avoid the NSNumber conversions. | ||||
| * | | Remove the custom key functions and just use the system provided defaults. | Thomas Van Lenten | 2016-09-19 | 1 | -40/+3 |
|/ / | |||||
* | | Merge pull request #2037 from abscondment/fix-2036-ruby-hash | Joshua Haberman | 2016-09-18 | 2 | -8/+9 |
|\ \ | | | | | | | Fix #2036 (Ruby `hash` broken for Messages with repeated fields.) | ||||
| * | | fix #2036: use `rb_hash_*` to accumulate hashes | Brendan Ribera | 2016-08-30 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | Instead of shifting/xoring the hash at each field, use the built-in ruby apis for generating a hash from multiple input values. Now returns a Fixnum. | ||||
| * | | failing test for #2036: | Brendan Ribera | 2016-08-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | * add a repeated field to the tested hash * also assert that two messages with identical values produce identical hashes | ||||
* | | | Merge pull request #2130 from kilink/substring-comment-fix | Feng Xiao | 2016-09-16 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Fix erroneous comment regarding String.substring | ||||
| * | | | Fix erroneous comment regarding String.substring | Patrick Strawderman | 2016-09-16 | 1 | -3/+3 |
|/ / / | | | | | | | Since Java 7, Strings produced with String.substring do not share byte arrays. | ||||
* | | | Some php engine implementation doesn't have return_value_ptr properly set. ↵ | Bo Yang | 2016-09-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Explicitly use &return_value. | ||||
* | | | Auto-generate proto files for tests. | Bo Yang | 2016-09-15 | 4 | -1424/+14 |
| | | | |||||
* | | | Add back missing test proto files. | Bo Yang | 2016-09-15 | 1 | -0/+7 |
| | | | |||||
* | | | Merge pull request #2112 from pherl/merge | Jisi Liu | 2016-09-15 | 41 | -20/+185 |
|\ \ \ | | | | | | | | | Merge 3.0.x into master | ||||
| * \ \ | Merge remote-tracking branch 'origin/3.0.x' into merge | Jisi Liu | 2016-09-14 | 41 | -20/+185 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge pull request #2096 from pherl/3.0.x | Jisi Liu | 2016-09-08 | 1 | -25/+33 |
| | |\ \ | | | | | | | | | | | Cherry pick objc test changes into 3.0.x branch | ||||
| | | * | | More complete nil/reset tests within a oneof | Thomas Van Lenten | 2016-09-08 | 1 | -6/+12 |
| | | | | | |||||
| | | * | | Fix some constants to be correct for the message class in use. | Thomas Van Lenten | 2016-09-08 | 1 | -21/+23 |
| | |/ / | |||||
| | * | | Merge pull request #2087 from khingblue/fix-unused-param | Jisi Liu | 2016-09-08 | 13 | -0/+55 |
| | |\ \ | | | | | | | | | | | Fix #2032 unused parameter 'deterministic' |