aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Include 'source' attribute in the podspecJorge Canizales2016-02-101-0/+3
| | | The new version of Cocoapods requires it even when using the podspec locally.
* Merge pull request #1225 from google/nmakedocJoshua Haberman2016-02-101-1/+2
|\ | | | | Clarified that 'nmake' must be run before 'nmake check'.
| * Clarified that 'nmake' must be run before 'nmake check'.Josh Haberman2016-02-101-1/+2
|/
* Merge pull request #1185 from kkm000/icl-fixJoshua Haberman2016-02-102-4/+4
|\ | | | | Fix Intel compiler warnings in include files on Windows
| * Fix Intel compiler warnings in include files on Windowskkm2016-01-272-4/+4
| |
* | Merge pull request #1220 from jtattermusch/add_strong_name_keyJan Tattermusch2016-02-104-3/+7
|\ \ | | | | | | Check in strong name key.
| * | Add a linkJan Tattermusch2016-02-101-2/+2
| | |
| * | Use checked-in key to build ReleaseSignedJan Tattermusch2016-02-092-2/+2
| | |
| * | add private key for strong name assembliesJan Tattermusch2016-02-092-1/+5
|/ /
* | Merge pull request #1214 from haberman/binarygemJoshua Haberman2016-02-084-8/+26
|\ \ | | | | | | Added support for binary gems.
| * \ Merge pull request #1 from nicolasnoble/bin-gemsJoshua Haberman2016-02-052-3/+9
| |\ \ | | | | | | | | Few fixes.
| | * | Actually enabling cross compilation.Nicolas "Pixel" Noble2016-02-061-1/+7
| | | |
| | * | Removing usage of git - not everyone grabs the gem using it.Nicolas "Pixel" Noble2016-02-061-2/+2
| |/ /
| * | Add rake-compiler-dock as a dep.Josh Haberman2016-02-042-3/+6
| | |
| * | Added support for binary gems.Josh Haberman2016-02-043-3/+12
| | |
* | | Merge pull request #1205 from haberman/fixjstestsJoshua Haberman2016-02-053-103/+3
|\ \ \ | |/ / |/| | Enable JavaScript tests for binary parse/serialize.
| * | Enable JavaScript tests for binary parse/serialize.Josh Haberman2016-02-023-103/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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 #1213 from jskeet/rename-preconditionsJon Skeet2016-02-0426-142/+147
|\ \ \ | | | | | | | | Rename Preconditions to ProtoPreconditions
| * | | Generated code changes from previous commitJon Skeet2016-02-0411-53/+53
| | | |
| * | | Rename Preconditions to ProtoPreconditionsJon Skeet2016-02-0416-89/+94
|/ / / | | | | | | | | | (Generated code changes in next commit.)
* | | Merge pull request #1210 from jskeet/rename-generatedcodeinfoJan Tattermusch2016-02-0425-185/+495
|\ \ \ | | | | | | | | Rename GeneratedCodeInfo to GeneratedClrTypeInfo
| * | | Generated code for GeneratedCodeInfo changeJon Skeet2016-02-0419-168/+478
| | | |
| * | | Rename GeneratedCodeInfo to GeneratedClrTypeInfoJon Skeet2016-02-046-17/+17
|/ / / | | | | | | | | | | | | | | | | | | 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/readmeJie Luo2016-02-031-16/+32
|\ \ \ | |/ / |/| | Clarify readme for C#
| * | 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 root
| * | Make protobuf Skylark extension appends the workspace rootDamien Martin-Guillerez2016-01-151-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change make protobuf skylark extension works when using remote repository. Note that this make the Skylark extension unusable prior to Bazel 0.1.4 because the workspace_root is not available on prior version. Tested with Bazel 0.1.4rc2. Fixes https://github.com/bazelbuild/bazel/issues/784.
* | | 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.
| * | | 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
|\ \ \ | |/ / |/| | Integrate google internal changes to master
| * | 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
| | | | | | | | | | | | | | | 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.Jisi Liu2016-01-28141-0/+0
|/ / | | | | | | | | | | | | | | | | 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.
* | Merge pull request #1158 from jskeet/nonnormalized-tostringJan Tattermusch2016-01-2610-71/+378
|\ \ | | | | | | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throw
| * | Ensure that FieldMask, Timestamp and Duration ToString() calls don't throwJon Skeet2016-01-2010-71/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1169 from LuminateWireless/bazel-buildFeng Xiao2016-01-221-6/+10
|\ \ \ | | | | | | | | Fix bazel BUILD for Java.
| * | | 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.
| * | | Refactor README.md.Feng Xiao2016-01-212-186/+254
|/ / / | | | | | | | | | | | | | | | 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-jsonJan Tattermusch2016-01-211-2/+2
|\ \ \ | | | | | | | | Fix mistakes in highest-representable float64 integers
| * | | 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 pointers
| * | | Avoid upcasting uninitialized pointersBrian Silverman2016-01-201-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_fixFeng Xiao2016-01-204-13/+13
|\ \ \ | |/ / |/| | Fixing compile errors on Solaris in 64-bit mode
| * | 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 formatting
| * | | Introduce ICustomDiagnosticMessage to allow for custom string formattingJon Skeet2016-01-137-1/+142
| | | | | | | | | | | | | | | | This fixes issue #933, effectively.
* | | | Merge pull request #1155 from jcburke14/jb-intcastFeng Xiao2016-01-191-1/+1
|\ \ \ \ | | | | | | | | | | Fix compiler warning from repeated_field.h
| * | | | Fix compiler warning from repeated_field.hJohn Burke2016-01-191-1/+1
|/ / / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 10:15:06 +0000