Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / / | |||||
* | | | | | Merge pull request #599 from jskeet/no-map-entries | Jon Skeet | 2015-07-15 | 5 | -5779/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Address requested change from code review. | Jon Skeet | 2015-07-15 | 1 | -12/+12 |
| * | | | | | Don't create nested types (or field accessors) for map types. | Jon Skeet | 2015-07-15 | 5 | -5773/+33 |
|/ / / / / | |||||
* | | | | | Merge pull request #594 from jskeet/csharp-wellknowntypes | Jan Tattermusch | 2015-07-15 | 31 | -130/+4808 |
|\ \ \ \ \ | |||||
| * | | | | | Generated code for well-known types | Jon Skeet | 2015-07-14 | 17 | -113/+4763 |
| * | | | | | Generate the well-known types in C# | Jon Skeet | 2015-07-14 | 14 | -17/+45 |
* | | | | | | Merge pull request #593 from jskeet/reflection-namespace | Jon Skeet | 2015-07-14 | 49 | -3355/+3331 |
|\| | | | | | |||||
| * | | | | | Changing reflection namespace (part 4) | Jon Skeet | 2015-07-14 | 8 | -11/+0 |
| * | | | | | Changing reflection namespace (part 3) | Jon Skeet | 2015-07-14 | 12 | -252/+251 |
| * | | | | | Changing reflection namespace (part 2) | Jon Skeet | 2015-07-14 | 7 | -487/+487 |
| * | | | | | Changing reflection namespace (part 1) | Jon Skeet | 2015-07-14 | 32 | -2638/+2626 |
|/ / / / / | |||||
* | | | | | Merge pull request #583 from jskeet/issue312 | Jon Skeet | 2015-07-14 | 2 | -3/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Convert package name to PascalCase for C# namespace | Jon Skeet | 2015-07-14 | 2 | -3/+11 |
|/ / / / / | |||||
* | | | | | Merge pull request #582 from jskeet/csharp-json | Jon Skeet | 2015-07-14 | 21 | -168/+1494 |
|\ \ \ \ \ | |||||
| * | | | | | Changes suggested during review. | Jon Skeet | 2015-07-14 | 2 | -27/+4 |
| * | | | | | Fixes to JsonFormatter | Jon Skeet | 2015-07-10 | 2 | -11/+112 |
| * | | | | | Generated code changes for previous submit | Jon Skeet | 2015-07-10 | 7 | -113/+113 |
| * | | | | | Oneof reflection support. (Generated code changes in next commit.) | Jon Skeet | 2015-07-10 | 5 | -35/+87 |
| * | | | | | Use the new JsonFormatter to implement ToString on generated messages. | Jon Skeet | 2015-07-10 | 10 | -6/+459 |
| * | | | | | Initial implementation of JSON formatting | Jon Skeet | 2015-07-10 | 7 | -3/+746 |
* | | | | | | Merge pull request #587 from jtattermusch/nuget_pkg | Jon Skeet | 2015-07-12 | 4 | -13/+41 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Update Google.Protobuf.nuspec | Jan Tattermusch | 2015-07-12 | 1 | -1/+1 |
| * | | | | | enable building nuget package | Jan Tattermusch | 2015-07-10 | 4 | -13/+41 |
|/ / / / / | |||||
* | | | | | Merge pull request #566 from jskeet/csharp-reflection | Jon Skeet | 2015-07-10 | 52 | -1960/+2699 |
|\ \ \ \ \ | |||||
| * | | | | | Knock-on effects of moving GetSampleMessage. | Jon Skeet | 2015-07-09 | 1 | -8/+8 |