Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Down-integrate internal changes to github. | Bo Yang | 2016-12-19 | 112 | -3044/+5638 |
|\ | |||||
| * | Down-integrate internal changes to github. | Bo Yang | 2016-12-19 | 114 | -3052/+5658 |
* | | Merge pull request #2517 from acozzette/js-embed | Adam Cozzette | 2016-12-19 | 6 | -325/+35 |
|\ \ | |||||
| * | | Fixed "make check" for cmake build | Adam Cozzette | 2016-12-19 | 1 | -0/+1 |
| * | | Auto-generate well_known_types_embed.cc | Adam Cozzette | 2016-12-19 | 5 | -325/+34 |
|/ / | |||||
* | | Merge pull request #2227 from KindDragon/3.1.x | Feng Xiao | 2016-12-16 | 4 | -41/+43 |
|\ \ | |||||
| * | | LIBPROTOC_EXPORT added to others functions in csharp_names.h and objectivec_h... | Arkadiy Shapkin | 2016-12-01 | 2 | -33/+33 |
| * | | Missed LIBPROTOC_EXPORT for GRPC added | Arkadiy Shapkin | 2016-12-01 | 4 | -8/+10 |
* | | | Give C# ByteString a sensible GetHashCode implementation. | Jon Skeet | 2016-12-16 | 2 | -1/+14 |
* | | | Merge pull request #2499 from ckennelly/master | Adam Cozzette | 2016-12-15 | 2 | -2/+11 |
|\ \ \ | |||||
| * | | | Define LANG_CXX11 for port.h and use this to guard C++11 features. | Chris Kennelly | 2016-12-14 | 2 | -2/+11 |
|/ / / | |||||
* | | | Merge pull request #2495 from acozzette/android-hash | Adam Cozzette | 2016-12-14 | 2 | -9/+3 |
|\ \ \ | |||||
| * | | | Removed Android-specific code from stubs/hash.h | Adam Cozzette | 2016-12-13 | 2 | -9/+3 |
* | | | | Merge pull request #2498 from sergiocampama/enum | Thomas Van Lenten | 2016-12-14 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Fixes and expands comments on how to use GPB_ENUM_FWD_DECLARE | Sergio Campama | 2016-12-14 | 1 | -1/+5 |
|/ / / / | |||||
* | | | | Added conformance testing for binary primitive types. (#2491) | Joshua Haberman | 2016-12-13 | 2 | -37/+162 |
* | | | | Merge pull request #2496 from xyzzyz/fix-overflow | Feng Xiao | 2016-12-13 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix integer overflow in FastUInt32ToBufferLeft | Adam Michalik | 2016-12-13 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2493 from jbrianceau/add-missing-climits-include | Feng Xiao | 2016-12-13 | 3 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | Add missing include in embed.cc | Julien Brianceau | 2016-12-13 | 1 | -0/+1 |
| * | | | | Add missing includes | Julien Brianceau | 2016-12-13 | 2 | -0/+2 |
* | | | | | Merge pull request #2484 from ngg/uwp_build | Feng Xiao | 2016-12-13 | 16 | -94/+95 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add support for Windows ARM builds | Gergely Nagy | 2016-12-12 | 16 | -94/+95 |
* | | | | | Merge pull request #2487 from jtattermusch/csharp_leading_whitespace | Jan Tattermusch | 2016-12-13 | 19 | -1059/+1059 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | remove leading whitespace in C# xml comments | Jan Tattermusch | 2016-12-12 | 19 | -1059/+1059 |
* | | | | | Merge pull request #2471 from jbrianceau/fix-include-style | Feng Xiao | 2016-12-12 | 3 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix #include in cc files | Julien Brianceau | 2016-12-09 | 3 | -3/+3 |
* | | | | | | Merge pull request #2490 from xfxyjwf/icon2 | Jisi Liu | 2016-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add a badge for bazel build status. | Feng Xiao | 2016-12-12 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2454 from pongad/go_package | Feng Xiao | 2016-12-12 | 3 | -8/+10 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | update descriptor.proto's go_package | Michael Darakananda | 2016-12-07 | 3 | -8/+10 |
| | |_|/ | |/| | | |||||
* | | | | generate_changelog.py: flush output so piping works correctly. | Josh Haberman | 2016-12-09 | 1 | -0/+1 |
* | | | | Merge pull request #2476 from acozzette/generated-message-reflection-fix | Adam Cozzette | 2016-12-09 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macro | Adam Cozzette | 2016-12-09 | 1 | -4/+4 |
* | | | | | Merge pull request #2475 from sergiocampama/rvm2 | Thomas Van Lenten | 2016-12-09 | 2 | -13/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Reenable cocoapods objc test and remove unnecessary workaround for rvm | Sergio Campama | 2016-12-09 | 2 | -13/+0 |
|/ / / / | |||||
* | | | | Merge pull request #2473 from thomasvl/update_xcodes | Thomas Van Lenten | 2016-12-09 | 3 | -10/+43 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Mark objectivec_cocoapods_integration as failing | Thomas Van Lenten | 2016-12-09 | 1 | -0/+4 |
| * | | | Skip benchmark test if cmake isn't installed. | Thomas Van Lenten | 2016-12-09 | 1 | -5/+15 |
| * | | | Xcode 8.1 support | Thomas Van Lenten | 2016-12-09 | 3 | -6/+25 |
* | | | | Merge pull request #2468 from sergei-ivanov/patch-1 | Feng Xiao | 2016-12-08 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Update third_party.md | Sergei Ivanov | 2016-12-09 | 1 | -2/+2 |
* | | | | | Disable jruby test. (#2469) | Paul Yang | 2016-12-08 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Update commit id in Dockerfile to trigger update. (#2467) | Paul Yang | 2016-12-08 | 4 | -9/+16 |
* | | | | Merge pull request #2462 from jbrianceau/fix-comp-builds-part2 | Feng Xiao | 2016-12-08 | 13 | -91/+94 |
|\ \ \ \ | |||||
| * | | | | Regenerate descriptor proto | Julien Brianceau | 2016-12-08 | 12 | -88/+88 |
| * | | | | C++: export _xxx_default_instance_ symbols | Julien Brianceau | 2016-12-08 | 1 | -3/+6 |
* | | | | | Merge pull request #2461 from jbrianceau/add-missing-include-in-embed-cc | Feng Xiao | 2016-12-08 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Add missing include in embed.cc | Julien Brianceau | 2016-12-08 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #2394 from cwelton/formatting | Feng Xiao | 2016-12-08 | 2 | -6/+30 |
|\ \ \ \ \ |