Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #624 from jskeet/wkt-json | Jan Tattermusch | 2015-07-20 | 3 | -1/+80 | |
|\ \ | ||||||
| * | | First part of JSON formatting for well-known types. I think we need a reflect... | Jon Skeet | 2015-07-20 | 3 | -1/+80 | |
|/ / | ||||||
* | | Merge pull request #620 from google/jtattermusch-patch-2 | Jon Skeet | 2015-07-17 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Fix typo in buildall.sh | Jan Tattermusch | 2015-07-17 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #616 from jskeet/rename | Jan Tattermusch | 2015-07-17 | 101 | -142/+135 | |
|\ \ | ||||||
| * | | Updated csharp_EXTRA_DIST for Travis | Jon Skeet | 2015-07-17 | 1 | -89/+90 | |
| * | | First pass at the big rename from ProtocolBuffers to Google.Protobuf. | Jon Skeet | 2015-07-17 | 100 | -53/+45 | |
|/ / | ||||||
* | | Merge pull request #611 from jskeet/csharp-wrappers | Jon Skeet | 2015-07-17 | 24 | -129/+3516 | |
|\ \ | ||||||
| * | | Fixes from PR review. | Jon Skeet | 2015-07-17 | 4 | -15/+89 | |
| * | | Make the map test actually test the code... | Jon Skeet | 2015-07-16 | 1 | -0/+7 | |
| * | | First pass at wrapper types. | Jon Skeet | 2015-07-16 | 15 | -475/+927 | |
| * | | Fixes to ByteString's equality handling. | Jon Skeet | 2015-07-16 | 2 | -20/+41 | |
| * | | First part of implementing wrapper types. Not ready yet! | Jon Skeet | 2015-07-16 | 13 | -20/+2853 | |
* | | | Merge pull request #586 from jtattermusch/csharp_names_export | Jan Tattermusch | 2015-07-16 | 7 | -5/+84 | |
|\ \ \ | ||||||
| * | | | export c# naming routines publicly | Jan Tattermusch | 2015-07-10 | 7 | -5/+84 | |
* | | | | Merge pull request #612 from jtattermusch/csharp_distcheck_fix | Jie Luo | 2015-07-16 | 1 | -248/+106 | |
|\ \ \ \ | ||||||
| * | | | | updated csharp_EXTRA_DIST | Jan Tattermusch | 2015-07-16 | 1 | -248/+106 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #607 from jtattermusch/csharp_appveyor | Jan Tattermusch | 2015-07-16 | 2 | -7/+34 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | add C# build and tests to appveyor | Jan Tattermusch | 2015-07-15 | 2 | -7/+34 | |
* | | | | Merge pull request #610 from jskeet/fix-enumerator | Jon Skeet | 2015-07-16 | 2 | -63/+6 | |
|\ \ \ \ | ||||||
| * | | | | Remove the struct-based iterator for RepeatedField. | Jon Skeet | 2015-07-16 | 2 | -63/+6 | |
|/ / / / | ||||||
* | | | | Merge pull request #605 from jtattermusch/csharp_cleanup | Jon Skeet | 2015-07-16 | 6 | -10/+5 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | added comment for ByteString.CopyFrom | Jan Tattermusch | 2015-07-15 | 1 | -0/+2 | |
| * | | | C# cleanup - assorted nits | Jan Tattermusch | 2015-07-15 | 5 | -10/+3 | |
|/ / / | ||||||
* | | | Merge pull request #606 from jtattermusch/csharp-experimental-merged | Jon Skeet | 2015-07-16 | 39 | -430/+761 | |
|\ \ \ | ||||||
| * | | | Merge remote-tracking branch 'upstream/master' into csharp-experimental | Jan Tattermusch | 2015-07-15 | 39 | -430/+761 | |
|/| | | | | |/ | |/| | ||||||
| * | | Merge pull request #591 from pherl/fixbuild | Jisi Liu | 2015-07-13 | 1 | -1/+0 | |
| |\ \ | ||||||
| | * | | remove pbconfig from extract script | Jisi Liu | 2015-07-13 | 1 | -1/+0 | |
| |/ / | ||||||
| * | | Merge pull request #588 from haberman/conformance-json | Joshua Haberman | 2015-07-13 | 6 | -52/+263 | |
| |\ \ | ||||||
| | * | | Added support for Json and valid input to conformance tests. | Josh Haberman | 2015-07-10 | 6 | -52/+263 | |
| |/ / | ||||||
| * | | Merge pull request #570 from google/internal-third-party | Paul Yang | 2015-07-09 | 11 | -158/+167 | |
| |\ \ | ||||||
| | * | | Internal local modifications. | Bo Yang | 2015-07-09 | 11 | -158/+167 | |
| |/ / | ||||||
| * | | Merge pull request #575 from haberman/rbleak | Joshua Haberman | 2015-07-08 | 1 | -1/+13 | |
| |\ \ | ||||||
| | * | | Worked around memory leak bug in Ruby interpreter. | Josh Haberman | 2015-07-08 | 1 | -1/+13 | |
| |/ / | ||||||
| * | | Merge pull request #554 from jcanizales/proto-objc-bazel | Paul Yang | 2015-07-06 | 3 | -35/+50 | |
| |\ \ | ||||||
| | * | | Add Bazel target for protobuf ObjC runtime | Jorge Canizales | 2015-07-06 | 3 | -35/+50 | |
| * | | | Merge pull request #500 from TeBoring/temp | Paul Yang | 2015-07-01 | 3 | -62/+94 | |
| |\ \ \ | ||||||
| | * | | | Implement parsing for proto3 primitive repeated fields. Previously, for | Bo Yang | 2015-06-15 | 3 | -62/+94 | |
| * | | | | Merge pull request #551 from ostrovsky/master | Feng Xiao | 2015-07-01 | 6 | -31/+21 | |
| |\ \ \ \ | ||||||
| | * | | | | MinGW64+MSYS2 compilation issues and portable isnan using MathLimits | Karol Ostrovsky | 2015-07-01 | 6 | -31/+21 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Merge pull request #458 from xfxyjwf/memory_leak | Paul Yang | 2015-06-30 | 1 | -0/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | Delete default UnknownFieldSet when shuting down. | Feng Xiao | 2015-06-02 | 1 | -0/+5 | |
| * | | | | | Merge pull request #556 from mgiuca/fix-clang-warning | Feng Xiao | 2015-06-30 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | Fix "sometimes-uninitialized" warning on Windows Clang. | Matt Giuca | 2015-06-30 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #540 from pherl/clean-warnings | Jisi Liu | 2015-06-25 | 3 | -11/+6 | |
| |\ \ \ \ | ||||||
| | * | | | | fix compiler warnings. | Jisi Liu | 2015-06-24 | 3 | -11/+6 | |
| * | | | | | Merge pull request #512 from pherl/bazel | Paul Yang | 2015-06-24 | 4 | -77/+140 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Enable tests for bazel build. | Jisi Liu | 2015-06-18 | 4 | -77/+140 | |
| * | | | | | | Merge pull request #538 from google/jtattermusch-patch-1 | Jisi Liu | 2015-06-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | fix typo in cmake/README.md | Jan Tattermusch | 2015-06-24 | 1 | -1/+1 | |
| |/ / / / / |