Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #1165 from damienmg/master | Jisi Liu | 2016-02-02 | 1 | -6/+10 | |
|\ \ \ \ | ||||||
| * | | | | Make protobuf Skylark extension appends the workspace root | Damien Martin-Guillerez | 2016-01-15 | 1 | -6/+10 | |
* | | | | | Merge pull request #1195 from calbach/python-json-struct | Jie Luo | 2016-02-01 | 5 | -25/+659 | |
|\ \ \ \ \ | ||||||
| * | | | | | Manually down-integrate python JSON struct support from internal code base. | CH Albach | 2016-01-29 | 5 | -25/+659 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #1199 from google/google_integrate | Jisi Liu | 2016-02-01 | 27 | -585/+2104 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Restore the license for Internal.java | Jisi Liu | 2016-01-29 | 1 | -1/+29 | |
| * | | | | Uncomment the test, which was commented out during integration | Jisi Liu | 2016-01-29 | 1 | -185/+184 | |
| * | | | | Integrate from google internal. | Jisi Liu | 2016-01-29 | 157 | -825/+2317 | |
| * | | | | Undo the Java module change for integration. | Jisi Liu | 2016-01-28 | 141 | -0/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #1158 from jskeet/nonnormalized-tostring | Jan Tattermusch | 2016-01-26 | 10 | -71/+378 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw | Jon Skeet | 2016-01-20 | 10 | -71/+378 | |
* | | | | Merge pull request #1169 from LuminateWireless/bazel-build | Feng Xiao | 2016-01-22 | 1 | -6/+10 | |
|\ \ \ \ | ||||||
| * | | | | Fix bazel BUILD for Java. | Ming Zhao | 2016-01-21 | 1 | -6/+10 | |
* | | | | | Merge pull request #1167 from xfxyjwf/refactor_doc | Jisi Liu | 2016-01-22 | 2 | -186/+254 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Refactor README.md. | Feng Xiao | 2016-01-21 | 2 | -186/+254 | |
|/ / / / | ||||||
* | | | | Merge pull request #1163 from jskeet/more-json | Jan Tattermusch | 2016-01-21 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Fix mistakes in highest-representable float64 integers | Jon Skeet | 2016-01-21 | 1 | -2/+2 | |
* | | | | | Merge pull request #1162 from brian-peloton/master | Feng Xiao | 2016-01-21 | 1 | -2/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Avoid upcasting uninitialized pointers | Brian Silverman | 2016-01-20 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #789 from motahan/solaris64_fix | Feng Xiao | 2016-01-20 | 4 | -13/+13 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fixing compile errors on Solaris in 64-bit mode | Mohamed El-Tahan | 2015-09-02 | 4 | -13/+13 | |
* | | | | Merge pull request #1096 from jskeet/custom-to-string | Jan Tattermusch | 2016-01-19 | 7 | -1/+142 | |
|\ \ \ \ | ||||||
| * | | | | Introduce ICustomDiagnosticMessage to allow for custom string formatting | Jon Skeet | 2016-01-13 | 7 | -1/+142 | |
* | | | | | Merge pull request #1155 from jcburke14/jb-intcast | Feng Xiao | 2016-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix compiler warning from repeated_field.h | John Burke | 2016-01-19 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1147 from jcanizales/patch-1 | Feng Xiao | 2016-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update podspec version to 3.0.0-beta-2 | Jorge Canizales | 2016-01-15 | 1 | -1/+1 | |
* | | | | | | Merge pull request #896 from jhump/jh/fix-ioexception-vs-invalidprotobuf-exce... | Feng Xiao | 2016-01-16 | 6 | -14/+300 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | move test file (was in wrong place after rebasing on java module refactor) | Joshua Humphries | 2016-01-15 | 1 | -0/+0 | |
| * | | | | | | fully qualify invocations of static methods on GeneratedMessage | Joshua Humphries | 2016-01-15 | 1 | -6/+6 | |
| * | | | | | | throw IOException instead of InvalidProtocolBufferException when appropriate | Joshua Humphries | 2016-01-15 | 6 | -14/+300 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1145 from jskeet/conformance | Jon Skeet | 2016-01-16 | 17 | -233/+537 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix broken test | Jon Skeet | 2016-01-15 | 1 | -1/+1 | |
| * | | | | | | Remove now-fixed conformance errors. | Jon Skeet | 2016-01-15 | 1 | -73/+0 | |
| * | | | | | | Make sure that | Jon Skeet | 2016-01-15 | 4 | -8/+70 | |
| * | | | | | | Reject JSON containing the same oneof field twice | Jon Skeet | 2016-01-15 | 2 | -0/+22 | |
| * | | | | | | Change handling of unknown enums: we now write out the value as a number. | Jon Skeet | 2016-01-15 | 4 | -36/+23 | |
| * | | | | | | Extra strictness for FieldMask conversion | Jon Skeet | 2016-01-15 | 4 | -2/+51 | |
| * | | | | | | Allow the original field name (rather than camel-cased) when parsing JSON | Jon Skeet | 2016-01-15 | 2 | -3/+23 | |
| * | | | | | | Fixes to JSON timestamp/duration representations | Jon Skeet | 2016-01-15 | 8 | -35/+139 | |
| * | | | | | | Report serialization errors in conformance tests | Jon Skeet | 2016-01-15 | 1 | -8/+15 | |
| * | | | | | | Prohibit null values in repeated and map fields in JSON | Jon Skeet | 2016-01-15 | 2 | -1/+38 | |
| * | | | | | | Throw a better exception when invalid base64 is detected in JSON | Jon Skeet | 2016-01-15 | 3 | -1/+28 | |
| * | | | | | | Support (and test) numeric enum parsing in JSON | Jon Skeet | 2016-01-15 | 2 | -0/+29 | |
| * | | | | | | Fix handling of repeated wrappers | Jon Skeet | 2016-01-15 | 3 | -77/+94 | |
| * | | | | | | JSON conformance test fixes | Jon Skeet | 2016-01-13 | 3 | -0/+16 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #1146 from haberman/pycppfix | Joshua Haberman | 2016-01-15 | 3 | -181/+5 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fixed Python 3.x C++ build, and updated conformance failure lists. | Josh Haberman | 2016-01-15 | 3 | -181/+5 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #1143 from xfxyjwf/fix_java | Feng Xiao | 2016-01-15 | 2 | -156/+158 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix tests broken by the Java directory change. | Feng Xiao | 2016-01-14 | 2 | -156/+158 | |
|/ / / / |