aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2079 from khingblue/fix-generate-descriptorFeng Xiao2016-09-071-1/+1
|\
| * Fix #2071 replacing /bin/sh with bashKhing2016-09-071-1/+1
|/
* Merge pull request #2047 from jonathon-love/masterJoshua Haberman2016-09-061-1/+1
|\
| * Fix to typo/oversight in python testsJonathon Love2016-09-021-1/+1
* | Rm check on dependency in the C# reflection API (#2051)Guillaume Turri2016-09-051-12/+1
* | Merge pull request #2059 from chih-hung/masterFeng Xiao2016-09-026-14/+14
|\ \
| * | Fix #1955 clang-tidy warning misc-macro-parenthesesChih-Hung Hsieh2016-09-026-14/+14
|/ /
* | Merge pull request #2045 from mike07026/masterFeng Xiao2016-09-022-1/+32
|\ \
| * | detect invaild JSON encoding in bytes fieldmike070262016-09-011-23/+23
| * | detect invaild JSON encoding in bytes fieldmike070262016-09-011-0/+28
| * | fix #1342 cause by ownership issuesmike070262016-09-011-1/+4
* | | Merge pull request #2053 from thomasvl/improve_root_registry_wiringThomas Van Lenten2016-09-0226-86/+626
|\ \ \ | |_|/ |/| |
| * | Make Root's +extensionRegistry generation smarter.Thomas Van Lenten2016-09-0126-86/+626
* | | Merge pull request #2039 from khingblue/remove-unused-vectorJisi Liu2016-09-011-1/+0
|\ \ \ | |_|/ |/| |
| * | Remove unused vectorKhing2016-08-311-1/+0
* | | 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
|\ \ \ | |/ / |/| |