aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename GeneratedCodeInfo to GeneratedClrTypeInfoJon Skeet2016-02-046-17/+17
* Merge pull request #1207 from jskeet/readmeJie Luo2016-02-031-16/+32
|\
| * Clarify readmeJon Skeet2016-02-031-16/+32
|/
* Merge pull request #1165 from damienmg/masterJisi Liu2016-02-021-6/+10
|\
| * Make protobuf Skylark extension appends the workspace rootDamien Martin-Guillerez2016-01-151-6/+10
* | Merge pull request #1195 from calbach/python-json-structJie Luo2016-02-015-25/+659
|\ \
| * | Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-295-25/+659
* | | Merge pull request #1199 from google/google_integrateJisi Liu2016-02-0127-585/+2104
|\ \ \ | |/ / |/| |
| * | Restore the license for Internal.javaJisi Liu2016-01-291-1/+29
| * | Uncomment the test, which was commented out during integrationJisi Liu2016-01-291-185/+184
| * | Integrate from google internal.Jisi Liu2016-01-29157-825/+2317
| * | Undo the Java module change for integration.Jisi Liu2016-01-28141-0/+0
|/ /
* | Merge pull request #1158 from jskeet/nonnormalized-tostringJan Tattermusch2016-01-2610-71/+378
|\ \
| * | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throwJon Skeet2016-01-2010-71/+378
* | | Merge pull request #1169 from LuminateWireless/bazel-buildFeng Xiao2016-01-221-6/+10
|\ \ \
| * | | Fix bazel BUILD for Java.Ming Zhao2016-01-211-6/+10
* | | | Merge pull request #1167 from xfxyjwf/refactor_docJisi Liu2016-01-222-186/+254
|\ \ \ \ | |/ / / |/| | |
| * | | Refactor README.md.Feng Xiao2016-01-212-186/+254
|/ / /
* | | Merge pull request #1163 from jskeet/more-jsonJan Tattermusch2016-01-211-2/+2
|\ \ \
| * | | Fix mistakes in highest-representable float64 integersJon Skeet2016-01-211-2/+2
* | | | Merge pull request #1162 from brian-peloton/masterFeng Xiao2016-01-211-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid upcasting uninitialized pointersBrian Silverman2016-01-201-2/+2
|/ / /
* | | Merge pull request #789 from motahan/solaris64_fixFeng Xiao2016-01-204-13/+13
|\ \ \ | |/ / |/| |
| * | Fixing compile errors on Solaris in 64-bit modeMohamed El-Tahan2015-09-024-13/+13
* | | Merge pull request #1096 from jskeet/custom-to-stringJan Tattermusch2016-01-197-1/+142
|\ \ \
| * | | Introduce ICustomDiagnosticMessage to allow for custom string formattingJon Skeet2016-01-137-1/+142
* | | | Merge pull request #1155 from jcburke14/jb-intcastFeng Xiao2016-01-191-1/+1
|\ \ \ \
| * | | | Fix compiler warning from repeated_field.hJohn Burke2016-01-191-1/+1
|/ / / /
* | | | Merge pull request #1147 from jcanizales/patch-1Feng Xiao2016-01-191-1/+1
|\ \ \ \
| * | | | Update podspec version to 3.0.0-beta-2Jorge Canizales2016-01-151-1/+1
* | | | | Merge pull request #896 from jhump/jh/fix-ioexception-vs-invalidprotobuf-exce...Feng Xiao2016-01-166-14/+300
|\ \ \ \ \
| * | | | | move test file (was in wrong place after rebasing on java module refactor)Joshua Humphries2016-01-151-0/+0
| * | | | | fully qualify invocations of static methods on GeneratedMessageJoshua Humphries2016-01-151-6/+6
| * | | | | throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-156-14/+300
| |/ / / /
* | | | | Merge pull request #1145 from jskeet/conformanceJon Skeet2016-01-1617-233/+537
|\ \ \ \ \
| * | | | | Fix broken testJon Skeet2016-01-151-1/+1
| * | | | | Remove now-fixed conformance errors.Jon Skeet2016-01-151-73/+0
| * | | | | Make sure thatJon Skeet2016-01-154-8/+70
| * | | | | Reject JSON containing the same oneof field twiceJon Skeet2016-01-152-0/+22
| * | | | | Change handling of unknown enums: we now write out the value as a number.Jon Skeet2016-01-154-36/+23
| * | | | | Extra strictness for FieldMask conversionJon Skeet2016-01-154-2/+51
| * | | | | Allow the original field name (rather than camel-cased) when parsing JSONJon Skeet2016-01-152-3/+23
| * | | | | Fixes to JSON timestamp/duration representationsJon Skeet2016-01-158-35/+139
| * | | | | Report serialization errors in conformance testsJon Skeet2016-01-151-8/+15
| * | | | | Prohibit null values in repeated and map fields in JSONJon Skeet2016-01-152-1/+38
| * | | | | Throw a better exception when invalid base64 is detected in JSONJon Skeet2016-01-153-1/+28
| * | | | | Support (and test) numeric enum parsing in JSONJon Skeet2016-01-152-0/+29
| * | | | | Fix handling of repeated wrappersJon Skeet2016-01-153-77/+94
| * | | | | JSON conformance test fixesJon Skeet2016-01-133-0/+16
| | |/ / / | |/| | |
* | | | | Merge pull request #1146 from haberman/pycppfixJoshua Haberman2016-01-153-181/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 21:16:58 +0000