Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | Update filelist again | Jisi Liu | 2017-07-19 | 1 | -0/+1 | |
| | | * | | | Add lite and python extra_dist files | Jisi Liu | 2017-07-19 | 1 | -0/+4 | |
| | | * | | | Add java and JS dist files. | Jisi Liu | 2017-07-19 | 1 | -0/+23 | |
| | | * | | | remove broken imports in JS | Jisi Liu | 2017-07-19 | 1 | -2/+0 | |
| | | * | | | Use itmes() instead of itervalues() to be python3 compatbile. | Jisi Liu | 2017-07-19 | 1 | -1/+1 | |
| | | * | | | Fix distcheck | Jisi Liu | 2017-07-19 | 1 | -0/+1 | |
| | | * | | | remove profile | Jisi Liu | 2017-07-19 | 4 | -2239/+0 | |
| | | * | | | update build file list | Jisi Liu | 2017-07-19 | 2 | -3/+1 | |
| | | * | | | Update conformance tests | Jisi Liu | 2017-07-19 | 5 | -1184/+6 | |
| | | * | | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 328 | -7456/+12078 | |
| | | |\ \ \ | | | |/ / / | | |/| | | | ||||||
| | | * | | | Update csharp and php descriptor | Jisi Liu | 2017-07-18 | 8 | -188/+412 | |
| | | * | | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 272 | -5810/+21087 | |
* | | | | | | remove the parens from the cmp() lambda definition (#3526) | cclauss | 2017-08-21 | 2 | -4/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3317 from ejona86/protoc-artifacts-jdk8 | Jisi Liu | 2017-08-18 | 1 | -2/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | protoc-artifacts: Bump JDK to 8u131 | Eric Anderson | 2017-07-05 | 1 | -2/+3 | |
* | | | | | | Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524) | Jie Luo | 2017-08-18 | 2 | -5/+4 | |
* | | | | | | Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512) | cclauss | 2017-08-18 | 2 | -4/+5 | |
* | | | | | | Define cmp() for Python 3 (#3517) | cclauss | 2017-08-18 | 2 | -1/+10 | |
* | | | | | | Merge pull request #3516 from cclauss/patch-3 | Jie Luo | 2017-08-18 | 6 | -32/+53 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | define long() for Python 3 | cclauss | 2017-08-18 | 1 | -5/+9 | |
| * | | | | | | print() function for Python 3 | cclauss | 2017-08-18 | 1 | -10/+14 | |
| * | | | | | | print() function and lose the semicolons (;) | cclauss | 2017-08-18 | 1 | -4/+7 | |
| * | | | | | | from __future__ import print_function | cclauss | 2017-08-18 | 1 | -8/+11 | |
| * | | | | | | print() function & define raw_input() for Python 3 | cclauss | 2017-08-18 | 1 | -3/+10 | |
| * | | | | | | file() was removed in Python 3, use open() instead | cclauss | 2017-08-18 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3511 from cclauss/patch-3 | Jie Luo | 2017-08-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Old style exception --> new style exception | cclauss | 2017-08-17 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3494 from drivehappy/clang_warning_macro | Jisi Liu | 2017-08-15 | 1 | -2/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixing warning under Clang 6.x (-Wexpansion-to-defined) where the macro expan... | drivehappy | 2017-08-15 | 1 | -2/+5 | |
|/ / / / / / | ||||||
* | | | | | | Detect invalid tags with a field number of 0 in C# | Jon Skeet | 2017-08-11 | 3 | -7/+16 | |
* | | | | | | Merge pull request #3480 from bklarson/master | Feng Xiao | 2017-08-10 | 1 | -21/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Clean up typedefs for Atomic32/Atomic64 | Brad Larson | 2017-08-10 | 1 | -21/+14 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3473 from AlanBurlison/master | Feng Xiao | 2017-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLong | alanbur | 2017-08-08 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #3467 from thomasvl/bump_xcode_version | Thomas Van Lenten | 2017-08-08 | 2 | -4/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Move travis to the Xcode 8.3 (8.3.3) image. | Thomas Van Lenten | 2017-08-07 | 1 | -1/+1 | |
| * | | | | | | Fix up Xcode 8.3.x support. | Thomas Van Lenten | 2017-08-07 | 1 | -3/+1 | |
* | | | | | | | Merge pull request #3454 from anandolee/master | Jie Luo | 2017-08-07 | 4 | -8/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | PY26 tests compatibility | Jie Luo | 2017-08-04 | 2 | -4/+12 | |
| * | | | | | | | Skip setUpClass which is newly added in python2.7 for python2.6 | Jie Luo | 2017-08-04 | 1 | -2/+3 | |
| * | | | | | | | Add python 2.6 test back for cpp implementation. Json format issue was fixed ... | Jie Luo | 2017-08-03 | 1 | -2/+1 | |
* | | | | | | | | Merge pull request #3465 from vladmos/list_plus_equals | Feng Xiao | 2017-08-07 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Make .bzl files compatible with future versions of Bazel | Vladimir Moskva | 2017-08-07 | 1 | -3/+3 | |
|/ / / / / / / | ||||||
* | | | | | | | Update commit id in Dockerfile to reflect change in #3391 (#3459) | Paul Yang | 2017-08-04 | 2 | -2/+2 | |
* | | | | | | | Fix the bug in php c extension that setting one field can change anotherĀ fie... | Paul Yang | 2017-08-04 | 7 | -33/+95 | |
* | | | | | | | Update PHP descriptors (#3391) | michaelbausor | 2017-08-04 | 17 | -21/+617 | |
* | | | | | | | Merge pull request #3456 from giorgioazzinnaro/patch-1 | Feng Xiao | 2017-08-04 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update third party addons with ProfaneDB | Giorgio Azzinnaro | 2017-08-04 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Add getClass for php Descriptor in c extension (#3443) | Paul Yang | 2017-08-02 | 3 | -1/+16 | |
* | | | | | | | Fixing HHVM Compatibility (#3437) | Ryan Gordon | 2017-08-02 | 1 | -4/+2 |