Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add JsonParseOptions to ignore unknown fields | Lizan Zhou | 2016-06-28 | 8 | -32/+214 |
| | | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions | ||||
* | Adding conditional compiler symbol to support .NET 3.5 (#1713) | detlevschwabe | 2016-06-28 | 7 | -5/+36 |
| | | | | * Adding condition compiler symbol to support .NET 3.5 | ||||
* | Merge pull request #1719 from esteluk/patch-1 | Thomas Van Lenten | 2016-06-27 | 1 | -1/+1 |
|\ | | | | | Fix Objective-C generator option readme typo | ||||
| * | Fix Objective-C generator option typo | Nathan Wong | 2016-06-27 | 1 | -1/+1 |
|/ | | | Looks like this was changed during #1683, but missed in the README :) | ||||
* | Merge pull request #1714 from dnkoutso/master | Thomas Van Lenten | 2016-06-26 | 3 | -0/+26 |
|\ | | | | | Get value from text format name in GPBEnumDescriptor | ||||
| * | Get value from text format name in GPBEnumDescriptor | Dimitris Koutsogiorgas | 2016-06-26 | 3 | -0/+26 |
| | | |||||
* | | Merge pull request #1705 from haberman/revjsver | Joshua Haberman | 2016-06-23 | 1 | -7/+9 |
|\ \ | | | | | | | Updates to package.json: rev version, add WKT, and recateogrize dependencies | ||||
| * | | JS package.json: Added author and updated Closure Library version. | Josh Haberman | 2016-06-23 | 1 | -3/+5 |
| | | | |||||
| * | | Moved all dependencies to devDependencies. | Josh Haberman | 2016-06-22 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | The runtime doesn't depend on anything, so these packages should always have been in devDependencies. | ||||
| * | | Add "google" to package.json "files" for WKT. | Josh Haberman | 2016-06-22 | 1 | -0/+1 |
| | | | |||||
| * | | Create patch release for JS to include WKT. | Josh Haberman | 2016-06-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1707 from jskeet/format-value | Jan Tattermusch | 2016-06-23 | 2 | -25/+58 |
|\ \ \ | |/ / |/| | | Expose JsonFormatter.WriteValue. | ||||
| * | | Expose JsonFormatter.WriteValue. | Jon Skeet | 2016-06-23 | 2 | -25/+58 |
|/ / | | | | | | | | | This isn't useful to most users, but can be handy in advanced use cases, as requested in #1465. | ||||
* | | Merge pull request #1700 from jskeet/ordering | Jon Skeet | 2016-06-21 | 1 | -3/+4 |
|\ \ | | | | | | | Remove ordering guarantees in the MapField documentation | ||||
| * | | Remove ordering guarantees in the MapField documentation | Jon Skeet | 2016-06-21 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This doesn't currently change the ordering in the implementation, but allows us to do so in the future. We also need to change https://developers.google.com/protocol-buffers/docs/reference/csharp-generated#singular which states "Finally, unlike Dictionary<TKey, TValue>, MapField<TKey, TValue> preserves insertion order of entries." (We can just remove that sentence, I think.) | ||||
* | | | Rename methods to avoid ObjC KVC collisions. (#1699) | Thomas Van Lenten | 2016-06-21 | 14 | -7325/+7448 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: Breaking API change on the Dictionary classes. The numeric value classes were using "Value" in the naming, but this silently collided with the KVC category on NSObject; meaning KVC code could break up a keypath and call these selectors with the wrong types leading to crashes (even though the code all would compile cleanly). - Rename the methods to use the "type" instead of literal "Value". - Update all the impls and tests. - Enable the warning that will catch issues like this in the future. Fixes https://github.com/google/protobuf/issues/1616 | ||||
* | | Adds destination flag to xcodebuild to avoid possible flake errors (#1697) | Sergio Campamá | 2016-06-20 | 1 | -1/+6 |
| | | | | | | | | Adds destination flag to xcodebuild to avoid possible flake errors | ||||
* | | Merge pull request #1666 from yeswalrus/cmake-prerelease-examples | Feng Xiao | 2016-06-17 | 2 | -15/+22 |
|\ \ | | | | | | | CMake Fix up prerelease version handling | ||||
| * | | Fix prerelease version matching to be more consistent with the find_package ↵ | Walter Gray | 2016-06-09 | 2 | -15/+22 |
| | | | | | | | | | | | | arguments. | ||||
* | | | Merge pull request #1696 from haberman/jswkt | Joshua Haberman | 2016-06-17 | 2 | -5/+46 |
|\ \ \ | | | | | | | | | JS: import well-known types from google-protobuf package. | ||||
| * | | | Fix tests for CommonJS. | Josh Haberman | 2016-06-16 | 1 | -2/+11 |
| | | | | |||||
| * | | | Added plugin.proto to well-known types for JS. | Josh Haberman | 2016-06-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | Bugfix: base the require logic on the file being required. | Josh Haberman | 2016-06-16 | 1 | -4/+4 |
| | | | | |||||
| * | | | JS: import well-known types from google-protobuf package. | Josh Haberman | 2016-06-16 | 2 | -2/+33 |
| | | | | |||||
* | | | | Add new generation option for using proto sources from other frameworks. | Thomas Van Lenten | 2016-06-17 | 5 | -127/+348 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better docs in the generator for the different options that can be passed during an invoke of protoc. - Add named_framework_to_proto_path_mappings_path to pass the path to a file containing mappings of frameworks for different proto files. - Update the generation to use the mapping to change the #import directives it creates. Note: the changes in helpers is mostly moving code within the fine, and then a small change to expose the parsing so a passed on class can consume the line. Fixes https://github.com/google/protobuf/issues/1457 | ||||
* | | | | Merge pull request #1692 from vjpai/friendless | Feng Xiao | 2016-06-16 | 1 | -4/+7 |
|\ \ \ \ | | | | | | | | | | | Workaround for gcc-4.4 incompatibility | ||||
| * | | | | Address review comments on function name | vjpai | 2016-06-16 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Remove a friend-class template that is only used for the | Vijay Pai | 2016-06-15 | 1 | -4/+7 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | constructor, and instead create an _internal_only getter that gets the needed information. This is a workaround for a deficiency in gcc-4.4 that does not properly support templated friend classes. | ||||
* | | | | Merge pull request #1658 from yeswalrus/cmake-fixup-module | Feng Xiao | 2016-06-15 | 1 | -24/+9 |
|\ \ \ \ | | | | | | | | | | | Cleanup protobuf-module.cmake.in | ||||
| * | | | | Removed handling for ALIASED targets since they are unused. | Walter Gray | 2016-06-07 | 1 | -24/+9 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1665 from yeswalrus/cmake-package-requirements | Feng Xiao | 2016-06-15 | 3 | -12/+23 |
|\ \ \ \ | |_|/ / |/| | | | CMake package requirements | ||||
| * | | | make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use. | Walter Gray | 2016-06-09 | 1 | -1/+3 |
| | | | | |||||
| * | | | Save the relevant options used to create a package, allow users to reject ↵ | Walter Gray | 2016-06-09 | 2 | -11/+20 |
| |/ / | | | | | | | | | | packages based on them. | ||||
* | | | Merge pull request #1683 from thomasvl/third_party_framework | Thomas Van Lenten | 2016-06-15 | 5 | -10/+54 |
|\ \ \ | | | | | | | | | Add support for generation sources into a framework. | ||||
| * | | | Add support for generation sources into a framework. | Thomas Van Lenten | 2016-06-15 | 5 | -10/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a protoc objc option (generate_for_named_framework) to set the name of the framework all generated sources will be in. - Tweak some comments/naming to make it clear what is the Protobuf framework vs. the framework for generated code. - Update the objc README to document the new generation option to protoc. This is working towards https://github.com/google/protobuf/issues/1457. | ||||
* | | | | Add the CocoaPods integration tests to Travis. | Sergio Campamá | 2016-06-14 | 3 | -1/+25 |
|/ / / | | | | | | | | | | | | | | | | Also hotwires updating ruby as CocoaPods was crashing within a support library. Fixes #1619 | ||||
* | | | Fixes Xcode 8 analyzer warning saying that it was missing a release in ↵ | Sergio Campamá | 2016-06-14 | 1 | -0/+5 |
| | | | | | | | | | | | | dealloc (#1678) | ||||
* | | | Merge pull request #1664 from bshaffer/patch-1 | Feng Xiao | 2016-06-10 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | proper codeblock in README | ||||
| * | | | proper codeblock in README | Brent Shaffer | 2016-06-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #879 from mathstuf/support-equals-in-proto-path | Feng Xiao | 2016-06-08 | 2 | -2/+22 |
|\ \ \ | |/ / |/| | | protoc: support '=' in --proto_path arguments | ||||
| * | | protoc: support '=' in --proto_path arguments | Ben Boeckel | 2016-04-20 | 2 | -2/+22 |
| | | | |||||
* | | | Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTR | Bo Yang | 2016-06-07 | 3 | -3/+3 |
| | | | |||||
* | | | Fix the undefined behavior for opensource users. | Bo Yang | 2016-06-07 | 1 | -3/+5 |
| | | | |||||
* | | | Merge pull request #1624 from yeswalrus/cmake-prerelease-versioning | Feng Xiao | 2016-06-07 | 2 | -17/+30 |
|\ \ \ | | | | | | | | | CMake prerelease versioning | ||||
| * | | | For prerelease versions, require protobuf_FIND_VERSION to be set. | Walter Gray | 2016-05-31 | 1 | -16/+22 |
| | | | | |||||
| * | | | Include the prerelease version in the protobuf_VERSION | Walter Gray | 2016-05-31 | 1 | -1/+8 |
| | | | | |||||
* | | | | Merge pull request #1643 from yeswalrus/cmake-examples | Feng Xiao | 2016-06-07 | 8 | -76/+335 |
|\ \ \ \ | | | | | | | | | | | Build examples in CMake | ||||
| * | | | | Replace handwritten protobuf-targets with exported version. | Walter Gray | 2016-06-06 | 3 | -39/+24 |
| | | | | | |||||
| * | | | | Use ExternalProject_Add to build the examples in a stand-alone fashion. | Walter Gray | 2016-06-06 | 2 | -62/+93 |
| | | | | | |||||
| * | | | | CMake project updates | Konstantin Podsvirov | 2016-06-04 | 9 | -69/+312 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A series of improvements: - Improved Protobuf module compatibility (disabled by default); - Hide advanced settings; - Added build tree configuration; - Added build of examples. |