Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
* | | | | Merge pull request #2382 from zhsyourai/master | Adam Cozzette | 2016-11-17 | 1 | -4/+4 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Add LL to large constant | zhsyourai | 2016-11-18 | 1 | -4/+4 | |
|/ / / | ||||||
* | | | Rename Empty to GPBEmpty in php generated file. | Paul Yang | 2016-11-16 | 8 | -8/+84 | |
* | | | Merge pull request #2362 from wujingchao/patch-1 | Adam Cozzette | 2016-11-16 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Class is final but declares protected field | wujingchao | 2016-11-14 | 1 | -2/+2 | |
* | | | | Merge pull request #2378 from ianfhunter/patch-1 | Adam Cozzette | 2016-11-16 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | typo | Ian Hunter | 2016-11-16 | 1 | -1/+1 | |
* | | | | | Merge pull request #2367 from jbrianceau/add-missing-include-in-message-lite-cc | Adam Cozzette | 2016-11-16 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add missing include in message_lite.cc | Julien Brianceau | 2016-11-14 | 1 | -0/+1 | |
* | | | | | Fix jenkins tests. | Feng Xiao | 2016-11-15 | 2 | -1/+5 | |
* | | | | | Merge pull request #2323 from marcinwyszynski/master | Joshua Haberman | 2016-11-15 | 2 | -0/+54 | |
|\ \ \ \ \ | ||||||
| * | | | | | Move variable declarations before actual code | Marcin Wyszynski | 2016-11-14 | 1 | -2/+2 | |
| * | | | | | Fix copy pasta in test | Marcin Wyszynski | 2016-11-03 | 1 | -1/+1 | |
| * | | | | | More Ruby-eqsue interface | Marcin Wyszynski | 2016-11-03 | 2 | -0/+54 | |
* | | | | | | Merge pull request #1907 from evokly/js-utf8-fix | Joshua Haberman | 2016-11-15 | 3 | -18/+71 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | JS: Well, this is the right place for surrogates. | Wojciech Mandrysz | 2016-11-15 | 1 | -9/+11 | |
| * | | | | | | JS: Re-added comment, moved surrogates code to the right place | Wojciech Mandrysz | 2016-11-15 | 2 | -9/+10 | |
| * | | | | | | JS: Replaced fromCodePoint/codePointAt with fromCharCode/charCodeAt because o... | Wojciech Mandrysz | 2016-10-10 | 3 | -18/+24 | |
| * | | | | | | JS: Added string encoding/decoding tests for UTF-8 | Wojciech Mandrysz | 2016-10-03 | 1 | -0/+23 | |
| * | | | | | | JS: Fixed UTF-8 string encoder/decoder for high codepoints. | Wojciech Mandrysz | 2016-10-03 | 2 | -15/+36 | |
* | | | | | | | Merge pull request #2366 from jbrianceau/reland-fix-include-js-generator | Feng Xiao | 2016-11-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix #include in js_generator.cc | Julien Brianceau | 2016-11-14 | 1 | -1/+1 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2368 from jbrianceau/fix-json-style-in-project-json | Feng Xiao | 2016-11-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix csharp/src/Google.Protobuf.Test/project.json | Julien Brianceau | 2016-11-14 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2364 from haberman/jslicense | Joshua Haberman | 2016-11-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | |