Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Fixed JavaScript license declaration. | Josh Haberman | 2016-11-14 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2358 from ckennelly/master | Feng Xiao | 2016-11-11 | 1 | -15/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Resolve old TODO for StringTypeHandler. | Chris Kennelly | 2016-11-11 | 1 | -15/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2353 from guptasu/master | Feng Xiao | 2016-11-11 | 3 | -10/+27 | |
|\ \ \ \ \ | ||||||
| * | | | | | Made helper code also consider package name 'proto2' when dealing with Messag... | guptasu | 2016-11-10 | 3 | -10/+27 | |
* | | | | | | Merge pull request #2357 from D3Hunter/master | Feng Xiao | 2016-11-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | #2356 : fix ExceptionInInitializerError on IBM J9 | Time | 2016-11-11 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Fix php c extension on 32-bit machines. (#2348) | Paul Yang | 2016-11-10 | 7 | -17/+187 | |
* | | | | | | Merge pull request #2337 from sergiocampama/deprecation | Feng Xiao | 2016-11-10 | 4 | -116/+120 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fixing references to the removed atomicops_internals_pnacl.h file. | Sergio Campama | 2016-11-10 | 2 | -112/+112 | |
| * | | | | | Renamed the pnacl version of atomicops.h into C11 atomic, and flagged the mac... | Sergio Campama | 2016-11-07 | 2 | -4/+8 | |
* | | | | | | Merge pull request #2332 from Kwizatz/master | Adam Cozzette | 2016-11-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Added explicit cast to avoid size warning on Win64. | Rodrigo Hernandez | 2016-11-04 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2327 from ctubbsii/fix-maven-compiler-plugin | Adam Cozzette | 2016-11-09 | 5 | -14/+77 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use latest maven-compiler-plugin (2.6.0) | Christopher Tubbs | 2016-11-04 | 5 | -14/+77 | |
* | | | | | | | Implement RepeatedFieldIter for c extension. (#2333) | Paul Yang | 2016-11-08 | 5 | -3/+155 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #2329 from acozzette/unused-parameter | Adam Cozzette | 2016-11-04 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix unused parameter warnings in arena_free | Adam Cozzette | 2016-11-04 | 1 | -0/+1 | |
| |/ / / / / |