aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Try jenkins.test_jenkinsFeng Xiao2016-08-121-0/+1
* Fixes extra whitespace on generated comments. (#1950)Sergio Campamá2016-08-1210-123/+131
* Merge pull request #1949 from thomasvl/objc_more_reset_testsThomas Van Lenten2016-08-121-29/+152
|\
| * More complete nil/reset tests within a oneofThomas Van Lenten2016-08-121-6/+12
| * Fix some constants to be correct for the message class in use.Thomas Van Lenten2016-08-121-21/+23
| * More explicit tests for nil behaviors on fields.Thomas Van Lenten2016-08-121-4/+119
|/
* Merge pull request #1942 from thomasvl/objc_fix_oneof_zerosThomas Van Lenten2016-08-117-31/+357
|\
| * Add more types to the zero oneof cases.Thomas Van Lenten2016-08-114-0/+61
| * Record zero for "has" for proto3 if in a oneof.Thomas Van Lenten2016-08-113-31/+296
|/
* Add conformance test for zero fields in oneofs. (#1939)Thomas Van Lenten2016-08-116-2/+57
* Merge pull request #1934 from thomasvl/objc_strings_with_nullThomas Van Lenten2016-08-093-33/+100
|\
| * Never use strlen on utf8 runs so null characters work.Thomas Van Lenten2016-08-093-33/+100
|/
* Adds support for appledoc in generated code. (#1928)Sergio Campamá2016-08-0920-851/+1041
* Merge pull request #1842 from udnaan/masterFeng Xiao2016-08-081-1/+1
|\
| * fixed cmake config files install pathAdnan2016-07-261-1/+1
* | Migrating documentation of the ObjectiveC runtime code to appledoc. (#1867)Sergio Campamá2016-08-0814-774/+9524
* | Merge pull request #1923 from bryongloden/patch-1Feng Xiao2016-08-051-0/+1
|\ \
| * | close opened file descriptors properlyBryon Gloden, CISSP®2016-08-051-0/+1
* | | Merge pull request #1924 from PiotrSikora/export_licenseJisi Liu2016-08-051-0/+2
|\ \ \
| * | | Bazel: export LICENSE file.Piotr Sikora2016-08-041-0/+2
| |/ /
* | | Merge pull request #1926 from hotpxl/masterFeng Xiao2016-08-051-1/+2
|\ \ \ | |/ / |/| |
| * | [master] Add dependency cl. Fixes google/protobuf#295.Yutian Li2016-08-051-1/+2
|/ /
* | Merge pull request #1044 from mark-whiting/masterFeng Xiao2016-08-041-0/+18
|\ \
| * | Adding missing generic gcc 64-bit atomicops.Mark Whiting2015-12-141-0/+18
* | | Merge pull request #1898 from sergiocampama/watchosThomas Van Lenten2016-08-041-0/+1
|\ \ \
| * | | Adds watch os deployment target for protobufSergio Campama2016-07-291-0/+1
* | | | Merge pull request #1865 from podsvirov/topic-cmake-projectFeng Xiao2016-08-034-2/+9
|\ \ \ \
| * | | | CMake: Auto find ZLIB from package config if neddedKonstantin Podsvirov2016-08-022-0/+5
| * | | | CMake: Bugfix for protobuf_MODULE_COMPATIBLEKonstantin Podsvirov2016-07-281-1/+0
| * | | | CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabledKonstantin Podsvirov2016-07-281-1/+4
* | | | | Merge pull request #1914 from adamatan/typo-fixFeng Xiao2016-08-031-1/+1
|\ \ \ \ \
| * | | | | Typo: beffer -> bufferAdam Matan2016-08-031-1/+1
|/ / / / /
* | | | | Merge pull request #1878 from haberman/rubywktJoshua Haberman2016-08-014-2/+338
|\ \ \ \ \
| * | | | | Ruby: added custom Struct exception type and fixed Makefile.am.Josh Haberman2016-08-013-11/+42
| * | | | | Fix for JRuby (assert_true is not present).Josh Haberman2016-07-282-3/+3
| * | | | | Ruby: added API support for well-known types.Josh Haberman2016-07-283-0/+305
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1903 from xfxyjwf/compatibility_testsFeng Xiao2016-08-011-5/+5
|\ \ \ \ \
| * | | | | Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-011-5/+5
|/ / / / /
* | | | | Merge pull request #1902 from podsvirov/topic-cmake-extract-includesFeng Xiao2016-08-011-1/+0
|\ \ \ \ \
| * | | | | CMake: remove repeated_field_reflection.h from extract listKonstantin Podsvirov2016-08-011-1/+0
|/ / / / /
* | | / / Amend the conformance tests to only use Int64/Uint64 non-wrapped values which...Jon Skeet2016-07-312-8/+12
| |_|/ / |/| | |
* | | | Merge pull request #1887 from sheffatguidance/fix-js-api-documentationJoshua Haberman2016-07-291-2/+1
|\ \ \ \
| * | | | Fix Issue #1869: faulty js API documentationsheffatguidance2016-07-291-2/+1
| | |/ / | |/| |
* | | | Merge pull request #1884 from hochhaus/valueWriterFnJoshua Haberman2016-07-291-1/+1
|\ \ \ \
| * | | | Fix valueWriterFn variable nameAndy Hochhaus2016-07-291-1/+1
| |/ / /
* | | | Merge pull request #1895 from google/3.0.0-GAJisi Liu2016-07-291-0/+1
|\ \ \ \
| * \ \ \ Merge pull request #1894 from pherl/fixdistJisi Liu2016-07-291-0/+1
| |\ \ \ \
| | * | | | Add python/setup.cfg into dist filesJisi Liu2016-07-291-0/+1
| |/ / / /
* | | | | Merge pull request #1893 from google/3.0.0-GAJisi Liu2016-07-2923-53/+158
|\| | | |
| * | | | Merge pull request #1892 from xfxyjwf/compatibility_testsJisi Liu2016-07-292-0/+13
| |\ \ \ \