aboutsummaryrefslogtreecommitdiffhomepage
path: root/csharp
Commit message (Expand)AuthorAge
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| * Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\
| * | Update csharp version number (#3958)Gravatar Jie Luo2017-11-29
| * | Fix JsonTokenizer exception messageGravatar Jon Skeet2017-11-29
| * | Remove non-C# options from C#-only test protosGravatar Jon Skeet2017-11-14
| * | MMinor fix-ups to C# tests from changes in earlier commitsGravatar Jon Skeet2017-11-12
| * | Regenerated test code for C#Gravatar Jon Skeet2017-11-12
| * | Move C#-only test protos to csharp/protosGravatar Jon Skeet2017-11-12
|/ /
| * ParseFrom<T> for array slice is missingGravatar Jan Tattermusch2017-11-10
| * check already performed by MergeFromGravatar Jan Tattermusch2017-11-10
| * allow message parsing from an array sliceGravatar Jan Tattermusch2017-11-10
* | ParseFrom<T> for array slice is missingGravatar Jan Tattermusch2017-11-09
* | check already performed by MergeFromGravatar Jan Tattermusch2017-11-09
* | allow message parsing from an array sliceGravatar Jan Tattermusch2017-11-09
| * Update version number to 3.5.0Gravatar Jisi Liu2017-11-02
|/
* Fix merging with message-valued oneofGravatar Jon Skeet2017-10-31
* update joda-time javadoc urlGravatar xuwei-k2017-10-30
* Add parser settings WithXyz methodsGravatar Jon Skeet2017-10-28
* Add JsonParser setting to ignore unknown field valuesGravatar Jon Skeet2017-10-28
* Update descriptor protosGravatar Jisi Liu2017-10-18
* Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\
| * Bump version for minor releaseGravatar Jisi Liu2017-09-14
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* | Google.Protobuf should target net45Gravatar Jan Tattermusch2017-09-12
* | Update C# generated file for addressbook.protoGravatar Feng Xiao2017-09-11
| * Google.Protobuf should target net45Gravatar Jan Tattermusch2017-09-05
| * change the field number of php_generic_service to fix the conflict with (#3576)Gravatar Paul Yang2017-08-30
* | Merge remote-tracking branch 'origin/3.4.x' into mergemasterGravatar Jisi Liu2017-08-18
|\|
* | Detect invalid tags with a field number of 0 in C#Gravatar Jon Skeet2017-08-11
| * Merge branch 'master' into 3.4.xGravatar Bo Yang2017-08-05
| |\ | |/ |/|
| * Bump csharp versionGravatar Jisi Liu2017-08-02
* | Update the comment on the message_type to cover what it should be.Gravatar Thomas Van Lenten2017-07-26
| * Merge from masterGravatar Jisi Liu2017-07-25
| * Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
* | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongGravatar Yilun Chong2017-07-24
|\ \
* \ \ Merge pull request #3375 from TeBoring/3.3.xGravatar Paul Yang2017-07-19
|\ \ \
| | | * Merge master into 3.4.xGravatar Jisi Liu2017-07-18
| | | |\ | |_|_|/ |/| | |
| | | * Update csharp and php descriptorGravatar Jisi Liu2017-07-18
| * | | Merge 3.3.x into masterGravatar Bo Yang2017-07-18
| |\ \ \
* | | | | Support PHP generic services (#3269)Gravatar Matt A2017-07-18
|/ / / /
* | | | Fix repository URL in C# project fileGravatar Jon Skeet2017-07-13
* | | | C#: Implement IReadOnlyDictionary<K,V> in MapField<K,V>Gravatar Jean-Rémy Bancel2017-07-12
| | * | delete backup filesGravatar Yilun Chong2017-07-05
| | * | fix php failing list and csharp generated protoGravatar Yilun Chong2017-07-05
* | | | Ensure leaveOpen is true when writing to a bufferGravatar Jon Skeet2017-07-04
* | | | Make Any easier to work with in C#Gravatar Jon Skeet2017-07-03
| | * | add some test proto2 supported, add js proto2 supported, fixed some errorGravatar Yilun Chong2017-06-30
| | * | change php objc nodejs csharp rubyGravatar Yilun Chong2017-06-29
| | * | fix csharp conformance testGravatar Yilun Chong2017-06-28