aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge pull request #3262 from snnn/masterJie Luo2017-07-193-5/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Make it compatible with python 3.6.1
| | * | | | | Fix a bazel build error on WindowsChangming Sun2017-06-223-5/+11
| | |/ / / /
| * | | | | compiles removal of newline (#3333) (#3370)Brent Shaffer2017-07-1925-25/+0
| | | | | |
| * | | | | Merge pull request #3375 from TeBoring/3.3.xPaul Yang2017-07-1954-88/+259
| |\ \ \ \ \ | | | | | | | | | | | | | | Merge 3.3.x into master
| | * \ \ \ \ Merge 3.3.x into masterBo Yang2017-07-1854-88/+259
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #3258 from TeBoring/3.3.xv3.3.23.3.xPaul Yang2017-06-2128-30/+46
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Update version number to 3.3.2
| | | | * | | | | Update C++ generated code.Bo Yang2017-06-2113-13/+13
| | | | | | | | |
| | | | * | | | | Update version number to 3.3.2Bo Yang2017-06-2115-17/+33
| | | |/ / / / /
| | | * | | | | Merge pull request #3255 from TeBoring/3.3.x-3Paul Yang2017-06-2010-7/+28
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Cherry-pick bug fixes for php
| | | | * | | | | Remove inclusion of ext/json/php_json.h. (#3241)Jeff Ching2017-06-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That implementation of json is not being used - this extension is using a json encoder/decoder provided by 'upb'.
| | | | * | | | | Oneof field should be serialized even it's equal to default. (#3153)Paul Yang2017-06-203-1/+17
| | | | | | | | |
| | | | * | | | | Add ARRAY for reserved name (#3150)Paul Yang2017-06-206-5/+11
| | | |/ / / / /
| | | * | | | | Merge pull request #3085 from scpeters/issue_3059Feng Xiao2017-05-1914-0/+59
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Use bool deterministic to suppress warning
| | | | * | | | | regenerate plugin and profile message codeSteven Peters2017-05-112-0/+4
| | | | | | | | |
| | | | * | | | | Use bool deterministic to suppress warningSteven Peters2017-05-1113-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3059 by re-applying 08b1c718 from #3087.
| | | * | | | | | Update jenkins Java deps.v3.3.1Feng Xiao2017-05-121-1/+1
| | | | | | | | |
| | | * | | | | | Revert guava depedency to version 19.Feng Xiao2017-05-123-27/+14
| | | |/ / / / /
| | | * | | | | Add LICENSE in package.xml (#3083)Paul Yang2017-05-111-0/+1
| | | | | | | |
| | | * | | | | Merge pull request #3074 from xfxyjwf/3.3.xFeng Xiao2017-05-1128-30/+46
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Update version number to 3.3.1
| | | | * | | | | Update C++ generated code.Feng Xiao2017-05-0813-13/+13
| | | | | | | | |
| | | | * | | | | Update version number to 3.3.1Feng Xiao2017-05-0815-17/+33
| | | | | | | | |
| | | * | | | | | Fix upb load descriptor when no messages defined in prorto. (#3080)Paul Yang2017-05-111-0/+3
| | | | | | | | |
| | | * | | | | | Fix c extension for php7.1. (#3077)Paul Yang2017-05-104-25/+98
| | | |/ / / / /
| | | * | | | | Merge pull request #3073 from xfxyjwf/3.3.xFeng Xiao2017-05-081-1/+2
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
| | | | * | | | | Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
| | | * | | | | | Merge pull request #3064 from randomguy3/offset-typeFeng Xiao2017-05-081-1/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | Fix offset type macro to match the tables it is used in
| | | | * | | | | Fix compilationrandomguy32017-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | <: is a digraph, so a space is necessary for compilation on certain compilers.
| | | | * | | | | Fix offset type to match the tables it is used inAlex Merry2017-05-051-1/+1
| | | |/ / / / /
| | | * | | | | Merge pull request #3057 from xfxyjwf/3.3.xFeng Xiao2017-05-057-5/+18
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix several C++ build issues.
| | | | * | | | | Add missing LIBRPOTOC_EXPORT.Feng Xiao2017-05-041-2/+2
| | | | | | | | |
| | | | * | | | | Skip C# test in C++ only distribution.Feng Xiao2017-05-041-0/+8
| | | | | | | | |
| | | | * | | | | Add missing files to build files.Feng Xiao2017-05-045-3/+8
| | | | | | | | |
| | | * | | | | | Merge pull request #3056 from acozzette/cherry-pick-pr-2873Adam Cozzette2017-05-053-14/+14
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | Cherry-pick the fix from pull request #2873
| | | | * | | | | Fix #1562 by using goog.crypt.byteArrayToString instead of ↵Paul Jolly2017-05-043-14/+14
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | String.fromCharCode.apply
| | | * | | | | Merge pull request #3055 from chrisn-arm/3.3.xFeng Xiao2017-05-041-0/+7
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix compilation on alpine 3.5
| | | | * | | | | Fix issue 3046: compilation on alpine 3.5Chris Nix2017-05-041-0/+7
| | | |/ / / / /
* | | | | | | | Merge from masterJisi Liu2017-07-2587-1271/+3027
| | | | | | | |
* | | | | | | | Merge pull request #3413 from pherl/3.4.xJisi Liu2017-07-2524-42/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update version number for 3.4.0
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-243-23/+36
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3414 from pherl/fixzipJisi Liu2017-07-241-22/+32
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Omit the zip test if tools are not available
| * | | | | | | | | Omit the zip test if tools are not availableJisi Liu2017-07-241-22/+32
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3412 from anandolee/3.4.xJisi Liu2017-07-242-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Use keys() instead of iterkeys() to be python3 compatbile.
| * | | | | | | | | Add __bool__ as well as __nonzero__ for python3Jie Luo2017-07-241-0/+3
| | | | | | | | | |
| * | | | | | | | | Use keys() instead of iterkeys() to be python3 compatbile.Jie Luo2017-07-241-1/+1
|/ / / / / / / / /
| * | | | | | | | Update required version on pre-generated filesJisi Liu2017-07-2412-12/+12
| | | | | | | | |
| * | | | | | | | Update pre generated filesJisi Liu2017-07-2412-12/+12
| | | | | | | | |
| * | | | | | | | Update version number for 3.4.0Jisi Liu2017-07-2412-18/+18
|/ / / / / / / /
* | | | | | | | Merge pull request #3393 from pherl/3.4.xJisi Liu2017-07-24308-8120/+20323
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Create 3.4.x branch
| * | | | | | | Fix code to use values() insteadJisi Liu2017-07-191-1/+1
| | | | | | | |
| * | | | | | | Update filelist againJisi Liu2017-07-191-0/+1
| | | | | | | |