Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge pull request #3868 from pherl/3.5.xv3.5.0 | Jisi Liu | 2017-11-13 | 13 | -29/+22 | |
| |\ | ||||||
| * | | All integer types should accept null in json. (#3869) | Paul Yang | 2017-11-13 | 2 | -5/+22 | |
| * | | Merge pull request #3867 from jtattermusch/update_changelog | Jisi Liu | 2017-11-10 | 1 | -0/+1 | |
| |\ \ | ||||||
| | * | | update changelog | Jan Tattermusch | 2017-11-10 | 1 | -0/+1 | |
| |/ / | ||||||
| * | | Merge pull request #3861 from jtattermusch/backport_3858 | Jisi Liu | 2017-11-10 | 2 | -4/+44 | |
| |\ \ | ||||||
| | * | | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-10 | 1 | -0/+14 | |
| | * | | check already performed by MergeFrom | Jan Tattermusch | 2017-11-10 | 1 | -5/+0 | |
| | * | | allow message parsing from an array slice | Jan Tattermusch | 2017-11-10 | 2 | -0/+31 | |
| |/ / | ||||||
* | / | Update release date | Jisi Liu | 2017-11-13 | 1 | -3/+3 | |
| |/ |/| | ||||||
* | | Support win32 long path for cross compiled build | Jisi Liu | 2017-11-10 | 13 | -29/+22 | |
|/ | ||||||
* | Fix arm64 name | Jisi Liu | 2017-11-09 | 1 | -2/+2 | |
* | Supports Arm64 (aarch64) protoc artifacts | Jisi Liu | 2017-11-09 | 2 | -1/+16 | |
* | Merge pull request #3854 from pherl/3.5.x | Jisi Liu | 2017-11-08 | 4 | -131/+2 | |
|\ | ||||||
| * | Fix Atomic32/AtomicWord on some platforms. | Jisi Liu | 2017-11-08 | 4 | -131/+2 | |
* | | Provide util funtions to figure out correct php class names. (#3850) | Paul Yang | 2017-11-08 | 2 | -9/+36 | |
|/ | ||||||
* | Merge pull request #3835 from pherl/3.5.x | Jisi Liu | 2017-11-08 | 26 | -43/+118 | |
|\ | ||||||
| * | Fix java code example | Jisi Liu | 2017-11-08 | 1 | -2/+2 | |
| * | Changelog for 3.5.0 | Jisi Liu | 2017-11-08 | 1 | -0/+75 | |
| * | Update generated descritpors. | Jisi Liu | 2017-11-02 | 12 | -24/+24 | |
| * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 13 | -19/+19 | |
* | | Fix php well known type conformance tests (#3828) (#3840) | Paul Yang | 2017-11-04 | 12 | -164/+520 | |
|/ | ||||||
* | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 13 | -12/+417 | |
* | Merge pull request #3817 from xuwei-k/joda-url | Feng Xiao | 2017-10-30 | 4 | -4/+4 | |
|\ | ||||||
| * | update joda-time javadoc url | xuwei-k | 2017-10-30 | 4 | -4/+4 | |
|/ | ||||||
* | Add parser settings WithXyz methods | Jon Skeet | 2017-10-28 | 1 | -0/+17 | |
* | Add JsonParser setting to ignore unknown field values | Jon Skeet | 2017-10-28 | 4 | -7/+95 | |
* | Merge pull request #3722 from timou/cmake-windows-clean | Jisi Liu | 2017-10-27 | 1 | -1/+20 | |
|\ | ||||||
| * | Sort MSVC warning suppressions | Tim Ebringer | 2017-10-21 | 1 | -1/+17 | |
| * | Suppress VS2017 compiler/linker warnings | Tim Ebringer | 2017-10-06 | 1 | -1/+4 | |
* | | Reserve unknown in Ruby (#3763) | Paul Yang | 2017-10-26 | 12 | -832/+2034 | |
* | | Add missing files | Jisi Liu | 2017-10-26 | 1 | -0/+38 | |
* | | Merge pull request #3804 from pherl/merge | Jisi Liu | 2017-10-26 | 3 | -2/+7 | |
|\ \ | ||||||
| * \ | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-25 | 3 | -2/+7 | |
| |\ \ | ||||||
| | * \ | Merge pull request #3758 from spinorx/3.4.x | Jisi Liu | 2017-10-20 | 1 | -43/+2 | |
| | |\ \ | ||||||
| | | * | | Fix iOS cc_library build for protobuf. | Param Reddy | 2017-10-15 | 1 | -43/+2 | |
| | * | | | Merge pull request #3578 from pherl/filedeprecation | Jisi Liu | 2017-10-18 | 4 | -2/+45 | |
| | |\ \ \ | ||||||
| | | * | | | Add TODO | Jisi Liu | 2017-08-31 | 1 | -0/+3 | |
| | | * | | | Fix dist check | Jisi Liu | 2017-08-31 | 1 | -0/+1 | |
| | | * | | | Add @Deprecated annotation support for proto file. | Jisi Liu | 2017-08-31 | 3 | -2/+41 | |
| | * | | | | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3 | Jisi Liu | 2017-10-18 | 1 | -1/+1 | |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | | * | | | Clang warning cleanup for unused parameter. | drivehappy | 2017-09-14 | 1 | -1/+1 | |
* | | | | | | Merge pull request #3791 from signalwerk/patch-1 | Adam Cozzette | 2017-10-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | To be clear that we set a new variable | Stefan Huber | 2017-10-24 | 1 | -1/+1 | |
* | | | | | | Merge pull request #3787 from sergiocampama/coverage | Thomas Van Lenten | 2017-10-24 | 5 | -85/+182 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Improves coverage of GPBCodedInputStream | Sergio Campama | 2017-10-24 | 5 | -85/+182 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3757 from spinorx/master | Jisi Liu | 2017-10-20 | 1 | -43/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix iOS cc_library build for protobuf. | Param Reddy | 2017-10-15 | 1 | -43/+2 | |
* | | | | | | Merge pull request #3743 from Schtolc/master | Jisi Liu | 2017-10-19 | 1 | -3/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | CodedInputStream::SetTotalBytesLimit description fix | Pavel | 2017-10-12 | 1 | -3/+3 | |
* | | | | | | | Merge pull request #3754 from toanju/gcc-fallthrough | Jisi Liu | 2017-10-19 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ |