Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-08-04 | 20 | -28/+28 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| / / / / / / | | | |/ / / / / / | ||||||
| | | * | | / / / | Generate a package name suffix ".nano" for nano messages | Xiao Hang | 2015-07-27 | 5 | -58/+174 | |
| | | | |_|/ / / | | | |/| | | | | ||||||
| | * / | | | | | Generate a package name suffix ".nano" for nano messages | Xiao Hang | 2015-07-29 | 6 | -63/+179 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #696 from TeBoring/temp | Paul Yang | 2015-08-06 | 4 | -4/+0 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | Remove unused .pb.h #includes. | Bo Yang | 2015-08-06 | 4 | -4/+0 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #692 from jskeet/tag-0 | Jan Tattermusch | 2015-08-05 | 28 | -405/+167 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Make InvalidProtocolBufferException.InvalidTag internal. | Jon Skeet | 2015-08-05 | 1 | -1/+1 | |
| | * | | | | | Generated code changes for previous commit. | Jon Skeet | 2015-08-05 | 19 | -339/+113 | |
| | * | | | | | Change ReadTag and PeekTag to just use 0 as a return value for "end of stream... | Jon Skeet | 2015-08-05 | 8 | -65/+53 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #689 from jskeet/fix-eof | Jon Skeet | 2015-08-05 | 32 | -10/+2897 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Update AssemblyInfo for conformance - mostly to fix version numbers. | Jon Skeet | 2015-08-05 | 1 | -23/+35 | |
| | * | | | | | Validate that after reading a message, we've consumed as many bytes as we exp... | Jon Skeet | 2015-08-05 | 3 | -30/+47 | |
| | * | | | | | Generated code changes for previous commit. | Jon Skeet | 2015-08-05 | 19 | -0/+113 | |
| | * | | | | | Consume unknown fields when parsing. | Jon Skeet | 2015-08-05 | 3 | -1/+64 | |
| | * | | | | | Added C# conformance tests. | Jon Skeet | 2015-08-05 | 3 | -1/+41 | |
| | * | | | | | First pass at C# conformance tests. | Jon Skeet | 2015-08-05 | 8 | -0/+2642 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #691 from jskeet/xml-documentation | Jon Skeet | 2015-08-05 | 27 | -108/+742 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix one cref that Mono was unhappy with | Jon Skeet | 2015-08-05 | 1 | -1/+1 | |
| | * | | | | | Document everything, and turn on errors if we fail to document anything in th... | Jon Skeet | 2015-08-04 | 26 | -107/+741 | |
| | | |/ / / | | |/| | | | ||||||
| * | | | | | Merge pull request #684 from jskeet/unused | Jan Tattermusch | 2015-08-04 | 3 | -3/+3 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Fix build warnings around unused variables | Jon Skeet | 2015-08-04 | 3 | -3/+3 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #653 from airtimemedia/master | Feng Xiao | 2015-08-03 | 8 | -13/+9 | |
| |\ \ \ \ | ||||||
| | * | | | | Move pthread include. | Tom Hughes | 2015-07-30 | 2 | -2/+4 | |
| | * | | | | Remove unused private fields. | Tom Hughes | 2015-07-29 | 4 | -12/+2 | |
| | * | | | | Fix compilation error when using C++11. | Tom Hughes | 2015-07-29 | 1 | -1/+1 | |
| | * | | | | Set cmake include directories on library targets. | Tom Hughes | 2015-07-28 | 2 | -0/+2 | |
| | * | | | | Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL. | Tom Hughes | 2015-07-28 | 1 | -0/+2 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #681 from jskeet/json-fieldmask | Jon Skeet | 2015-08-03 | 2 | -1/+39 | |
| |\ \ \ \ | ||||||
| | * | | | | JSON formatting for FieldMask | Jon Skeet | 2015-08-03 | 2 | -1/+39 | |
| * | | | | | Merge pull request #677 from jskeet/move-protos | Jon Skeet | 2015-08-03 | 3 | -121/+121 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Remove a redundant layer of directory hierarchy. | Jon Skeet | 2015-08-03 | 3 | -121/+121 | |
| * | | | | | | Merge pull request #680 from jskeet/aptca | Jon Skeet | 2015-08-03 | 1 | -0/+2 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | Allow partially-trusted callers again. | Jon Skeet | 2015-08-03 | 1 | -0/+2 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #678 from jskeet/stream-ctor | Jon Skeet | 2015-08-03 | 11 | -127/+100 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Expose Coded*Stream constructors directly. | Jon Skeet | 2015-08-03 | 11 | -127/+100 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #675 from jtattermusch/signing | Jon Skeet | 2015-08-03 | 14 | -92/+87 | |
| |\ \ \ \ | ||||||
| | * | | | | Update Makefile.am | Jan Tattermusch | 2015-08-02 | 1 | -2/+2 | |
| | * | | | | make changes and fixes in signing | Jan Tattermusch | 2015-08-02 | 10 | -96/+16 | |
| | * | | | | added protoc.exe and well known protobuf files to the nuspec file | Jan Tattermusch | 2015-08-02 | 1 | -1/+15 | |
| | * | | | | build signed assemblies | Jan Tattermusch | 2015-08-02 | 15 | -36/+97 | |
| * | | | | | Merge pull request #672 from jskeet/json-struct | Jon Skeet | 2015-08-03 | 2 | -3/+98 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Initial pass at formatting Struct as JSON. | Jon Skeet | 2015-08-03 | 2 | -3/+98 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #671 from jskeet/json-time | Jon Skeet | 2015-08-03 | 4 | -11/+174 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Addressed issues raised in code review. Will merge when green. | Jon Skeet | 2015-08-03 | 2 | -26/+18 | |
| | * | | | | Format JSON for Duration and Timestamp. | Jon Skeet | 2015-08-03 | 3 | -11/+182 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #669 from jskeet/simpify-json-tests | Jan Tattermusch | 2015-08-01 | 1 | -60/+71 | |
| |\ \ \ \ | ||||||
| | * | | | | Simplify the JSON tests for readability | Jon Skeet | 2015-07-31 | 1 | -60/+71 | |
| * | | | | | Merge pull request #668 from jskeet/json_ordering | Jan Tattermusch | 2015-08-01 | 4 | -36/+353 | |
| |\| | | | | ||||||
| | * | | | | Fix JSON formatting to always emit fields in field order, including oneofs | Jon Skeet | 2015-07-31 | 4 | -36/+353 | |
| * | | | | | Merge pull request #643 from yukawa/fix_win_unicode_build | Paul Yang | 2015-07-31 | 1 | -1/+1 | |
| |\ \ \ \ \ |