Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Down-integrate from google3. | Feng Xiao | 2018-08-08 | 1 | -58/+39 |
| | |||||
* | Merge branch 'master' into fixbug_enum2json2 | stone4774 | 2018-03-22 | 1 | -42/+42 |
|\ | |||||
| * | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 1 | -42/+42 |
| | | |||||
* | | Use the first enum value instead of 0 in ↵ | stone4774 | 2018-03-21 | 1 | -1/+1 |
| | | | | | | | | DefaultValueObjectWriter::FindEnumDefault | ||||
* | | Fix bug: whether always_print_enums_as_ints is true or false, it always ↵ | stone4774 | 2018-03-19 | 1 | -14/+17 |
|/ | | | | print the default value of enums as strings | ||||
* | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 1 | -0/+1 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 1 | -24/+58 |
| | |||||
* | Merge pull request #2867 from mojoBrendan/master | Feng Xiao | 2017-03-17 | 1 | -6/+16 |
|\ | | | | | Add preserve_proto_field_names option to JsonPrintOptions | ||||
| * | Add option to preserve original proto field names | Brendan McCarthy | 2017-03-17 | 1 | -6/+16 |
| | | |||||
* | | DefaultValueObjectWriter should populate oneof message field | Jie Luo | 2017-03-10 | 1 | -2/+3 |
|/ | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 1 | -4/+4 |
| | |||||
* | Integrate internal changes | Bo Yang | 2016-10-10 | 1 | -19/+22 |
| | |||||
* | Fixes static analyzer issues from xcode. | Sergio Campama | 2016-09-20 | 1 | -1/+0 |
| | |||||
* | fix #1342 cause by ownership issues | mike07026 | 2016-09-01 | 1 | -1/+4 |
| | |||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 1 | -12/+17 |
| | |||||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 1 | -16/+48 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 1 | -33/+57 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 1 | -23/+43 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-06-15 | 1 | -0/+515 |
[ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d |