aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| * | | Allow one to omit building libprotoc and protoc binariesGravatar Yangqing Jia2017-11-13
|/ / /
* | | Merge pull request #3834 from sviterok/patch-1Gravatar Jisi Liu2017-11-13
|\ \ \ | | | | | | | | Fix a typo in WKT's test suite
| | | * Update protoc-artfactsGravatar Jisi Liu2017-11-13
| | | |
* | | | Update README.mdGravatar Jisi Liu2017-11-13
| | | |
| | | * Merge branch '3.5.x' of github.com:google/protobuf into 3.5.xGravatar Jisi Liu2017-11-13
| | | |\
| | | * | Update release dateGravatar Jisi Liu2017-11-13
| | | | |
| | | | * Merge pull request #3868 from pherl/3.5.xGravatar Jisi Liu2017-11-13
| | | | |\ | | | | |/ | | | |/| Support win32 long path for cross compiled build
* | | | | Merge pull request #3875 from hchasestevens/add-hypothesis-protobuf-docGravatar Feng Xiao2017-11-13
|\ \ \ \ \ | | | | | | | | | | | | Add hypothesis-protobuf library to the 3rd party doc.
| | | | | * All integer types should accept null in json. (#3869)Gravatar Paul Yang2017-11-13
| | | | | |
| * | | | | Add hypothesis-protobuf library to the 3rd party doc.Gravatar H. Chase Stevens2017-11-13
|/ / / / /
* | | | | MMinor fix-ups to C# tests from changes in earlier commitsGravatar Jon Skeet2017-11-12
| | | | |
* | | | | Regenerated test code for C#Gravatar Jon Skeet2017-11-12
| | | | |
* | | | | Move C#-only test protos to csharp/protosGravatar Jon Skeet2017-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#.
* | | | | Run C# codegen when testing itGravatar Jon Skeet2017-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | This will cause failures if shared protos change in an incompatible way.
| | | * | Support win32 long path for cross compiled buildGravatar Jisi Liu2017-11-10
| | | | |
| | | | * Merge pull request #3867 from jtattermusch/update_changelogGravatar Jisi Liu2017-11-10
| | | | |\ | | | | | | | | | | | | Update changelog
| | | | | * update changelogGravatar Jan Tattermusch2017-11-10
| | | | |/
| | | | * Merge pull request #3861 from jtattermusch/backport_3858Gravatar Jisi Liu2017-11-10
| | | |/| | | | | | | | | | | Backport #3858 to 3.5.x branch
| | | | * ParseFrom<T> for array slice is missingGravatar Jan Tattermusch2017-11-10
| | | | |
| | | | * check already performed by MergeFromGravatar Jan Tattermusch2017-11-10
| | | | |
| | | | * allow message parsing from an array sliceGravatar Jan Tattermusch2017-11-10
| | | |/
* | | | Merge pull request #3858 from jtattermusch/parsing_from_sliceGravatar Jan Tattermusch2017-11-10
|\ \ \ \ | | | | | | | | | | C#: Allow message parsing from an array slice
| | | | * Fix arm64 nameGravatar Jisi Liu2017-11-09
| | | | |
| | | | * Supports Arm64 (aarch64) protoc artifactsGravatar Jisi Liu2017-11-09
| | | | |
| * | | | ParseFrom<T> for array slice is missingGravatar Jan Tattermusch2017-11-09
| | | | |
| * | | | check already performed by MergeFromGravatar Jan Tattermusch2017-11-09
| | | | |
| * | | | allow message parsing from an array sliceGravatar Jan Tattermusch2017-11-09
|/ / / /
| | | * Merge pull request #3854 from pherl/3.5.xGravatar Jisi Liu2017-11-08
| | | |\ | | | | | | | | | | Fix Atomic32/AtomicWord on some platforms.
| | | * | Provide util funtions to figure out correct php class names. (#3850)Gravatar Paul Yang2017-11-08
| | | | |
| | | | * Fix Atomic32/AtomicWord on some platforms.Gravatar Jisi Liu2017-11-08
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed the redefination in the atomicword_compat.h. Now Atomic32 will alwyas be intptr_t in 32bit platforms, the bridge is no longer needed. - Change NaCl 64bit to use intptr_t instead of int32 for Atomic32, otherwise AtmoicWord APIs will miss the definations. After this change, the AtmoicWord will always be either Atomic32 or Atmoic64 depending on the platforms.
| | | * Merge pull request #3835 from pherl/3.5.xGravatar Jisi Liu2017-11-08
| | | |\ | | | | | | | | | | Update version number to 3.5.0
| | | | * Fix java code exampleGravatar Jisi Liu2017-11-08
| | | | |
| | | | * Changelog for 3.5.0Gravatar Jisi Liu2017-11-08
| | | | |
* | | | | Merge pull request #3822 from mehrdada/update-benchmark-submoduleGravatar Jisi Liu2017-11-06
|\ \ \ \ \ | | | | | | | | | | | | Update google/benchmark submodule to v1.2
| | | | * | Fix php well known type conformance tests (#3828) (#3840)Gravatar Paul Yang2017-11-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix php well known type conformance tests * Properly generate code for test.proto * Provide GPBMetadata files in c extensions for generated files to import. * Remove unnecessary test * Clean up code * Add declaration for initOnce. * Refactoring
* | | | | | Fix php well known type conformance tests (#3828)Gravatar Paul Yang2017-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix php well known type conformance tests * Properly generate code for test.proto * Provide GPBMetadata files in c extensions for generated files to import. * Remove unnecessary test * Clean up code * Add declaration for initOnce. * Refactoring
* | | | | | Merge pull request #3839 from thomasvl/message_equalityGravatar Thomas Van Lenten2017-11-03
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | When comparing message, require them to have the same descriptor.
| * | | | | When comparing message, require them to have the same descriptor.Gravatar Thomas Van Lenten2017-11-03
|/ / / / / | | | | | | | | | | | | | | | | | | | | This will cover someone subclassing the message, and also handles something crazy like someone comparing to a raw NSObject.
| | | | * Update generated descritpors.Gravatar Jisi Liu2017-11-02
| | | | |
| | | | * Update version number to 3.5.0Gravatar Jisi Liu2017-11-02
| |_|_|/ |/| | |
| | * | Fix a typo in WKT's test suiteGravatar Roman Nekhoroshev2017-11-02
| |/ / |/| | | | | | | | | | | | | | | | | Hi! Sorry for bothering with such a minor thing, but I just noticed and fixed one annoying typo in WKT's test suite: `"accpets" -> "accepts"` Thanks!
* | | Fix merging with message-valued oneofGravatar Jon Skeet2017-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation.
| * | Update google/benchmark submodule to v1.2Gravatar Mehrdad Afshari2017-10-30
|/ / | | | | | | Fixed some build issues on ppc64le architecture
* | Merge pull request #3817 from xuwei-k/joda-urlGravatar Feng Xiao2017-10-30
|\ \ | | | | | | update joda-time javadoc url
| * | update joda-time javadoc urlGravatar xuwei-k2017-10-30
|/ /
* | Add parser settings WithXyz methodsGravatar Jon Skeet2017-10-28
| |
* | Add JsonParser setting to ignore unknown field valuesGravatar Jon Skeet2017-10-28
| | | | | | | | | | | | | | Note that the default behavior is still to throw an exception; you need to opt into ignoring unknown fields. Fixes #2838.
* | Merge pull request #3722 from timou/cmake-windows-cleanGravatar Jisi Liu2017-10-27
|\ \ | | | | | | Suppress VS2017 compiler/linker warnings
* | | Reserve unknown in Ruby (#3763)Gravatar Paul Yang2017-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reserve unknown in ruby * Revert ruby tests. Wait for cpp impl for conformance test * Add conformance test for preserving unknown * Add unknown field conformance test to csharp failure list. * Fix comments * Fix comment * Fix comments * Fix typo * Use stringsink_string directly * Mark hd unused * Remove unused encodeunknown_handlerfunc
* | | Add missing filesGravatar Jisi Liu2017-10-26
| | |