Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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' | ||||
| | | * | | Fix #2032 unused parameter 'deterministic' | Khing | 2016-09-08 | 13 | -0/+55 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | Parameter deterministic is unused in InternalSerializeWithCachedSizesToArray(), which generates unused parameter warning in every message. | ||||
| | * | | Merge pull request #2083 from pherl/3.0.x | Jisi Liu | 2016-09-07 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Merge pull request #1884 from hochhaus/valueWriterFn | ||||
| | | * | | Merge pull request #1884 from hochhaus/valueWriterFn | Joshua Haberman | 2016-09-07 | 1 | -1/+1 |
| | |/ / | | | | | | | | | Fix valueWriterFn_ variable name | ||||
| | * | | Merge pull request #2077 from pherl/3.0.xv3.0.2 | Jisi Liu | 2016-09-06 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Update release date in the change log | ||||
| | | * | | Update release date in the change log | Jisi Liu | 2016-09-06 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #2062 from pherl/3.0.2 | Jisi Liu | 2016-09-06 | 11 | -11/+11 |
| | |\ \ | | | | | | | | | | | Bump version number to 3.0.2 | ||||
| | | * | | Bump version number to 3.0.2 | Jisi Liu | 2016-09-02 | 11 | -11/+11 |
| | | | | | |||||
| | * | | | Merge pull request #2061 from pherl/changelog | Jisi Liu | 2016-09-06 | 1 | -0/+20 |
| | |\ \ \ | | | |/ / | | |/| | | Changelog update for 3.0.2 | ||||
| | | * | | ruby, js and c# changes | Jisi Liu | 2016-09-02 | 1 | -2/+6 |
| | | | | | |||||
| | | * | | objc change log | Jisi Liu | 2016-09-02 | 1 | -0/+16 |
| | | | | | |||||
| | * | | | Merge pull request #1862 from pherl/3.0.0-GA | Jisi Liu | 2016-09-02 | 5 | -16/+18 |
| | |\ \ \ | | | |/ / | | |/| | | Cherry pick c# changes from master | ||||
| | | * | | Bring C#'s ToPascalCase method in line with C++. | Jon Skeet | 2016-07-27 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | (This still doesn't fix the conformance tests, but at least we're now consistent with the C++ code.) | ||||
| | | * | | Remove legacy_enum_values flag for GA. | Jon Skeet | 2016-07-27 | 3 | -14/+2 |
| | | | | | |||||
| | * | | | Merge pull request #1978 from pherl/cp | Jisi Liu | 2016-09-02 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | Cherry-pick into 3.0.0-GA branch: Add a jenkins test status badge. | ||||
| | | * | | | Add a jenkins test status badge. | Feng Xiao | 2016-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce | ||||
| | * | | | | Merge pull request #2026 from pherl/cpjs | Jisi Liu | 2016-09-02 | 6 | -14/+66 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Fix missing import of jspb.Map (#1885) | ||||
| | | * | | | | Use 64-bit protoc binaries in compatibility tests. | Feng Xiao | 2016-08-31 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81 | ||||
| | | * | | | | Merge pull request #2012 from haberman/rubymapgcfix | Joshua Haberman | 2016-08-30 | 4 | -9/+59 |
| | | | | | | | | | | | | | | | | | | | | | Ruby: make sure map parsing frames are GC-rooted. | ||||
| | | * | | | | Fix missing import of jspb.Map (#1885) | Guillaume Egles | 2016-08-29 | 1 | -0/+2 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #2014 from pherl/fixgmock | Jisi Liu | 2016-08-26 | 2 | -7/+18 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | Change autogen.sh to download the zip from github | ||||
| | | * | | | Update gmock links. | Feng Xiao | 2016-08-26 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original link is no longer available. Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07 | ||||
| | | * | | | Update links in appveyor.yml | Feng Xiao | 2016-08-26 | 1 | -3/+9 |
| | |/ / / | | | | | | | | | | | | | | | | Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1 | ||||
| | * | | | Merge pull request #1977 from thomasvl/bump_cocoapod_spec | Thomas Van Lenten | 2016-08-18 | 1 | -1/+2 |
| | |\ \ \ | | | | | | | | | | | | | Bump the version in prep for the 3.0.2 tag being cut | ||||
| | | * | | | Bump the version in prep for the 3.0.2 tag being cut | Thomas Van Lenten | 2016-08-17 | 1 | -1/+2 |
| | |/ / / | | | | | | | | | | | | | | | | Also pull the watchos support info from master. | ||||
| | * | | | Merge pull request #1975 from pherl/cp | Thomas Van Lenten | 2016-08-17 | 39 | -1687/+10969 |
| | |\ \ \ | | | | | | | | | | | | | Cherry pick objc changes into 3.0.0-GA branch |