Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3901 from wijagels/master | Feng Xiao | 2018-06-11 | 2 | -28/+28 |
|\ | |||||
| * | Stop unused parameter warnings for generated code in RegisteredArenaDtor | William Jagels | 2017-11-16 | 2 | -28/+28 |
* | | import inspect (#3507) | cclauss | 2018-06-11 | 1 | -0/+3 |
* | | Merge pull request #4725 from ThomasColthurst/patch-2 | Feng Xiao | 2018-06-09 | 1 | -1/+0 |
|\ \ | |||||
| * | | Remove cycle in dependency graph | Thomas Colthurst | 2018-06-04 | 1 | -1/+0 |
* | | | Align Bazel on Windows with CMake's MSVC flags (#4720) | Loo Rong Jie | 2018-06-05 | 1 | -12/+34 |
* | | | Update code to work for Xcode 10b1 (#4729) | Sergio Campamá | 2018-06-05 | 5 | -10/+9 |
|/ / | |||||
* | | Merge pull request #4699 from BSBandme/add_proto2_to_proto3_plugin | Yilun Chong | 2018-06-04 | 7 | -46/+356 |
|\ \ | |||||
| * | | Fix | Yilun Chong | 2018-06-04 | 3 | -29/+36 |
| * | | Add proto2 to proto3 util | Yilun Chong | 2018-05-30 | 7 | -46/+349 |
* | | | Merge pull request #4698 from ThomasColthurst/proto_c_api | Feng Xiao | 2018-06-03 | 6 | -1/+148 |
|\ \ \ | |||||
| * | | | Introduce Proto C API; based on cl/198113115 by amauryfa | Thomas Colthurst | 2018-05-30 | 6 | -1/+148 |
* | | | | Merge pull request #4714 from dcarp/reference_protobuf_d | Feng Xiao | 2018-06-03 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Add reference to protobuf-d | Dragos Carp | 2018-06-02 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Remove js_embed binary. (#4709) | Feng Xiao | 2018-06-01 | 6 | -161/+226 |
* | | | | Merge pull request #4710 from jtattermusch/upport_4706 | Adam Cozzette | 2018-06-01 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Require C++11 and pass -std=c++11 | Adam Cozzette | 2018-06-01 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #4703 from acozzette/thread-safety-annotations | Adam Cozzette | 2018-05-31 | 1 | -3/+17 |
|\ \ \ \ | |||||
| * | | | | Added Clang thread-safety annotations in mutex.h | Adam Cozzette | 2018-05-30 | 1 | -3/+17 |
|/ / / / | |||||
* | | | | Merge pull request #4676 from acozzette/update-changelog-script | Adam Cozzette | 2018-05-30 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | Updated generate_changelog.py | Adam Cozzette | 2018-05-24 | 1 | -3/+2 |
* | | | | | Merge pull request #4643 from acozzette/merge-3-5-x | Adam Cozzette | 2018-05-30 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch '3.5.x' into merge-3-5-x | Adam Cozzette | 2018-05-17 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #4572 from jozefizso/fix/4494_compilation_error_c4146 | Feng Xiao | 2018-04-27 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Using binary one's complement to negate an unsigned int | Jozef Izso | 2018-04-27 | 1 | -2/+2 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #4398 from pherl/catlog3.5 | Jisi Liu | 2018-03-19 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Cat the test-suite.log on errors for presubits | Jisi Liu | 2018-03-19 | 1 | -1/+1 |
| | |/ / / / / | |||||
| | * | | | | | Bump version number to 3.5.2v3.5.2 | Bo Yang | 2018-03-05 | 13 | -15/+31 |
| | * | | | | | Fix setup.py for windows build. | Bo Yang | 2018-03-05 | 1 | -4/+22 |
* | | | | | | | Move methods out of class (#4697) | Paul Yang | 2018-05-29 | 2 | -15/+26 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Fix php memory leak test (#4692) | Paul Yang | 2018-05-29 | 2 | -4/+18 |
* | | | | | | [ObjC] Add ability to introspect list of enum values (#4678) | leovitch | 2018-05-29 | 4 | -14/+119 |
* | | | | | | Add back GeneratedClassName to public (#4686) | Paul Yang | 2018-05-25 | 1 | -0/+10 |
* | | | | | | Merge pull request #4677 from xfxyjwf/bazel | Feng Xiao | 2018-05-24 | 4 | -22/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove jruby badge from our README.md. | Feng Xiao | 2018-05-24 | 1 | -1/+1 |
| * | | | | | | Delete jruby kokoro tests. | Feng Xiao | 2018-05-24 | 3 | -21/+0 |
* | | | | | | | Merge pull request #4659 from calder/bazel-python-namespace-fix | Feng Xiao | 2018-05-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Declare 'google' namespace when importing Python protobuf via Bazel. | Calder Coalson | 2018-05-22 | 1 | -0/+1 |
* | | | | | | | Merge pull request #4674 from xfxyjwf/bazel | Feng Xiao | 2018-05-24 | 3 | -0/+19 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Add kokoro configs for bazel build. | Feng Xiao | 2018-05-24 | 3 | -0/+19 |
* | | | | | | | Fix array constructor in c extension for compatibility (#4667) | Paul Yang | 2018-05-24 | 1 | -3/+3 |
* | | | | | | | PHP namespaces for nested messages and enums (#4536) | Brent Shaffer | 2018-05-24 | 77 | -657/+1477 |
* | | | | | | | Implement array constructor in php c extension. | Bo Yang | 2018-05-24 | 3 | -85/+173 |
* | | | | | | | PHP array constructors for protobuf messages (#4530) | Brent Shaffer | 2018-05-24 | 31 | -161/+1082 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4669 from jtattermusch/fix_bazel_build_syntax | Feng Xiao | 2018-05-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fix syntax error in BUILD file | Jan Tattermusch | 2018-05-24 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #4663 from TeBoring/ruby-distcheck | Feng Xiao | 2018-05-22 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Add missing ruby/tests/test_ruby_package.proto | Bo Yang | 2018-05-22 | 1 | -0/+1 |
* | | | | | | CMake OSX rpath management (#4620) | Mizux | 2018-05-22 | 2 | -1/+19 |
* | | | | | | Merge pull request #4660 from BSBandme/fix_kokoro_benchmark_build | Yilun Chong | 2018-05-22 | 1 | -6/+6 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | |