Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix python descriptor test. | Jisi Liu | 2017-12-14 | 1 | -0/+13 |
| | |||||
* | Add deprecation annotation for oneof case. | Jisi Liu | 2017-12-13 | 3 | -11/+21 |
| | |||||
* | Merge pull request #4036 from xfxyjwf/issue3093 | Feng Xiao | 2017-12-12 | 3 | -3/+9 |
|\ | | | | | Update comments for Timestamp JSON format. | ||||
| * | Update generated code. | Feng Xiao | 2017-12-12 | 2 | -2/+6 |
| | | |||||
| * | Update comments for Timestamp JSON format. | Feng Xiao | 2017-12-12 | 1 | -1/+3 |
| | | | | | | | | | | | | | | Clarify that JSON parser are required to accept both UTC and other timezone offsets. Fixes issue 3093 | ||||
* | | Merge pull request #4016 from jquesnelle/string-access-ub | Jisi Liu | 2017-12-12 | 1 | -4/+5 |
|\ \ | | | | | | | fix undefined behavior in C++03 | ||||
| * | | use const char* instead of const std::string& in normalize() | Jeffrey Quesnelle | 2017-12-07 | 1 | -5/+5 |
| | | | |||||
| * | | fix undefined behavior in C++03 | Jeffrey Quesnelle | 2017-12-07 | 1 | -4/+5 |
| | | | |||||
* | | | Merge pull request #2834 from aj-michael/master | Jisi Liu | 2017-12-12 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | Make //:protobuf_python have correct __init__.py. | ||||
| * | | Make //:protobuf_python have correct __init__.py. | Adam Michael | 2017-03-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | Previously //:protobuf_python set no __init__.py so Bazel created an empty one. This change makes it use the __init__.py from the repository. | ||||
* | | | Regenerated code from previous C# codegen commit | Jon Skeet | 2017-12-09 | 6 | -34/+34 |
| | | | | | | | | | | | | | | | | | | With this in place, all tests should pass. Fixes #3725. | ||||
* | | | C# code generation changes to use bitwise comparisons for doubles | Jon Skeet | 2017-12-09 | 2 | -12/+30 |
| | | | |||||
* | | | Compare floating point values bitwise in C# | Jon Skeet | 2017-12-09 | 11 | -14/+405 |
| | | | | | | | | | | | | | | | This is the manual code part of the Google.Protobuf library, and tests. Some tests will fail until codegen is changed and rerun. | ||||
* | | | Merge pull request #4007 from graywolf/patch-1 | Adam Cozzette | 2017-12-08 | 1 | -4/+0 |
|\ \ \ | | | | | | | | | --pre is not necessary | ||||
| * | | | --pre is not necessary | W | 2017-12-06 | 1 | -4/+0 |
| | |/ | |/| | | | | --pre was not necessary to install google-protobuf when I tried it today (2017-12-06). | ||||
* | | | Merge pull request #4000 from Kwizatz/master | Adam Cozzette | 2017-12-08 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Using binary one's complement to negate an unsigned int | ||||
| * | | | Using binary one's complement to negate an unsigned int | Rodrigo Hernandez | 2017-12-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a Visual Studio warning: warning C4146: unary minus operator applied to unsigned type, result still unsigned. | ||||
* | | | | Merge pull request #4017 from acozzette/update-file-lists | Adam Cozzette | 2017-12-08 | 2 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Ran update_file_lists.sh to update Bazel and CMake file lists | ||||
| * | | | | Ran update_file_lists.sh to update Bazel and CMake file lists | Adam Cozzette | 2017-12-07 | 2 | -0/+2 |
| | |/ / | |/| | | | | | | | | | | | | | | This should fix Bazel builds, since those were missing a new file (implicit_weak_message.cc). | ||||
* | | | | Merge pull request #4018 from acozzette/android-portable-log2-floor | Adam Cozzette | 2017-12-08 | 1 | -4/+12 |
|\ \ \ \ | |/ / / |/| | | | Use the portable version of Log2Floor for Clang with older Android NDK versions | ||||
| * | | | Use the portable version of Log2Floor for Clang with older Android NDK versions | Adam Cozzette | 2017-12-07 | 1 | -4/+12 |
|/ / / | | | | | | | | | | | | | This is necessary for avoiding a strange compiler error that we have already run into with older versions of Clang on NaCl. | ||||
* | | | Merge pull request #3988 from acozzette/down-integrate | Adam Cozzette | 2017-12-05 | 142 | -3270/+4456 |
|\ \ \ | | | | | | | | | Integrated internal changes from Google | ||||
| * | | | Fixed failing JS tests | Adam Cozzette | 2017-12-05 | 4 | -11/+3 |
| | | | | |||||
| * | | | Updated conformance failure lists | Adam Cozzette | 2017-12-04 | 3 | -9/+0 |
| | | | | |||||
| * | | | Updated Makefile.am to add a new file to EXTRA_DIST | Adam Cozzette | 2017-12-01 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 135 | -5818/+2910 |
| |\ \ \ | |||||
| * | | | | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 143 | -3272/+4483 |
| | | | | | |||||
* | | | | | Merge pull request #3926 from BSBandme/down_sync_benchmark | Yilun Chong | 2017-12-05 | 29 | -464/+8661 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Sync benchmark changes from internal | ||||
| * | | | | Fix bugs to pass tests | Yilun Chong | 2017-12-04 | 2 | -8/+13 |
| | | | | | |||||
| * | | | | Sync internal benchmark changes | Yilun Chong | 2017-12-01 | 28 | -459/+8651 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3968 from fahhem/patch-2 | Feng Xiao | 2017-12-04 | 2 | -0/+14 |
|\ \ \ \ | | | | | | | | | | | Add a check_version() for use in WORKSPACEs | ||||
| * | | | | Add a check_protobuf_required_bazel_version() for use in WORKSPACEs | Fahrzin Hemmati | 2017-12-04 | 2 | -0/+14 |
| | | | | | |||||
* | | | | | Remove Xcode directives on some configs. | Thomas Van Lenten | 2017-12-04 | 1 | -8/+0 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis changed their default image: https://blog.travis-ci.com/2017-11-21-xcode8-3-default-image-announce So there is no need to set a specific image any more, and the non apple language tests should be able to use the default images. | ||||
* | | | | Merge pull request #3979 from acozzette/3.5.x-merge | Adam Cozzette | 2017-12-01 | 56 | -252/+291 |
|\ \ \ \ | |/ / / |/| | | | Merge 3.5.x branch into master | ||||
| * | | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 56 | -252/+291 |
|/| | | | |||||
| * | | | Remove duplicate typedef. (#3975) | Paul Yang | 2017-11-30 | 1 | -19/+7 |
| | | | | |||||
| * | | | Provide discardUnknonwnFields API in php (#3976) | Paul Yang | 2017-11-30 | 5 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Provide discardUnknownFields API in php implementation * Provide discardUnknownFields API in php c extension. | ||||
| * | | | Update version for 3.5.0.post1 | Jisi Liu | 2017-11-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #3941 from google/anandolee-patch-2 | Jisi Liu | 2017-11-22 | 1 | -1/+10 |
| |\ \ \ | | | | | | | | | | | Add _file_desc_by_toplevel_extension back | ||||
| | * | | | Add _file_desc_by_toplevel_extension back | Jie Luo | 2017-11-22 | 1 | -1/+10 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | Add _file_desc_by_toplevel_extension back for compatibility issue with 3.4.1. _file_desc_by_toplevel_extension is a temporary solution for FieldDescriptor.file. FieldDescriptor.file was added in code gen. However, we need to keep it for some time for compatibility reason (with 3.4.1 only). May try to remove it after 2 years. | ||||
| * | | | Update version number for php c extension (#3896) | Paul Yang | 2017-11-15 | 2 | -4/+20 |
| | | | | |||||
| * | | | Merge pull request #3895 from pherl/3.5.x | Jisi Liu | 2017-11-15 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Add protobuf-all in post release | ||||
| | * | | | Add protobuf-all in post release | Jisi Liu | 2017-11-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use fully qualifed name for DescriptorPool in Any.php to avoid name (#3886) | Paul Yang | 2017-11-15 | 1 | -4/+3 |
| |/ / / | | | | | | | | | conflict | ||||
| * | | | Update protoc-artfacts | Jisi Liu | 2017-11-13 | 1 | -5/+6 |
| | | | | |||||
| * | | | Merge branch '3.5.x' of github.com:google/protobuf into 3.5.x | Jisi Liu | 2017-11-13 | 5 | -9/+67 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #3868 from pherl/3.5.xv3.5.0 | Jisi Liu | 2017-11-13 | 13 | -29/+22 |
| | |\ \ \ | | | | | | | | | | | | | Support win32 long path for cross compiled build | ||||
| | * | | | | 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 | ||||
| | | * | | | | update changelog | Jan Tattermusch | 2017-11-10 | 1 | -0/+1 |
| | |/ / / / |