aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Replace handwritten protobuf-targets with exported version.Walter Gray2016-06-063-39/+24
| * | | Use ExternalProject_Add to build the examples in a stand-alone fashion.Walter Gray2016-06-062-62/+93
| * | | CMake project updatesKonstantin Podsvirov2016-06-049-69/+312
* | | | Merge pull request #1541 from haberman/conformancestrictJoshua Haberman2016-06-0612-163/+155
|\ \ \ \ | |/ / / |/| | |
| * | | Make surrogate regex even more lenient.Josh Haberman2016-06-061-2/+2
| * | | JSON surrogates Python: adjust regex for OSX error message.Josh Haberman2016-06-061-2/+2
| * | | Added test for surrogates (valid and invalid).Josh Haberman2016-06-031-0/+21
| * | | Added update_failure_list.py.Josh Haberman2016-06-031-0/+73
| * | | Surrogate checking is unpredictable, so always manually check.Josh Haberman2016-06-032-24/+6
| * | | Fixed Python by updating failure lists and fixed a few broken tests.Josh Haberman2016-06-035-83/+28
| * | | Make conformance tests more strict about the failure list.Josh Haberman2016-06-035-80/+51
|/ / /
* | | Integrate interanl changesBo Yang2016-06-021-0/+1
* | | Improving the granularity parsing errors (#1623)Sergio Campamá2016-06-025-42/+223
* | | Merge pull request #1640 from os72/masterFeng Xiao2016-06-021-0/+1
|\ \ \
| * | | Add https://github.com/os72/protobuf-dynamicos722016-05-311-0/+1
|/ / /