aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add an Erlang project, gpb, to third_party.mdTomas Abrahamsson2016-08-251-0/+1
* Merge pull request #2001 from nicolasnoble/patch-1Joshua Haberman2016-08-241-1/+1
|\
| * Fixing regular expression...Nicolas Noble2016-08-231-1/+1
|/
* Merge pull request #1997 from thomasvl/move_include_package_into_helpersThomas Van Lenten2016-08-234-207/+224
|\
| * Remove the compiler options from ImportWriter.Thomas Van Lenten2016-08-233-22/+42
| * Move the ImportWriter into the ObjC Helpers.Thomas Van Lenten2016-08-234-205/+202
|/
* Add note about JSON tests maybe being wrong. (#1992)Thomas Van Lenten2016-08-238-16/+35
* Merge pull request #1984 from thomasvl/more_json_testsThomas Van Lenten2016-08-224-0/+85
|\
| * More JSON testsThomas Van Lenten2016-08-224-0/+85
|/
* Adds better support for protos without packages (#1979)Sergio Campamá2016-08-191-17/+51
* Merge pull request #1967 from sergiocampama/castThomas Van Lenten2016-08-161-4/+4
|\
| * Adding casts so that code importing protobug using -Wconversion does not gene...Sergio Campama2016-08-161-4/+4
|/
* Add more JSON tests around underscores (#1963)Thomas Van Lenten2016-08-165-39/+259
* Merge pull request #1957 from xfxyjwf/jenkins_badgeFeng Xiao2016-08-151-1/+1
|\
| * Add a jenkins test status badge.Feng Xiao2016-08-121-1/+1
* | Merge pull request #1964 from thomasvl/missing_ignoresThomas Van Lenten2016-08-152-2/+4
|\ \
| * | Fix up ignores and conformance generationThomas Van Lenten2016-08-152-2/+4
|/ /
* | Merge pull request #1960 from jskeet/oneofThomas Van Lenten2016-08-152-103/+242
|\ \ | |/ |/|
| * Regenerate conformance files to include extra oneof fields.Jon Skeet2016-08-152-103/+242
|/
* 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
|/ / / / /