aboutsummaryrefslogtreecommitdiffstats
path: root/conformance
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.8.x'Bo Yang2019-06-213-6/+0
|\
| * Change int64 json encoding to be string for php and ruby (#6251)Paul Yang2019-06-173-6/+0
* | php: Fix formatting of Duration (#6155)Leonard Hecker2019-06-181-4/+0
* | Change offset of Timestamp conformance test to distinguish from the default (...Paul Yang2019-06-171-4/+4
* | Merge branch '3.8.x' into 3.8.x-201905311515Hao Nguyen2019-05-311-5/+0
|\|
| * Custom mktime to fix issue on mac (#6118)Paul Yang2019-05-091-5/+0
* | Down integrate to GitHubHao Nguyen2019-05-301-8/+3
* | Use runtime_error vs just exiting for some issues.Thomas Van Lenten2019-05-291-3/+8
* | Add a new conformance test for top level JSON null (#5966)Hao Nguyen2019-04-244-0/+5
|/
* Add module for JavaLite and fix buildsHao Nguyen2019-04-091-1/+1
* Merge branch 'master' of https://github.com/protocolbuffers/protobuf into syn...Hao Nguyen2019-04-094-2/+50
|\
| * Revert accidentally commitHao Nguyen2019-04-054-31/+2
| * Add module for JavaLite and fix buildsHao Nguyen2019-04-051-1/+1
| * Merge branch 'master' of https://github.com/protocolbuffers/protobufHao Nguyen2019-04-054-2/+50
| |\
| | * Update upb for rubyBo Yang2019-03-282-2/+0
| | * Merge branch '3.7.x' into merge-3-7-xAdam Cozzette2019-03-262-0/+50
| | |\
| | | * Replace strptime with custom implementation (#5906)Paul Yang2019-03-192-2/+0
| | | * Parse nested listvalue in json for ruby (#5867)Paul Yang2019-03-122-0/+32
| | | * Encode empty ListValue (#5857)Paul Yang2019-03-103-22/+21
| * | | Down integrate to GithubHao Nguyen2019-04-053-1/+30
| |/ /
* / / Down integrate to GithubHao Nguyen2019-04-093-1/+30
|/ /
* | Update conformance test failuresHao Nguyen2019-03-204-7/+31
* | Merge branch 'contributing' of https://github.com/haon4/protobuf into contrib...Hao Nguyen2019-03-201-1/+1
|\ \
| * | Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 (#5...Sydney Acksman2019-03-111-1/+1
* | | Down integrate to GithubHao Nguyen2019-03-208-7/+82
|/ /
* | Fix ruby continuous tests (#5853)Paul Yang2019-03-072-22/+3
* | Down integrate to Github (#5839)Hao Nguyen2019-03-063-42/+9
* | Merge branch '3.7.x'Bo Yang2019-03-041-0/+2
|\|
| * Convert integer to string if field is string field in jsonBo Yang2019-01-281-0/+2
| * Default values should also be serialized for json map key/value (#5643)Paul Yang2019-01-281-1/+0
* | fix conformance test for text formatYilun Chong2019-02-263-1/+14
* | Merge branch 'master' into integrationYilun Chong2019-02-244-27/+27
|\ \
| * | delete all duplicate empty blanks (#5758)Xiang Dai2019-02-204-27/+27
* | | down integration from internalYilun Chong2019-02-2212-51/+475
|/ /
* / Default values should also be serialized for json map key/value (#5643)Paul Yang2019-01-281-1/+0
|/
* Fix empty FieldMask json encoding/decoding (#5605)Paul Yang2019-01-223-0/+6
* Fix Any json encoding/decoding for ruby. (#5592)Paul Yang2019-01-171-22/+1
* Fix field mask for php in json (#5591)Paul Yang2019-01-171-10/+1
* [ObjC] add support for the TextFormat constants.Thomas Van Lenten2019-01-141-0/+10
* Down-integrate internal changes to github. (#5575)Yilun Chong2019-01-131-1/+2
* Down-integrate internal changes to github. (#5566)Yilun Chong2019-01-115-9/+75
* Comments on the next line will go to the next field.Thomas Van Lenten2019-01-101-4/+4
* Down-integrate internal changes to github. (#5555)Yilun Chong2019-01-0810-89/+128
* Revert "Revert "Enable the ignore_unknown_field option in the Ruby unmarshal ...Paul Yang2019-01-083-53/+96
* [ObjC] Add the jspb cases to the switches so they are complete.Thomas Van Lenten2019-01-071-0/+12
* Revert "Enable the ignore_unknown_field option in the Ruby unmarshal options"...Paul Yang2018-12-261-1/+49
* Fix Any json encoding/decoding in php (#5496)Paul Yang2018-12-261-18/+0
* Merge pull request #5373 from ebenoist/erik/unknown-fieldsJoshua Haberman2018-12-221-49/+1
|\
| * Adds the ability to ignore unknown fields on parseErik Benoist2018-12-211-49/+1
* | Add dependency to AliasedEnum in PHPHao Nguyen2018-12-191-0/+1