Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #2429 from thomasvl/issue1833_swift_prefix | Thomas Van Lenten | 2016-11-30 | 4 | -198/+424 | |
|\ \ \ | ||||||
| * | | | Add a swift_prefix file option. | Thomas Van Lenten | 2016-11-30 | 4 | -198/+424 | |
|/ / / | ||||||
* | | | Merge pull request #2403 from google/down-integrate-with-msvc-fix | Adam Cozzette | 2016-11-23 | 297 | -13691/+15542 | |
|\ \ \ | ||||||
| * | | | Fixed Ruby tests for JRuby 1.7 | Adam Cozzette | 2016-11-23 | 1 | -2/+4 | |
| * | | | Updated descriptor_pool.py to be compatible with Python 3 | Adam Cozzette | 2016-11-22 | 1 | -1/+1 | |
| * | | | Add a "u" suffix to tag numbers in generated code | Adam Cozzette | 2016-11-22 | 21 | -276/+334 | |
| * | | | Fixed descriptor_pool_test.py for Python 2.6 | Adam Cozzette | 2016-11-22 | 1 | -1/+1 | |
| * | | | Updated failure_list_java.txt for Java conformance test | Adam Cozzette | 2016-11-22 | 1 | -1/+0 | |
| * | | | Merge pull request #2400 from acozzette/jspb-test-fixes | Adam Cozzette | 2016-11-22 | 7 | -10/+16 | |
| |\ \ \ | ||||||
| | * | | | Added back in binary serialization round-trip in message_test.js | Adam Cozzette | 2016-11-21 | 1 | -0/+7 | |
| | * | | | Fixed remaining JSPB test failures | Adam Cozzette | 2016-11-21 | 5 | -5/+10 | |
| | * | | | Updated message_test.js so that it does not depend on fromObject | Adam Cozzette | 2016-11-21 | 1 | -7/+1 | |
| | * | | | Updated enum names in test.proto to avoid conflicting with testbinary.proto | Adam Cozzette | 2016-11-21 | 1 | -3/+3 | |
| * | | | | Merge pull request #2392 from xfxyjwf/fixdown | Feng Xiao | 2016-11-21 | 4 | -18/+60 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Restore jenkins files. | Feng Xiao | 2016-11-18 | 4 | -18/+60 | |
| |/ / / | ||||||
| * | | | Update EXTRA_DIST lists. | Feng Xiao | 2016-11-18 | 2 | -1/+4 | |
| * | | | Update conformance failure lists. | Feng Xiao | 2016-11-18 | 2 | -12/+0 | |
| * | | | Add back missing LIBPROTOBUF_EXPORT. | Feng Xiao | 2016-11-17 | 1 | -1/+1 | |
| * | | | Updated libprotoc.cmake | Adam Cozzette | 2016-11-17 | 1 | -0/+1 | |
| * | | | Merge branch 'master' into down-integrate-with-msvc-fix | Adam Cozzette | 2016-11-17 | 82 | -759/+1668 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| * | | | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 286 | -13531/+15271 | |
* | | | | Merge pull request #2404 from wiktortomczak/master | Feng Xiao | 2016-11-22 | 1 | -0/+12 | |
|\ \ \ \ | ||||||
| * | | | | Support grpc plugin in py_proto_library | Wiktor Tomczak | 2016-11-22 | 1 | -0/+12 | |
|/ / / / | ||||||
* | | | | Merge pull request #2398 from jbrianceau/no-static-init-define-fix | Feng Xiao | 2016-11-21 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | C++: Fix use with GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER | Julien Brianceau | 2016-11-21 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2383 from snapsam/patch-1 | Adam Cozzette | 2016-11-17 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Update README.md | Samuel Rossoff (of The Ebon Blade) | 2016-11-17 | 1 | -1/+1 |