Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 |
|\ | |||
* | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 |
| | | |||
| * | The JsonParseOptions::ignore_unknown_fields option behavior treats | Alexey Malov | 2018-02-12 |
|/ | | | | unrecognized string values in enum fields as default ones. | ||
* | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 |
| | |||
* | Integrate internal changes | Bo Yang | 2016-10-10 |
| | |||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 |
| | |||
* | Fix data member declaration order. | Feng Xiao | 2016-07-06 |
| | |||
* | Merge pull request #1704 from lizan/json_parse_options | Feng Xiao | 2016-07-01 |
|\ | | | | | Add JsonParseOptions to ignore unknown fields | ||
* | | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 |
| | | | | | | | | This includes all internal changes from around May 20 to now. | ||
| * | Add JsonParseOptions to ignore unknown fields | Lizan Zhou | 2016-06-28 |
|/ | | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions | ||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 |
| | |||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 |