aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2077 from pherl/3.0.xv3.0.2Jisi Liu2016-09-061-1/+1
|\
| * Update release date in the change logJisi Liu2016-09-061-1/+1
|/
* Merge pull request #2062 from pherl/3.0.2Jisi Liu2016-09-0611-11/+11
|\
| * Bump version number to 3.0.2Jisi Liu2016-09-0211-11/+11
* | Merge pull request #2061 from pherl/changelogJisi Liu2016-09-061-0/+20
|\ \ | |/ |/|
| * ruby, js and c# changesJisi Liu2016-09-021-2/+6
| * objc change logJisi Liu2016-09-021-0/+16
* | Merge pull request #1862 from pherl/3.0.0-GAJisi Liu2016-09-025-16/+18
|\ \ | |/ |/|
| * Bring C#'s ToPascalCase method in line with C++.Jon Skeet2016-07-272-2/+16
| * Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
* | Merge pull request #1978 from pherl/cpJisi Liu2016-09-021-1/+1
|\ \
| * | Add a jenkins test status badge.Feng Xiao2016-08-181-1/+1
* | | Merge pull request #2026 from pherl/cpjsJisi Liu2016-09-026-14/+66
|\ \ \
| * | | Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-311-5/+5
| * | | Merge pull request #2012 from haberman/rubymapgcfixJoshua Haberman2016-08-304-9/+59
| * | | Fix missing import of jspb.Map (#1885)Guillaume Egles2016-08-291-0/+2
|/ / /
* | | Merge pull request #2014 from pherl/fixgmockJisi Liu2016-08-262-7/+18
|\ \ \ | |/ / |/| |
| * | Update gmock links.Feng Xiao2016-08-261-4/+9
| * | Update links in appveyor.ymlFeng Xiao2016-08-261-3/+9
|/ /
* | Merge pull request #1977 from thomasvl/bump_cocoapod_specThomas Van Lenten2016-08-181-1/+2
|\ \
| * | Bump the version in prep for the 3.0.2 tag being cutThomas Van Lenten2016-08-171-1/+2
|/ /
* | Merge pull request #1975 from pherl/cpThomas Van Lenten2016-08-1739-1687/+10969
|\ \
| * | Record zero for "has" for proto3 if in a oneof.Thomas Van Lenten2016-08-173-29/+296
| * | Never use strlen on utf8 runs so null characters work.Thomas Van Lenten2016-08-173-33/+100
| * | Fixes extra whitespace on generated comments. (#1950)Sergio Campamá2016-08-1710-123/+131
| * | Adds support for appledoc in generated code. (#1928)Sergio Campamá2016-08-1720-851/+1041
| * | Migrating documentation of the ObjectiveC runtime code to appledoc. (#1867)Sergio Campamá2016-08-1714-774/+9524
|/ /
* | Merge pull request #1905 from pherl/fixdocJisi Liu2016-08-0215-8/+98
|\ \
| * | Add and fix C++ runtime docsJisi Liu2016-08-0215-8/+98
* | | 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 #1892 from xfxyjwf/compatibility_testsJisi Liu2016-07-292-0/+13
|\ \ \
| * | | Run Java compatibility tests on Travis.Feng Xiao2016-07-292-0/+13
* | | | Merge pull request #1891 from pherl/pythonJisi Liu2016-07-291-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | add setup.cfg for building wheelsJisi Liu2016-07-291-0/+2
* | | | Merge pull request #1888 from pherl/fixbuildzipJisi Liu2016-07-291-2/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the build-zip.sh to add .exe for win packages.Jisi Liu2016-07-291-2/+8
|/ / /
* | | Merge pull request #1874 from pherl/buildzipJisi Liu2016-07-282-19/+31
|\ \ \
| * | | Change the build.zip.sh to support liteJisi Liu2016-07-282-19/+31
| |/ /
* | | Merge pull request #1871 from pherl/fixwinJisi Liu2016-07-281-5/+3
|\ \ \ | |/ / |/| |
| * | Fix build protoc script for windowsJisi Liu2016-07-281-5/+3
|/ /
* | Merge pull request #1864 from pherl/galogsv3.0.0Jisi Liu2016-07-271-0/+51
|\ \
| * | Change log for 3.0 GA release.Jisi Liu2016-07-271-0/+51
|/ /
* | Merge pull request #1853 from pherl/3.0.0-GAJisi Liu2016-07-262-8/+22
|\|
| * fix comments.Jisi Liu2016-07-261-1/+1
| * Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GAJisi Liu2016-07-264-14/+23
| |\ | |/ |/|
* | Merge pull request #1851 from xfxyjwf/cintFeng Xiao2016-07-262-5/+5
|\ \
| * | Fixes traivs cpp build.Feng Xiao2016-07-262-5/+5
|/ /
* | Merge pull request #1847 from haberman/GAfixesJoshua Haberman2016-07-2612-18/+182
|\ \
| * | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-261-1/+1