aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge pull request #684 from jskeet/unusedJan Tattermusch2015-08-043-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix build warnings around unused variablesJon Skeet2015-08-043-3/+3
| |/ /
| * | Merge pull request #653 from airtimemedia/masterFeng Xiao2015-08-038-13/+9
| |\ \
| | * | Move pthread include.Tom Hughes2015-07-302-2/+4
| | * | Remove unused private fields.Tom Hughes2015-07-294-12/+2
| | * | Fix compilation error when using C++11.Tom Hughes2015-07-291-1/+1
| | * | Set cmake include directories on library targets.Tom Hughes2015-07-282-0/+2
| | * | Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL.Tom Hughes2015-07-281-0/+2
| | |/
| * | Merge pull request #681 from jskeet/json-fieldmaskJon Skeet2015-08-032-1/+39
| |\ \
| | * | JSON formatting for FieldMaskJon Skeet2015-08-032-1/+39
| * | | Merge pull request #677 from jskeet/move-protosJon Skeet2015-08-033-121/+121
| |\ \ \
| | * | | Remove a redundant layer of directory hierarchy.Jon Skeet2015-08-033-121/+121
| * | | | Merge pull request #680 from jskeet/aptcaJon Skeet2015-08-031-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Allow partially-trusted callers again.Jon Skeet2015-08-031-0/+2
| | |/ /
| * | | Merge pull request #678 from jskeet/stream-ctorJon Skeet2015-08-0311-127/+100
| |\ \ \ | | |/ / | |/| |
| | * | Expose Coded*Stream constructors directly.Jon Skeet2015-08-0311-127/+100
| |/ /
| * | Merge pull request #675 from jtattermusch/signingJon Skeet2015-08-0314-92/+87
| |\ \
| | * | Update Makefile.amJan Tattermusch2015-08-021-2/+2
| | * | make changes and fixes in signingJan Tattermusch2015-08-0210-96/+16
| | * | added protoc.exe and well known protobuf files to the nuspec fileJan Tattermusch2015-08-021-1/+15
| | * | build signed assembliesJan Tattermusch2015-08-0215-36/+97
| * | | Merge pull request #672 from jskeet/json-structJon Skeet2015-08-032-3/+98
| |\ \ \
| | * | | Initial pass at formatting Struct as JSON.Jon Skeet2015-08-032-3/+98
| |/ / /
| * | | Merge pull request #671 from jskeet/json-timeJon Skeet2015-08-034-11/+174
| |\ \ \ | | |/ / | |/| |
| | * | Addressed issues raised in code review. Will merge when green.Jon Skeet2015-08-032-26/+18
| | * | Format JSON for Duration and Timestamp.Jon Skeet2015-08-033-11/+182
| |/ /
| * | Merge pull request #669 from jskeet/simpify-json-testsJan Tattermusch2015-08-011-60/+71
| |\ \
| | * | Simplify the JSON tests for readabilityJon Skeet2015-07-311-60/+71
| * | | Merge pull request #668 from jskeet/json_orderingJan Tattermusch2015-08-014-36/+353
| |\| |
| | * | Fix JSON formatting to always emit fields in field order, including oneofsJon Skeet2015-07-314-36/+353
| * | | Merge pull request #643 from yukawa/fix_win_unicode_buildPaul Yang2015-07-311-1/+1
| |\ \ \
| | * | | Fix build failure on Windows when Unicode build is enabled.Yohei Yukawa2015-07-301-1/+1
| * | | | Merge pull request #667 from jskeet/fix-field-orderingsJan Tattermusch2015-07-312-1/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix trivial bug in field orderings.Jon Skeet2015-07-312-1/+14
| |/ / /
| * | | Merge pull request #666 from jskeet/wkt-timesJon Skeet2015-07-317-0/+563
| |\ \ \
| | * | | Well-known type operations for Timestamp and Duration (but not JSON formatting).Jon Skeet2015-07-317-0/+563
| |/ / /
| * | | Merge pull request #665 from jskeet/types_fieldJon Skeet2015-07-314-7/+251
| |\ \ \
| | * | | Handle field names of "descriptor" and "types".Jon Skeet2015-07-314-7/+251
| |/ / /
| * | | Merge pull request #664 from jtattermusch/expose_umbrella_class_name2Jan Tattermusch2015-07-306-34/+28
| |\ \ \
| | * | | refactor umbrella class helpersJan Tattermusch2015-07-306-34/+28
| |/ / /
| * | | Merge pull request #632 from google/csharp-experimentalJan Tattermusch2015-07-30385-255618/+32710
| |\ \ \
| | * \ \ Merge pull request #660 from jskeet/throw-on-nullJan Tattermusch2015-07-3019-149/+169
| | |\ \ \
| | | * | | Generated code for previous commit.Jon Skeet2015-07-309-57/+57
| | | * | | Prohibit null values for string/bytes fields in generated code.Jon Skeet2015-07-303-13/+12
| | | * | | Rename ThrowHelper to Preconditions and make it public - we'll want to use it...Jon Skeet2015-07-307-79/+100
| | |/ / /
| | * | | Merge pull request #659 from jskeet/fix-frozenJon Skeet2015-07-3021-327/+3
| | |\ \ \
| | | * | | Generated code from previous commit.Jon Skeet2015-07-3018-315/+0
| | | * | | More freezing tidy-up; generated code in next commit.Jon Skeet2015-07-302-5/+2
| | | * | | Minor bits of left-over frozenness.Jon Skeet2015-07-302-7/+1
| | |/ / /
| | * | | Merge pull request #654 from jtattermusch/csharp_hide_freezeJon Skeet2015-07-3035-1498/+8
| | |\ \ \