Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | pyext needs c++11 in linux and mac. (#4930) | Arun Olappamanna Vasudevan | 2018-07-23 | 1 | -6/+1 | |
| | | | | | ||||||
* | | | | | Update Composer config in PHP module (#3829) | Timothy Younger | 2018-07-23 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevents installation of `phpunit/phpunit:^6` because the test cases in this project require `\PHPUnit_Framework_TestCase` which was removed in v6. Moves generated PHP classes for tests into autoload-dev so that they are not referenced in the dist autoload. Adds Composer scripts to run protoc with and without grpc. * update composer test target to use the same commands as generate_php_test_proto in tests.sh | |||||
* | | | | | Remove/replace travis references (#4953) | Feng Xiao | 2018-07-22 | 6 | -96/+4 | |
|/ / / / | | | | | | | | | | | | | * Remove/replace travis references. | |||||
* | | | | Update options.md (#4952) | Ryland Degnan | 2018-07-21 | 1 | -0/+4 | |
| | | | | | | | | | | | | Added Netifi Proteus to Registered Extensions | |||||
* | | | | php: Added nanosecond support for Timestamp (#3972) | Leonard Hecker | 2018-07-20 | 6 | -38/+83 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * php: Added nanosecond support for Timestamp * php: Fixed compatibility test | |||||
* | | | | Merge pull request #4943 from Stevie-O/fix-unit-tests-on-win32 | Adam Cozzette | 2018-07-20 | 7 | -10/+15 | |
|\ \ \ \ | | | | | | | | | | | When running unit tests, read reference files in text mode | |||||
| * | | | | When running unit tests, read reference files in text mode | Stephen Oberholtzer | 2018-07-19 | 7 | -10/+15 | |
|/ / / / | | | | | | | | | | | | | | | | | This should put an end to all of the reports of unit test failures on Windows machines. | |||||
* / / / | Delete unused files. (#4942) | Feng Xiao | 2018-07-19 | 10 | -2089/+0 | |
|/ / / | | | | | | | * Delete unused files. | |||||
* | | | Merge pull request #4934 from BSBandme/sync_internal_benchmark | Yilun Chong | 2018-07-18 | 3 | -133/+153 | |
|\ \ \ | | | | | | | | | Sync internal benchmark changes | |||||
| * | | | Sync internal benchmark changes | Yilun Chong | 2018-07-18 | 3 | -133/+153 | |
| | | | | ||||||
* | | | | Fix C# nuget build on Kokoro (#4912) | Jan Tattermusch | 2018-07-18 | 3 | -3/+3 | |
|/ / / | | | | | | | | | | * upgrade dotnet SDK to 2.1.3 on kokoro linux | |||||
* | | | Merge pull request #4850 from BSBandme/php_benchmark | Yilun Chong | 2018-07-16 | 4 | -3/+263 | |
|\ \ \ | | | | | | | | | add php benchmark | |||||
| * | | | add php benchmark | Yilun Chong | 2018-07-16 | 4 | -3/+263 | |
| | | | | ||||||
* | | | | Comment out unused command from release script. | Feng Xiao | 2018-07-15 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #4922 from xfxyjwf/release2 | Feng Xiao | 2018-07-15 | 1 | -0/+6 | |
|\ \ \ \ | | | | | | | | | | | Run autogen.sh in release script. | |||||
| * | | | | Run autogen.sh in release script. | Feng Xiao | 2018-07-15 | 1 | -0/+6 | |
| | | | | | ||||||
* | | | | | Merge pull request #4920 from xfxyjwf/release | Feng Xiao | 2018-07-15 | 3 | -2/+39 | |
|\| | | | | | | | | | | | | | | Add protoc release script for Linux build. | |||||
| * | | | | Add protoc release script for Linux build. | Feng Xiao | 2018-07-15 | 3 | -2/+39 | |
|/ / / / | ||||||
* | | | | Merge pull request #4916 from xfxyjwf/docker | Feng Xiao | 2018-07-15 | 5 | -107/+29 | |
|\ \ \ \ | | | | | | | | | | | Add cpp tests under release docker image. | |||||
| * | | | | Add cpp tests under release docker image. | Feng Xiao | 2018-07-15 | 5 | -107/+29 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | 1. Added C++ tests under the release docker image. 2. Fixed a compile issue with the docker image. 3. Cleaned up tests.sh and removed traivis stuff. | |||||
* | | | | Merge pull request #4913 from xfxyjwf/protoc | Feng Xiao | 2018-07-13 | 3 | -166/+167 | |
|\ \ \ \ | | | | | | | | | | | Update protoc build scripts. | |||||
| * | | | | Update protoc build scripts. | Feng Xiao | 2018-07-13 | 3 | -166/+167 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Changed maven script to only do artifact uploading and removed build script invocation from it. We didn't use maven to invoke the build script before (we built protoc manually and editted pom.xml to only do uploading for previous releases), and will not use it in the future (we will use kokoro to build artifacts). 2. Cleaned up build-protoc.sh and README.md: removed the part about using maven to build and listed supported platforms explicitly. | |||||
* | | | | Merge pull request #4908 from TeBoring/php-bug | Feng Xiao | 2018-07-13 | 6 | -24/+29 | |
|\ \ \ \ | | | | | | | | | | | Fix php tests | |||||
| * | | | | Fix 32bit php tests | Bo Yang | 2018-07-13 | 4 | -20/+24 | |
| | | | | | ||||||
| * | | | | Fix php tests | Bo Yang | 2018-07-13 | 4 | -5/+6 | |
| | | | | | ||||||
* | | | | | Merge pull request #4905 from BSBandme/fix_kokoro_build_in_docker | Feng Xiao | 2018-07-13 | 4 | -3/+10 | |
|\ \ \ \ \ | |/ / / / |/| | | | | fix linux kokoro build in docker | |||||
| * | | | | fix golang kokoro linux build | Yilun Chong | 2018-07-12 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | fix python cpp kokoro build | Yilun Chong | 2018-07-12 | 2 | -1/+4 | |
| | | | | | ||||||
| * | | | | fix linux kokoro build in docker | Yilun Chong | 2018-07-12 | 1 | -1/+5 | |
| | | | | | ||||||
* | | | | | Merge pull request #4903 from BSBandme/fix_js_build | Yilun Chong | 2018-07-12 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | fix commonjs js provide GOOGLE_CHECK | |||||
| * | | | | | fix commonjs js provide GOOGLE_CHECK | Yilun Chong | 2018-07-12 | 1 | -1/+1 | |
| |/ / / / | ||||||
* / / / / | Added a link for another Clojure protobuf project (#4906) | Duncan McGreggor | 2018-07-12 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Check the message to be encoded is the wrong type. (#4885) | Paul Yang | 2018-07-12 | 2 | -0/+17 | |
| | | | | ||||||
* | | | | Add Python 3.7 compatibility (#4862) | Ben Webb | 2018-07-12 | 5 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Compilation of Python wrappers fails with Python 3.7 because the Python folks changed their C API such that PyUnicode_AsUTF8AndSize() now returns a const char* rather than a char*. Add a patch to work around. Relates #4086. | |||||
* | | | | Merge pull request #4869 from jtattermusch/csharp_artifact_build | Jan Tattermusch | 2018-07-12 | 2 | -0/+16 | |
|\ \ \ \ | | | | | | | | | | | Add scripts for automated building of C# nuget on Kokoro | |||||
| * | | | | add scripts for automated building of C# nuget on Kokoro | Jan Tattermusch | 2018-07-12 | 2 | -0/+16 | |
|/ / / / | ||||||
* | | | | Merge pull request #4899 from xfxyjwf/kokoro | Feng Xiao | 2018-07-11 | 10 | -19/+19 | |
|\ \ \ \ | | | | | | | | | | | Make ruby release configs consistent with protoc. | |||||
| * | | | | Make ruby release configs consistent with protoc. | Feng Xiao | 2018-07-11 | 10 | -19/+19 | |
|/ / / / | ||||||
* | | | | objectivec: Quash -Wself-assign and -Wvla (#4897) | Benjamin Barenblat | 2018-07-11 | 2 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * objectivec: Quash -Wself-assign * objectivec: Set -Wno-vla when building Objective-C protobuf uses VLAs for performance reasons. Ensure Clang doesn’t complain about them. | |||||
* | | | | Merge pull request #4888 from chronoxor/master | Feng Xiao | 2018-07-10 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | OnShutdownDelete shadowing issue | |||||
| * | | | | OnShutdownDelete shadowing issue | Ivan Shynkarenka | 2018-07-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | https://github.com/google/protobuf/issues/4887 | |||||
* | | | | | Merge pull request #4889 from hesmar/hesmar/cmakeFixProtobufConfig | Feng Xiao | 2018-07-10 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | protobuf_generate(): add relative path to output dir | |||||
| * | | | | protobuf_generate(): add relative path to output dir | Markus Heß | 2018-07-10 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, protobuf_generate() sets the variable _generated_srcs to ${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir}/${_basename}${_ext} but generates the files in ${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext} | |||||
* | | | | add JSON_UNESCAPED_UNICODE option (#4191) | 吕海涛 | 2018-07-09 | 2 | -2/+2 | |
| | | | | ||||||
* | | | | Enable ignoring unknown in json parsing in php (#4839) | Paul Yang | 2018-07-09 | 16 | -218/+386 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Enable ignoring unknown in json parsing in php * Update generated descriptor files * Update failure list for other languages. * Remove unnecessary php files | |||||
* | | | | implement IComparable and comparison operators on Timestamp (#4318) | Warren Falk | 2018-07-09 | 2 | -1/+205 | |
| | | | | ||||||
* | | | | Merge pull request #4876 from BSBandme/fix_cpp_benchmark | Yilun Chong | 2018-07-09 | 2 | -2/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix cpp benchmark dependency on mac | |||||
| * | | | | Fix cpp_distcheck | BSBandme | 2018-07-09 | 1 | -2/+0 | |
| | | | | | ||||||
| * | | | | Fix cpp benchmark dependency on mac | BSBandme | 2018-07-06 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #4882 from google/3.6.x | Adam Cozzette | 2018-07-09 | 11 | -319/+132 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | Merge 3.6.x into master |