91 Commits (3a5fe3beeeb24e257fe896550f92110fc6390d08)

Author SHA1 Message Date
Paul Yang 7f3e237071 Merge 3.2.x branch into master (#2648) 8 years ago
Caleb Welton 1a56251a35 oneOf fix for JsonFormat includingDefaultValueFields 9 years ago
Adam Cozzette 5a76e633ea Integrated internal changes from Google 9 years ago
Christopher Tubbs eb7f3a3ad1 Use latest maven-compiler-plugin (2.6.0) 9 years ago
Bo Yang f9f3c35eb3 Update version number. 9 years ago
Bo Yang 15f4db6cb1 Bump version number to 3.1.0-alpha-1. 9 years ago
Bo Yang cc8ca5b6a5 Integrate internal changes 9 years ago
Bo Yang 8c88762e3e Update version number. 9 years ago
Bo Yang b28ab73d22 Fix gson dependency. 9 years ago
Bo Yang 6cb6bd9f21 Fix gson dependency. 9 years ago
Bo Yang ebcda12102 Bump version number to 3.1.0-alpha-1. 9 years ago
Bo Yang 98835fb8f8 Integrate internal changes 9 years ago
Dave Protasowski 1fc416be21 Allow the JsonFormat.Parser to ignore unknown fields 9 years ago
Jisi Liu 6e11540b32 Bump version number to 3.0.2 9 years ago
Jisi Liu fb7a7c5f1f Bump version number for GA 9 years ago
Feng Xiao 932f94e16e Update version number to 3.0.0-beta-4 9 years ago
Feng Xiao 9086d96439 Integrate from internal code base. 9 years ago
chezRong 454dbf16fc added minified JSON formatting functionality with test 9 years ago
Adam Cozzette d64a2d9941 Integrated internal changes from Google 9 years ago
Jisi Liu 5dea2017db Update version numbers for other languages 9 years ago
Jisi Liu cf14183bcd Down integrate from Google internal. 9 years ago
Jisi Liu 3b3c8abb96 Integrate google internal changes. 9 years ago
Pradeep Gollakota 4d98369f6d Allow custom URLs for Any in JsonFormat 9 years ago
Jisi Liu 5221dcbe47 Integrate from google internal. 9 years ago
Jisi Liu cb3f428810 Undo the Java module change for integration. 9 years ago
nmittler 49efe9d7db Restructuring protobuf to multiple modules 9 years ago
Feng Xiao 7d075a44c1 Update version number and fix javadoc errors. 10 years ago
Feng Xiao af81dcfc2c Fix Java travis tests. 10 years ago
Feng Xiao a0cecfd31a Make conformance tests build for C++ and Java. 10 years ago
Feng Xiao 13e1279d86 Remove internal options from proto files. 10 years ago
Feng Xiao e841bac4fc Down-integrate from internal code base. 10 years ago
Jisi Liu 479a90b4dd Revert unwanted changes. 10 years ago
Jisi Liu 46e8ff63cb Down-integrate from google internal. 10 years ago
Feng Xiao ffe9215140 Update version number. 10 years ago
Feng Xiao fbb3ef28c9 Merge Java util package to github. 10 years ago