Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't expose gson exceptions in JsonFormat. | Feng Xiao | 2017-03-09 | 2 | -3/+52 |
* | Merge pull request #2810 from xfxyjwf/i1994 | Feng Xiao | 2017-03-09 | 1 | -4/+22 |
|\ | |||||
| * | Avoid redundant type casts for oneof bytes fields. | Feng Xiao | 2017-03-08 | 1 | -4/+22 |
* | | Merge pull request #2775 from xfxyjwf/fixmajor | Feng Xiao | 2017-03-09 | 2 | -1/+14 |
|\ \ | |||||
| * | | Undef major/minor if they are defined as macro. | Feng Xiao | 2017-02-28 | 2 | -1/+14 |
* | | | Merge pull request #2814 from pherl/javadeprecate | Jisi Liu | 2017-03-09 | 3 | -10/+28 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add annotations for deprecated messages in Java | Jisi Liu | 2017-03-09 | 3 | -10/+28 |
* | | | Merge pull request #2602 from GreatFruitOmsk/issue-2428 | Feng Xiao | 2017-03-08 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | Update AbstractMessage.java | goorov | 2017-01-13 | 1 | -1/+1 |
| * | | | Update AbstractMessage.java | goorov | 2017-01-12 | 1 | -1/+4 |
* | | | | Fix Bad Link for Common Lisp | Jie Luo | 2017-03-08 | 1 | -1/+1 |
* | | | | Rename encode/decode to serializeToString/mergeFromString (#2795) | Paul Yang | 2017-03-08 | 14 | -62/+314 |
* | | | | Merge pull request #2793 from keveman/master | Feng Xiao | 2017-03-07 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Removed a stray return statement, causing compilation error. | Manjunath Kudlur | 2017-03-06 | 1 | -1/+0 |
* | | | | | Merge pull request #2613 from aausch/fix_memory_leak | Jisi Liu | 2017-03-06 | 1 | -1/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | cache generated classes, optimization and quick workaround to memory leak | Alex Ausch | 2017-01-30 | 1 | -1/+8 |
* | | | | | Detect if Descriptor.cs changes for csharp | Jie Luo | 2017-03-06 | 4 | -1/+145 |
|\ \ \ \ \ | |||||
| * | | | | | Detect if Descriptor.cs changes for csharp | Jie Luo | 2017-03-02 | 4 | -1/+145 |
* | | | | | | Merge pull request #2751 from keveman/master | Feng Xiao | 2017-03-06 | 1 | -9/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added comment explaining the protobuf_headers target. | Manjunath Kudlur | 2017-03-02 | 1 | -0/+4 |
| * | | | | | | Added a header only cc_library target for the protobuf library. | Manjunath Kudlur | 2017-02-23 | 1 | -9/+17 |
* | | | | | | | Merge pull request #2784 from acozzette/log-2-floor-int | Adam Cozzette | 2017-03-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Return uint32 from Log2FloorNonZero64 | Adam Cozzette | 2017-03-02 | 1 | -1/+1 |
* | | | | | | | Merge pull request #2755 from xfxyjwf/rubycomp | Feng Xiao | 2017-03-02 | 11 | -1/+2009 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add Ruby compatibilty test against 3.0.0. | Feng Xiao | 2017-02-27 | 11 | -1/+2009 |
* | | | | | | | | Merge pull request #2785 from thomasvl/threading_race | Thomas Van Lenten | 2017-03-02 | 4 | -9/+46 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Handing threading race resolving methods. | Thomas Van Lenten | 2017-03-02 | 4 | -9/+46 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2774 from acozzette/closure-builder | Adam Cozzette | 2017-03-02 | 4 | -3/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript | Adam Cozzette | 2017-03-01 | 4 | -3/+32 |
* | | | | | | | | Disable static analyzer for message semaphore creation (#2748) | Sergio Campamá | 2017-03-01 | 1 | -0/+8 |
* | | | | | | | | Fix gcc 4.1 build (#1035) (#1913) | Matt Hauck | 2017-03-01 | 3 | -19/+31 |
* | | | | | | | | Change hint type to `const void*` (#2568) | Matt Hauck | 2017-03-01 | 1 | -1/+1 |
* | | | | | | | | Add mergeFrom method on Message (#2766) | Paul Yang | 2017-03-01 | 11 | -7/+439 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2674 from acozzette/js-test-cleanup | Adam Cozzette | 2017-03-01 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Removed log statement from writer_test.js | Adam Cozzette | 2017-02-28 | 1 | -2/+0 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2770 from xfxyjwf/fixcmake | Jisi Liu | 2017-02-28 | 14 | -410/+410 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove the use of C++11 features. | Feng Xiao | 2017-02-27 | 14 | -410/+410 |
* | | | | | | | Merge pull request #2772 from sschuberth/master | Feng Xiao | 2017-02-28 | 9 | -15/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Prefer the term "3-Clause BSD License" over "New BSD License" | Sebastian Schuberth | 2017-02-28 | 9 | -11/+11 |
| * | | | | | | | Fix links to the New BSD License in meta-data | Sebastian Schuberth | 2017-02-28 | 5 | -7/+7 |
* | | | | | | | | There might be duplicated enum values when allow_alias is true. Add Preferred... | Jie Luo | 2017-02-28 | 6 | -94/+250 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2733 from wmamrak/patch-1 | Adam Cozzette | 2017-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Disable MSVC warning C4309 | Wojciech Mamrak | 2017-02-18 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #2729 from MarcelRaad/fix_inline_msvc12 | Adam Cozzette | 2017-02-27 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix unresolved symbols with MSVC12 and /Zc:inline | Marcel Raad | 2017-02-17 | 1 | -6/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #2355 from xfxyjwf/fixjson | Feng Xiao | 2017-02-24 | 2 | -14/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Speed up JSON parsing. | Feng Xiao | 2016-11-10 | 2 | -14/+20 |
* | | | | | | | | Merge pull request #2732 from AsturaPhoenix/master | Adam Cozzette | 2017-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | const FieldDescriptorCompare | Ross Wang | 2017-02-17 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #2747 from liutikas/master | Adam Cozzette | 2017-02-24 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ |