Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | oneOf fix for JsonFormat includingDefaultValueFields | Caleb Welton | 2016-12-05 | 2 | -6/+30 | |
* | | | | | | Make php generated code conform to PSR-4. (#2435) | Paul Yang | 2016-12-08 | 63 | -5231/+6509 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #2466 from thomasvl/deprecation_followup | Thomas Van Lenten | 2016-12-08 | 11 | -6/+216 | |
|\ \ \ \ \ | ||||||
| * | | | | | Improve ObjC deprecated annotation support. | Thomas Van Lenten | 2016-12-08 | 11 | -6/+216 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #2460 from sergiocampama/c11 | Feng Xiao | 2016-12-08 | 2 | -0/+984 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Include -std=c++11 when compiling protobuf if available. | Sergio Campama | 2016-12-07 | 2 | -0/+984 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2459 from acozzette/android-logging | Adam Cozzette | 2016-12-07 | 1 | -2/+11 | |
|\ \ \ \ | ||||||
| * | | | | Send all protobuf logging to logcat by default on Android | Adam Cozzette | 2016-12-07 | 1 | -2/+11 | |
|/ / / / | ||||||
* | | | | Ruby: removed redundant RepeatedField#slice. (#2449) | Joshua Haberman | 2016-12-07 | 1 | -1/+1 | |
* | | | | Merge pull request #2407 from jbrianceau/fix-comp-builds | Feng Xiao | 2016-12-07 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Export symbols used in inline functions | Julien Brianceau | 2016-12-07 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2437 from xfxyjwf/plugin | Feng Xiao | 2016-12-06 | 10 | -41/+1058 | |
|\ \ \ | ||||||
| * | | | Add version number to plugin protocol. | Feng Xiao | 2016-12-05 | 10 | -41/+1058 | |
* | | | | Merge pull request #2445 from ramrunner/master | Feng Xiao | 2016-12-05 | 1 | -1/+5 | |
|\ \ \ \ | ||||||
| * | | | | when on OpenBSD we include the correct headers for endianess and check the ap... | ramrunner | 2016-12-05 | 1 | -1/+5 | |
* | | | | | Merge pull request #2442 from pherl/fix-bazel | Jisi Liu | 2016-12-05 | 2 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add missing files. | Jisi Liu | 2016-12-05 | 2 | -0/+2 | |
|/ / / / / | ||||||
* | / / / | Factored Conformance and Benchmark test messages into shared test schema. (#1... | Joshua Haberman | 2016-12-03 | 19 | -3878/+4032 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #2436 from cgrushko/patch-1 | Feng Xiao | 2016-12-02 | 1 | -0/+7 | |
|\ \ \ \ | ||||||
| * | | | | Add a proto_lang_toolchain() for cc_proto_library | cgrushko | 2016-12-02 | 1 | -0/+7 | |
|/ / / / | ||||||
* | | | | Merge pull request #2431 from saintstack/2228v2 | Feng Xiao | 2016-12-02 | 2 | -5/+80 | |
|\ \ \ \ | ||||||
| * | | | | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB to | Michael Stack | 2016-12-01 | 2 | -5/+80 | |
|/ / / / | ||||||
* | | / | Generate phpdoc in php generated files. (#2406) | Paul Yang | 2016-12-01 | 4 | -119/+1229 | |
| |_|/ |/| | |