aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename UNICODE to protobuf_UNICODEWei-Yin Chen (陳威尹)2016-09-012-3/+3
* Fix Win32ErrorMessage on Unicode buildWei-Yin Chen (陳威尹)2016-08-311-6/+6
* Add test for Win32ErrorMessageWei-Yin Chen (陳威尹)2016-08-311-0/+5
* Support Unicode build on WindowsWei-Yin Chen (陳威尹)2016-08-314-9/+14
* Merge pull request #2024 from pstavirs/masterFeng Xiao2016-08-317-12/+8
|\
| * Restore New*Callback into google::protobuf namespace since these are used by ...Srivats P2016-08-297-12/+8
* | Merge pull request #2033 from frett/osgiExportFeng Xiao2016-08-301-2/+2
|\ \
| * | update the OSGi SymbolicName and ExportedPackage for the javanano libraryDaniel Frett2016-08-301-2/+2
* | | Merge pull request #2031 from thomasvl/dont_require_filegeneratorsThomas Van Lenten2016-08-302-54/+14
|\ \ \ | |/ / |/| |
| * | Speed up ObjC Generation with large dependency treesThomas Van Lenten2016-08-302-54/+14
|/ /
* | Merge pull request #2012 from haberman/rubymapgcfixJoshua Haberman2016-08-294-9/+59
|\ \
| * | upb bugfix: JSON map entry keys were passing the wrong closure.Josh Haberman2016-08-291-1/+1
| * | Ruby: make sure map parsing frames are GC-rooted.Josh Haberman2016-08-263-8/+58
| |/
* | Merge pull request #1920 from gegles/masterJoshua Haberman2016-08-291-0/+2
|\ \
| * | Fix missing import of jspb.Map (#1885)Guillaume Egles2016-08-031-0/+2
* | | Merge pull request #2018 from thomasvl/support_generate_allThomas Van Lenten2016-08-295-58/+98
|\ \ \ | |_|/ |/| |
| * | Support GenerateAll().Thomas Van Lenten2016-08-265-58/+98
* | | Merge pull request #2013 from xfxyjwf/gmockFeng Xiao2016-08-252-7/+18
|\ \ \
| * | | Update links in appveyor.ymlFeng Xiao2016-08-251-3/+9
| * | | Update gmock links.Feng Xiao2016-08-251-4/+9
|/ / /
* | | Merge pull request #2011 from tomas-abrahamsson/patch-1Feng Xiao2016-08-251-0/+1
|\ \ \ | |/ / |/| |
| * | 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
|\ \