aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Fix for maps_test.js in JavaScript. (#2145)Gravatar Joshua Haberman2016-09-20
| | | | | 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.Gravatar Bo Yang2016-09-19
|
* Use a custom dictionary to avoid NSNumber operations.Gravatar Thomas Van Lenten2016-09-19
| | | | | 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.Gravatar Thomas Van Lenten2016-09-19
|
* Integrate internal changesGravatar Bo Yang2016-09-19
|
* Merge pull request #2037 from abscondment/fix-2036-ruby-hashGravatar Joshua Haberman2016-09-18
|\ | | | | Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
* \ Merge pull request #2130 from kilink/substring-comment-fixGravatar Feng Xiao2016-09-16
|\ \ | | | | | | Fix erroneous comment regarding String.substring
| * | Fix erroneous comment regarding String.substringGravatar Patrick Strawderman2016-09-16
|/ / | | | | 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. ↵Gravatar Bo Yang2016-09-15
| | | | | | | | Explicitly use &return_value.
* | Auto-generate proto files for tests.Gravatar Bo Yang2016-09-15
| |
* | Add back missing test proto files.Gravatar Bo Yang2016-09-15
| |
* | Merge pull request #2112 from pherl/mergeGravatar Jisi Liu2016-09-15
|\ \ | | | | | | Merge 3.0.x into master
* \ \ Merge pull request #2123 from thomasvl/objc_better_versioning_take2Gravatar Thomas Van Lenten2016-09-15
|\ \ \ | | | | | | | | Update the ObjC version checks to support a min and current version.
| * | | Update the ObjC version checks to support a min and current version.Gravatar Thomas Van Lenten2016-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Capture the version used to generated. - Check at compile time and runtime that generated code isn't from a newer version, also check that the min version required is also supported. - Keep the old constants/macros/functions to special case the last version that was working so those generated sources still work until we decide otherwise.
* | | | Check in php implementation. (#2052)Gravatar Paul Yang2016-09-15
|/ / / | | | | | | | | | | | | This pull request includes two implementation: C extension and PHP package. Both implementations support encode/decode of singular, repeated and map fields.
| * | Merge remote-tracking branch 'origin/3.0.x' into mergeGravatar Jisi Liu2016-09-14
|/| |
* | | Merge pull request #1765 from mbarbon/masterGravatar Feng Xiao2016-09-12
|\ \ \ | | | | | | | | Add https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
* \ \ \ Merge pull request #2021 from zlim/bench-fixGravatar Feng Xiao2016-09-12
|\ \ \ \ | | | | | | | | | | benchmarks: update readme.txt
* \ \ \ \ Merge pull request #2100 from vladmos/patch-1Gravatar Feng Xiao2016-09-12
|\ \ \ \ \ | | | | | | | | | | | | Compatibility with the new version of Bazel.
* \ \ \ \ \ Merge pull request #2092 from dprotaso/masterGravatar Feng Xiao2016-09-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow the JsonFormat.Parser to ignore unknown fields
| | * \ \ \ \ Resolved a conflictGravatar Vladimir Moskva2016-09-12
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #2044 from wychen/Win32ANSIGravatar Feng Xiao2016-09-09
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix Win32 error messages on Unicode build
* \ \ \ \ \ \ \ Merge pull request #1636 from yugui/feature/generic-pluginGravatar Jisi Liu2016-09-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Generalize plugin support in Bazel Skylark rule
* \ \ \ \ \ \ \ \ Merge pull request #2090 from guoxiao/findGravatar Feng Xiao2016-09-09
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | include std::find()
* \ \ \ \ \ \ \ \ \ Merge pull request #2103 from adrianludwin/fix-gtestGravatar Feng Xiao2016-09-09
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update repo in Bazel build files to use googletest instead of the deprecated gMock
| * | | | | | | | | | Update repo to use google testGravatar Adrian Ludwin2016-09-09
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1970 from thomasvl/objc_any_helpersGravatar Thomas Van Lenten2016-09-09
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Objc any helpers
| | | | | | | * | | | | Compatibility with the new version of Bazel.Gravatar Vladimir Moskva2016-09-09
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Global variable HOST_CFG is deprecated and will not be supported soon.
* | | | | | | | | | | Merge pull request #2094 from thomasvl/update_wkt_commentsGravatar Thomas Van Lenten2016-09-08
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix error and add note about lossy issues
| | | | | | | | | | * \ Merge pull request #2096 from pherl/3.0.xGravatar Jisi Liu2016-09-08
| | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick objc test changes into 3.0.x branch
| | | | | | | | | | | * | More complete nil/reset tests within a oneofGravatar Thomas Van Lenten2016-09-08
| | | | | | | | | | | | |
| | | | | | | | | | | * | Fix some constants to be correct for the message class in use.Gravatar Thomas Van Lenten2016-09-08
| | | | | | | | | | |/ /
| * | | | | | | | | | | Fix error and add note about lossy issuesGravatar Thomas Van Lenten2016-09-08
| | | | | | | | | | | |
* | | | | | | | | | | | Support the -Wassign-enum compiler flag. (#2085)Gravatar Sergio Campamá2016-09-08
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the -Wassign-enum compiler flag.
| | | | | | * / / / / Allow the JsonFormat.Parser to ignore unknown fieldsGravatar Dave Protasowski2016-09-08
| |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default behaviour of throwing an exception remains
| | | | | | | | * | Merge pull request #2087 from khingblue/fix-unused-paramGravatar Jisi Liu2016-09-08
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | Fix #2032 unused parameter 'deterministic'
| * | | | | | | | | | Add ObjC helpers for Any WKT.Gravatar Thomas Van Lenten2016-09-08
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Capture the ObjC prefix used when generating the the file. - Track the containing type on descriptors. - Mark descriptors where the message class name got a suffix added to it. - Expose a fullName property on Descriptors. - Add helpers for packing/unpacking Any messages. - Bump the ObjC runtime version number. Since we added methods and invoke them in the generated code, ensure the code is running against a matching version. Otherwise, someone could compile against headers, but run with a framework that is older and get unknown selector failures. This should trip clearer messaging. Fixes https://github.com/google/protobuf/issues/1674
| | * / / / / / / / include std::find()Gravatar Guo Xiao2016-09-08
| |/ / / / / / / / |/| | | | | | | |
| | | | | | | * | Fix #2032 unused parameter 'deterministic'Gravatar Khing2016-09-08
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameter deterministic is unused in InternalSerializeWithCachedSizesToArray(), which generates unused parameter warning in every message.
* | | | | | | | Merge pull request #2079 from khingblue/fix-generate-descriptorGravatar Feng Xiao2016-09-07
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix #2071 replacing /bin/sh with bash when generates descriptor
| | | | | | | * \ Merge pull request #2083 from pherl/3.0.xGravatar Jisi Liu2016-09-07
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | Merge pull request #1884 from hochhaus/valueWriterFn
| | | | | | | | * | Merge pull request #1884 from hochhaus/valueWriterFnGravatar Joshua Haberman2016-09-07
| | | | | | | |/ / | | | | | | | | | | | | | | | | | | Fix valueWriterFn_ variable name
| * | | | | | / / Fix #2071 replacing /bin/sh with bashGravatar Khing2016-09-07
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Ubuntu /bin/sh is dash by default, this can cause generate_descriptor_proto.sh fail to execute.
| | | | | | * | Merge pull request #2077 from pherl/3.0.xGravatar Jisi Liu2016-09-06
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | Update release date in the change log
| | | | | | | * | Update release date in the change logGravatar Jisi Liu2016-09-06
| | | | | | |/ /
* | | | | | | | Merge pull request #2047 from jonathon-love/masterGravatar Joshua Haberman2016-09-06
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix to typo/oversight in reflection tests
| | | | | | | * \ Merge pull request #2062 from pherl/3.0.2Gravatar Jisi Liu2016-09-06
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | Bump version number to 3.0.2
| | | | | | | * \ \ Merge pull request #2061 from pherl/changelogGravatar Jisi Liu2016-09-06
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | Changelog update for 3.0.2
* | | | | | | | | | | Rm check on dependency in the C# reflection API (#2051)Gravatar Guillaume Turri2016-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This check adds a few constraints on the way to build a project when we have a proto file which imports another one. In particular, on projects which build both C# and Java, it's easy to end up with exceptions like Expected: included.proto but was src/main/protobuf/included.proto A user may work around this issue, but it may add unnecessary constraints on the layout of the project. According to https://github.com/google/protobuf/commit/f3504cf3b1d456a843e8242fdee9ba0bf2991dc1#diff-ecb0b909ed572381a1c8d1994f09a948R309 it has already been considered to get rid of this check, for similar considerations, and because it doesn't exist in the Java code
* | | | | | | | | | | Merge pull request #2059 from chih-hung/masterGravatar Feng Xiao2016-09-02
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix #1955 clang-tidy warning misc-macro-parentheses