aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #1185 from kkm000/icl-fixGravatar Joshua Haberman2016-02-10
|\ | | | | Fix Intel compiler warnings in include files on Windows
* \ Merge pull request #1220 from jtattermusch/add_strong_name_keyGravatar Jan Tattermusch2016-02-10
|\ \ | | | | | | Check in strong name key.
| * | Add a linkGravatar Jan Tattermusch2016-02-10
| | |
| * | Use checked-in key to build ReleaseSignedGravatar Jan Tattermusch2016-02-09
| | |
| * | add private key for strong name assembliesGravatar Jan Tattermusch2016-02-09
|/ /
* | Merge pull request #1214 from haberman/binarygemGravatar Joshua Haberman2016-02-08
|\ \ | | | | | | Added support for binary gems.
| * \ Merge pull request #1 from nicolasnoble/bin-gemsGravatar Joshua Haberman2016-02-05
| |\ \ | | | | | | | | Few fixes.
| | * | Actually enabling cross compilation.Gravatar Nicolas "Pixel" Noble2016-02-06
| | | |
| | * | Removing usage of git - not everyone grabs the gem using it.Gravatar Nicolas "Pixel" Noble2016-02-06
| |/ /
* | | Merge pull request #1205 from haberman/fixjstestsGravatar Joshua Haberman2016-02-05
|\ \ \ | | | | | | | | Enable JavaScript tests for binary parse/serialize.
| | * | Add rake-compiler-dock as a dep.Gravatar Josh Haberman2016-02-04
| | | |
| | * | Added support for binary gems.Gravatar Josh Haberman2016-02-04
| |/ / |/| |
* | | Merge pull request #1213 from jskeet/rename-preconditionsGravatar Jon Skeet2016-02-04
|\ \ \ | | | | | | | | Rename Preconditions to ProtoPreconditions
| * | | Generated code changes from previous commitGravatar Jon Skeet2016-02-04
| | | |
| * | | Rename Preconditions to ProtoPreconditionsGravatar Jon Skeet2016-02-04
|/ / / | | | | | | | | | (Generated code changes in next commit.)
* | | Merge pull request #1210 from jskeet/rename-generatedcodeinfoGravatar Jan Tattermusch2016-02-04
|\ \ \ | | | | | | | | Rename GeneratedCodeInfo to GeneratedClrTypeInfo
| * | | Generated code for GeneratedCodeInfo changeGravatar Jon Skeet2016-02-04
| | | |
| * | | Rename GeneratedCodeInfo to GeneratedClrTypeInfoGravatar Jon Skeet2016-02-04
|/ / / | | | | | | | | | | | | | | | | | | Recently, descriptor.proto gained a GeneratedCodeInfo message, which means the generated code conflicts with our type. Unfortunately this affects codegen as well, although this is a part of the public API which is very unlikely to affect hand-written code. Generated code changes in next commit.
* | | Merge pull request #1207 from jskeet/readmeGravatar Jie Luo2016-02-03
|\ \ \ | | | | | | | | Clarify readme for C#
| * | | Clarify readmeGravatar Jon Skeet2016-02-03
|/ / /
| * / Enable JavaScript tests for binary parse/serialize.Gravatar Josh Haberman2016-02-02
|/ / | | | | | | | | | | | | | | These should have been included in the first match but I overlooked them. This involved deleting some of the code that tests Google-internal-only features.
* | Merge pull request #1165 from damienmg/masterGravatar Jisi Liu2016-02-02
|\ \ | | | | | | Make protobuf Skylark extension appends the workspace root
* \ \ Merge pull request #1195 from calbach/python-json-structGravatar Jie Luo2016-02-01
|\ \ \ | | | | | | | | Manually down-integrate python JSON struct support from internal code base.
* \ \ \ Merge pull request #1199 from google/google_integrateGravatar Jisi Liu2016-02-01
|\ \ \ \ | | | | | | | | | | Integrate google internal changes to master
| | * | | Manually down-integrate python JSON struct support from internal code base.Gravatar CH Albach2016-01-29
| |/ / / |/| | |
| * | | Restore the license for Internal.javaGravatar Jisi Liu2016-01-29
| | | |
| * | | Uncomment the test, which was commented out during integrationGravatar Jisi Liu2016-01-29
| | | |
| * | | Integrate from google internal.Gravatar Jisi Liu2016-01-29
| | | | | | | | | | | | | | | | | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
| * | | Undo the Java module change for integration.Gravatar Jisi Liu2016-01-28
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit.
| | * Fix Intel compiler warnings in include files on WindowsGravatar kkm2016-01-27
| |/ |/|
* | Merge pull request #1158 from jskeet/nonnormalized-tostringGravatar Jan Tattermusch2016-01-26
|\ \ | | | | | | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw
* \ \ Merge pull request #1169 from LuminateWireless/bazel-buildGravatar Feng Xiao2016-01-22
|\ \ \ | | | | | | | | Fix bazel BUILD for Java.
* \ \ \ Merge pull request #1167 from xfxyjwf/refactor_docGravatar Jisi Liu2016-01-22
|\ \ \ \ | | | | | | | | | | Refactor README.md.
| | * | | Fix bazel BUILD for Java.Gravatar Ming Zhao2016-01-21
| |/ / / |/| | |
| * | | Refactor README.md.Gravatar Feng Xiao2016-01-21
|/ / / | | | | | | | | | | | | | | | Move the original README.md to src since it's talking about C++ exclusively and add a more general README.md to document how to install protoc for all languages.
* | | Merge pull request #1163 from jskeet/more-jsonGravatar Jan Tattermusch2016-01-21
|\ \ \ | | | | | | | | Fix mistakes in highest-representable float64 integers
* \ \ \ Merge pull request #1162 from brian-peloton/masterGravatar Feng Xiao2016-01-21
|\ \ \ \ | | | | | | | | | | Avoid upcasting uninitialized pointers
| | * | | Fix mistakes in highest-representable float64 integersGravatar Jon Skeet2016-01-21
| |/ / / |/| | |
| * | | Avoid upcasting uninitialized pointersGravatar Brian Silverman2016-01-20
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes google/protobuf#693 msan flags this as being undefined behavior. I think it's triggering because the compiler has to insert a branch to avoid changing the pointer's value if it starts out NULL. I can't figure out if this is actually undefined behavior or not, but it definitely seems to be a gray area of the standard which is best avoided.
* | | Merge pull request #789 from motahan/solaris64_fixGravatar Feng Xiao2016-01-20
|\ \ \ | | | | | | | | Fixing compile errors on Solaris in 64-bit mode
| | * | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throwGravatar Jon Skeet2016-01-20
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The usage of ICustomDiagnosticMessage here is non-essential - ToDiagnosticString doesn't actually get called by ToString() in this case, due to JsonFormatter code. It was intended to make it clearer that it *did* have a custom format... but then arguably I should do the same for Value, Struct, Any etc. Moving some of the code out of JsonFormatter and into Duration/Timestamp/FieldMask likewise feels somewhat nice, somewhat nasty... basically there are JSON-specific bits of formatting, but also domain-specific bits of computation. <sigh> Thoughts welcome.
* | | Merge pull request #1096 from jskeet/custom-to-stringGravatar Jan Tattermusch2016-01-19
|\ \ \ | | | | | | | | Introduce ICustomDiagnosticMessage to allow for custom string formatting
* \ \ \ Merge pull request #1155 from jcburke14/jb-intcastGravatar Feng Xiao2016-01-19
|\ \ \ \ | | | | | | | | | | Fix compiler warning from repeated_field.h
| * | | | Fix compiler warning from repeated_field.hGravatar John Burke2016-01-19
|/ / / /
* | | | Merge pull request #1147 from jcanizales/patch-1Gravatar Feng Xiao2016-01-19
|\ \ \ \ | | | | | | | | | | Update podspec version to 3.0.0-beta-2
* \ \ \ \ Merge pull request #896 from ↵Gravatar Feng Xiao2016-01-16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jhump/jh/fix-ioexception-vs-invalidprotobuf-exception throw IOException instead of InvalidProtocolBufferException when appropriate
* \ \ \ \ \ Merge pull request #1145 from jskeet/conformanceGravatar Jon Skeet2016-01-16
|\ \ \ \ \ \ | | | | | | | | | | | | | | JSON Conformance improvements
* \ \ \ \ \ \ Merge pull request #1146 from haberman/pycppfixGravatar Joshua Haberman2016-01-15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed Python 3.x C++ build, and updated conformance failure lists.
| | | | * | | | Update podspec version to 3.0.0-beta-2Gravatar Jorge Canizales2016-01-15
| |_|_|/ / / / |/| | | | | | | | | | | | | It's already submitted.
| | | * | | | move test file (was in wrong place after rebasing on java module refactor)Gravatar Joshua Humphries2016-01-15
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 02:12:27 +0000