Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 21 | -340/+970 | |
|\ \ | ||||||
| * | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 1 | -1/+1 | |
| |\| | ||||||
| | * | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-10 | 1 | -0/+14 | |
| | | | ||||||
| | * | check already performed by MergeFrom | Jan Tattermusch | 2017-11-10 | 1 | -5/+0 | |
| | | | ||||||
| | * | allow message parsing from an array slice | Jan Tattermusch | 2017-11-10 | 2 | -0/+31 | |
| | | | ||||||
| | * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 2 | -2/+2 | |
| | | | ||||||
| * | | Update csharp version number (#3958) | Jie Luo | 2017-11-29 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix JsonTokenizer exception message | Jon Skeet | 2017-11-29 | 1 | -1/+1 | |
| | | | ||||||
| * | | Remove non-C# options from C#-only test protos | Jon Skeet | 2017-11-14 | 10 | -41/+13 | |
| | | | ||||||
| * | | MMinor fix-ups to C# tests from changes in earlier commits | Jon Skeet | 2017-11-12 | 4 | -20/+30 | |
| | | | ||||||
| * | | Regenerated test code for C# | Jon Skeet | 2017-11-12 | 6 | -295/+330 | |
| | | | ||||||
| * | | Move C#-only test protos to csharp/protos | Jon Skeet | 2017-11-12 | 6 | -19/+632 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unittest_proto3 had been changed in a very backward-incompatible way which was never going to work with C# as it imports proto2 messages. This is now a copy of the old file, but with a package name change for compatibility with the remaining files in src/google/protobuf. The other moves are for files that are only used by C#. | |||||
* | | | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 2 | -10/+15 | |
|/ / | ||||||
* | | ParseFrom<T> for array slice is missing | Jan Tattermusch | 2017-11-09 | 1 | -0/+14 | |
| | | ||||||
* | | check already performed by MergeFrom | Jan Tattermusch | 2017-11-09 | 1 | -5/+0 | |
| | | ||||||
* | | allow message parsing from an array slice | Jan Tattermusch | 2017-11-09 | 2 | -0/+31 | |
|/ | ||||||
* | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 4 | -9/+387 | |
| | | | | | | | | | | If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation. | |||||
* | update joda-time javadoc url | xuwei-k | 2017-10-30 | 1 | -1/+1 | |
| | ||||||
* | Add parser settings WithXyz methods | Jon Skeet | 2017-10-28 | 1 | -0/+17 | |
| | ||||||
* | Add JsonParser setting to ignore unknown field values | Jon Skeet | 2017-10-28 | 4 | -7/+95 | |
| | | | | | | | Note that the default behavior is still to throw an exception; you need to opt into ignoring unknown fields. Fixes #2838. | |||||
* | Update descriptor protos | Jisi Liu | 2017-10-18 | 2 | -1/+8 | |
| | ||||||
* | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 2 | -2/+2 | |
|\ | ||||||
| * | Bump version for minor release | Jisi Liu | 2017-09-14 | 2 | -2/+2 | |
| | | ||||||
| * | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-05 | 1 | -1/+1 | |
| | | ||||||
| * | change the field number of php_generic_service to fix the conflict with (#3576) | Paul Yang | 2017-08-30 | 1 | -10/+10 | |
| | | | | | | internal descriptor.proto | |||||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 1 | -90/+308 | |
| | | ||||||
* | | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-12 | 1 | -1/+1 | |
| | | ||||||
* | | Update C# generated file for addressbook.proto | Feng Xiao | 2017-09-11 | 1 | -11/+47 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 5 | -149/+320 | |
|\| | ||||||
| * | Merge branch 'master' into 3.4.x | Bo Yang | 2017-08-05 | 2 | -4/+6 | |
| |\ | ||||||
| * | | Bump csharp version | Jisi Liu | 2017-08-02 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge from master | Jisi Liu | 2017-07-25 | 3 | -226/+274 | |
| | | | ||||||
| * | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 38 | -475/+510 | |
| |\ \ | ||||||
| * | | | Update csharp and php descriptor | Jisi Liu | 2017-07-18 | 3 | -146/+316 | |
| | | | | ||||||
* | | | | Detect invalid tags with a field number of 0 in C# | Jon Skeet | 2017-08-11 | 2 | -2/+16 | |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | Previously we only rejected the tag if the tag itself was 0, i.e. field=0, type=varint. The type doesn't matter: field 0 is always invalid. This removes the last of the C# conformance failures. | |||||
* | | | Update the comment on the message_type to cover what it should be. | Thomas Van Lenten | 2017-07-26 | 2 | -4/+6 | |
| | | | ||||||
* | | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChong | Yilun Chong | 2017-07-24 | 3 | -226/+274 | |
|\ \ \ | | | | | | | | | Proto2 test message support to conformance test | |||||
| * | | | delete backup files | Yilun Chong | 2017-07-05 | 1 | -155/+0 | |
| | | | | ||||||
| * | | | fix php failing list and csharp generated proto | Yilun Chong | 2017-07-05 | 2 | -211/+370 | |
| | | | | ||||||
| * | | | add some test proto2 supported, add js proto2 supported, fixed some error | Yilun Chong | 2017-06-30 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | change php objc nodejs csharp ruby | Yilun Chong | 2017-06-29 | 1 | -16/+15 | |
| | | | | ||||||
| * | | | fix csharp conformance test | Yilun Chong | 2017-06-28 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | fix csharp conformance test | Yilun Chong | 2017-06-28 | 1 | -16/+16 | |
| | | | | ||||||
| * | | | fix csharp | Yilun Chong | 2017-06-28 | 1 | -15/+15 | |
| | | | | ||||||
| * | | | add csharp support | Yilun Chong | 2017-06-28 | 2 | -12/+57 | |
| | | | | ||||||
* | | | | Merge pull request #3375 from TeBoring/3.3.x | Paul Yang | 2017-07-19 | 1 | -1/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | Merge 3.3.x into master | |||||
| * | | | Merge 3.3.x into master | Bo Yang | 2017-07-18 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | Update version number to 3.3.2 | Bo Yang | 2017-06-21 | 2 | -2/+2 | |
| | | | | | ||||||
| | * | | | Update version number to 3.3.1 | Feng Xiao | 2017-05-08 | 2 | -2/+2 | |
| | | |/ | | |/| |