aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-3056-252/+291
|\
| * Remove duplicate typedef. (#3975)Paul Yang2017-11-301-19/+7
| * Provide discardUnknonwnFields API in php (#3976)Paul Yang2017-11-305-0/+27
| * Update version for 3.5.0.post1Jisi Liu2017-11-221-1/+1
| * Merge pull request #3941 from google/anandolee-patch-2Jisi Liu2017-11-221-1/+10
| |\
| | * Add _file_desc_by_toplevel_extension backJie Luo2017-11-221-1/+10
| |/
| * Update version number for php c extension (#3896)Paul Yang2017-11-152-4/+20
| * Merge pull request #3895 from pherl/3.5.xJisi Liu2017-11-151-1/+1
| |\
| | * Add protobuf-all in post releaseJisi Liu2017-11-151-1/+1
| * | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886)Paul Yang2017-11-151-4/+3
| |/
| * Update protoc-artfactsJisi Liu2017-11-131-5/+6
| * Merge branch '3.5.x' of github.com:google/protobuf into 3.5.xJisi Liu2017-11-135-9/+67
| |\
| | * Merge pull request #3868 from pherl/3.5.xv3.5.0Jisi Liu2017-11-1313-29/+22
| | |\
| | * | All integer types should accept null in json. (#3869)Paul Yang2017-11-132-5/+22
| | * | Merge pull request #3867 from jtattermusch/update_changelogJisi Liu2017-11-101-0/+1
| | |\ \
| | | * | update changelogJan Tattermusch2017-11-101-0/+1
| | |/ /
| | * | Merge pull request #3861 from jtattermusch/backport_3858Jisi Liu2017-11-102-4/+44
| | |\ \
| | | * | ParseFrom<T> for array slice is missingJan Tattermusch2017-11-101-0/+14
| | | * | check already performed by MergeFromJan Tattermusch2017-11-101-5/+0
| | | * | allow message parsing from an array sliceJan Tattermusch2017-11-102-0/+31
| | |/ /
| * | / Update release dateJisi Liu2017-11-131-3/+3
| | |/ | |/|
| * | Support win32 long path for cross compiled buildJisi Liu2017-11-1013-29/+22
| |/
| * Fix arm64 nameJisi Liu2017-11-091-2/+2
| * Supports Arm64 (aarch64) protoc artifactsJisi Liu2017-11-092-1/+16
| * Merge pull request #3854 from pherl/3.5.xJisi Liu2017-11-084-131/+2
| |\
| | * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-084-131/+2
| * | Provide util funtions to figure out correct php class names. (#3850)Paul Yang2017-11-082-9/+36
| |/
| * Merge pull request #3835 from pherl/3.5.xJisi Liu2017-11-0826-43/+118
| |\
| | * Fix java code exampleJisi Liu2017-11-081-2/+2
| | * Changelog for 3.5.0Jisi Liu2017-11-081-0/+75
| | * Update generated descritpors.Jisi Liu2017-11-0212-24/+24
| | * Update version number to 3.5.0Jisi Liu2017-11-0213-19/+19
| * | Fix php well known type conformance tests (#3828) (#3840)Paul Yang2017-11-0412-164/+520
| |/
* | Merge pull request #3824 from anuraaga/dev_ragFeng Xiao2017-11-306-37/+921
|\ \
| * | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Anuraag Agrawal2017-11-296-37/+921
* | | Merge pull request #3955 from linux-on-ibm-z/masterFeng Xiao2017-11-301-0/+8
|\ \ \
| * | | Adding Release_CompareAndSwap 64-bit variantNayana-ibm2017-11-271-0/+8
* | | | Update csharp version number (#3958)Jie Luo2017-11-291-1/+1
* | | | Merge pull request #2519 from rubynerd-forks/ruby-fix-repeated-message-type-f...Joshua Haberman2017-11-292-4/+18
|\ \ \ \
| * | | | test for field reassignment@rubynerd2017-10-121-0/+6
| * | | | handle sanity check for repeating enums correctly@rubynerd2016-12-301-3/+11
| * | | | unwrap descriptor class before comparison of RepeatedField types@rubynerd2016-12-191-1/+1
* | | | | Fix JsonTokenizer exception messageJon Skeet2017-11-291-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #3960 from acozzette/libprotoc-export-fixAdam Cozzette2017-11-281-1/+1
|\ \ \ \
| * | | | Added back in LIBPROTOC_EXPORT which was removed by mistakeAdam Cozzette2017-11-281-1/+1
|/ / / /
* | | | Merge pull request #3962 from jleni/fix_dotnetAdam Cozzette2017-11-281-1/+1
|\ \ \ \
| * | | | Upgrading dotnet to 1.0.4Juan Leni2017-11-281-1/+1
| | |/ / | |/| |
* | | | Merge pull request #3416 from xiaoshuang-lu/PROTOBUF-3404Jisi Liu2017-11-271-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | [PROTOBUF-3404] add --with-zlib=PATH to configure.ac scriptXiaoshuang LU2017-11-231-0/+10
|/ / /
* | | Merge pull request #3919 from jart/less-warningsFeng Xiao2017-11-211-0/+2
|\ \ \