aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Xcode project cleanup/setup.Thomas Van Lenten2016-06-296-43/+11
* Validate the tag numbers when parsing. (#1725)Thomas Van Lenten2016-06-295-4/+21
* Merge pull request #1720 from thomasvl/issue_1716Thomas Van Lenten2016-06-283-22/+72
|\
| * Fix GPBGetMessage{Repeated,Map}Field()Thomas Van Lenten2016-06-273-22/+72
* | Adding conditional compiler symbol to support .NET 3.5 (#1713)detlevschwabe2016-06-287-5/+36
* | Merge pull request #1719 from esteluk/patch-1Thomas Van Lenten2016-06-271-1/+1
|\ \ | |/ |/|
| * Fix Objective-C generator option typoNathan Wong2016-06-271-1/+1
|/
* Merge pull request #1714 from dnkoutso/masterThomas Van Lenten2016-06-263-0/+26
|\
| * Get value from text format name in GPBEnumDescriptorDimitris Koutsogiorgas2016-06-263-0/+26
* | Merge pull request #1705 from haberman/revjsverJoshua Haberman2016-06-231-7/+9
|\ \
| * | JS package.json: Added author and updated Closure Library version.Josh Haberman2016-06-231-3/+5
| * | Moved all dependencies to devDependencies.Josh Haberman2016-06-221-6/+5
| * | Add "google" to package.json "files" for WKT.Josh Haberman2016-06-221-0/+1
| * | Create patch release for JS to include WKT.Josh Haberman2016-06-221-1/+1
* | | Merge pull request #1707 from jskeet/format-valueJan Tattermusch2016-06-232-25/+58
|\ \ \ | |/ / |/| |
| * | Expose JsonFormatter.WriteValue.Jon Skeet2016-06-232-25/+58
|/ /
* | Merge pull request #1700 from jskeet/orderingJon Skeet2016-06-211-3/+4
|\ \
| * | Remove ordering guarantees in the MapField documentationJon Skeet2016-06-211-3/+4
* | | Rename methods to avoid ObjC KVC collisions. (#1699)Thomas Van Lenten2016-06-2114-7325/+7448
|/ /
* | Adds destination flag to xcodebuild to avoid possible flake errors (#1697)Sergio Campamá2016-06-201-1/+6
* | Merge pull request #1666 from yeswalrus/cmake-prerelease-examplesFeng Xiao2016-06-172-15/+22
|\ \
| * | Fix prerelease version matching to be more consistent with the find_package a...Walter Gray2016-06-092-15/+22
* | | Merge pull request #1696 from haberman/jswktJoshua Haberman2016-06-172-5/+46
|\ \ \
| * | | Fix tests for CommonJS.Josh Haberman2016-06-161-2/+11
| * | | Added plugin.proto to well-known types for JS.Josh Haberman2016-06-161-0/+1
| * | | Bugfix: base the require logic on the file being required.Josh Haberman2016-06-161-4/+4
| * | | JS: import well-known types from google-protobuf package.Josh Haberman2016-06-162-2/+33
* | | | Add new generation option for using proto sources from other frameworks.Thomas Van Lenten2016-06-175-127/+348
* | | | Merge pull request #1692 from vjpai/friendlessFeng Xiao2016-06-161-4/+7
|\ \ \ \
| * | | | Address review comments on function namevjpai2016-06-161-2/+2
| * | | | Remove a friend-class template that is only used for theVijay Pai2016-06-151-4/+7
|/ / / /
* | | | Merge pull request #1658 from yeswalrus/cmake-fixup-moduleFeng Xiao2016-06-151-24/+9
|\ \ \ \
| * | | | Removed handling for ALIASED targets since they are unused.Walter Gray2016-06-071-24/+9
| | |/ / | |/| |
* | | | Merge pull request #1665 from yeswalrus/cmake-package-requirementsFeng Xiao2016-06-153-12/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use.Walter Gray2016-06-091-1/+3
| * | | Save the relevant options used to create a package, allow users to reject pac...Walter Gray2016-06-092-11/+20
| |/ /
* | | Merge pull request #1683 from thomasvl/third_party_frameworkThomas Van Lenten2016-06-155-10/+54
|\ \ \
| * | | Add support for generation sources into a framework.Thomas Van Lenten2016-06-155-10/+54
* | | | Add the CocoaPods integration tests to Travis.Sergio Campamá2016-06-143-1/+25
|/ / /
* | | Fixes Xcode 8 analyzer warning saying that it was missing a release in deallo...Sergio Campamá2016-06-141-0/+5
* | | Merge pull request #1664 from bshaffer/patch-1Feng Xiao2016-06-101-1/+1
|\ \ \
| * | | proper codeblock in READMEBrent Shaffer2016-06-091-1/+1
|/ / /
* | | Merge pull request #879 from mathstuf/support-equals-in-proto-pathFeng Xiao2016-06-082-2/+22
|\ \ \ | |/ / |/| |
| * | protoc: support '=' in --proto_path argumentsBen Boeckel2016-04-202-2/+22
* | | Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTRBo Yang2016-06-073-3/+3
* | | Fix the undefined behavior for opensource users.Bo Yang2016-06-071-3/+5
* | | Merge pull request #1624 from yeswalrus/cmake-prerelease-versioningFeng Xiao2016-06-072-17/+30
|\ \ \
| * | | For prerelease versions, require protobuf_FIND_VERSION to be set.Walter Gray2016-05-311-16/+22
| * | | Include the prerelease version in the protobuf_VERSIONWalter Gray2016-05-311-1/+8
* | | | Merge pull request #1643 from yeswalrus/cmake-examplesFeng Xiao2016-06-078-76/+335
|\ \ \ \