aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | CocoaPod Integration TestsThomas Van Lenten2016-05-1923-0/+2063
| * | | Expand the OS X/Xcode gitignoresThomas Van Lenten2016-05-192-7/+28
* | | | Merge pull request #1558 from haberman/rubyoneofJoshua Haberman2016-05-193-24/+59
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed oneof behavior for enums and fixed JRuby.Josh Haberman2016-05-183-11/+24
| * | | Ruby oneofs: return default instead of nil for unset fields.Josh Haberman2016-05-182-20/+42
* | | | Merge pull request #1549 from xyzzyz/arena_exportJoshua Haberman2016-05-181-1/+1
|\ \ \ \
| * | | | Export class Arena to shared library.Adam Michalik2016-05-171-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1547 from xyzzyz/js_generatorJoshua Haberman2016-05-181-1/+1
|\ \ \ \
| * | | | Fix #include in js_generator.ccAdam Michalik2016-05-171-1/+1
| |/ / /
* | | | Merge pull request #1559 from google/beta-3Jisi Liu2016-05-182-1/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge pull request #1551 from pherl/beta-3Jisi Liu2016-05-171-1/+1
| |\ \
| | * | Fix protoc artifact pom versionJisi Liu2016-05-171-1/+1
| * | | Merge pull request #1546 from pherl/beta-3Jisi Liu2016-05-171-0/+1
| |\| |
| | * | Added download_url to be able to upload to pypi.Jisi Liu2016-05-171-0/+1
| |/ /
* | | Merge pull request #1412 from google/internalPaul Yang2016-05-182-1/+2
|\ \ \
| * | | Integrate interanl changesBo Yang2016-05-182-1/+2
|/ / /
* | | Merge pull request #1548 from anandolee/masterJoshua Haberman2016-05-172-1/+22
|\ \ \ | |_|/ |/| |
| * | JSON format for Any message must print @type first, use OrderedDict instead o...Jie Luo2016-05-172-1/+22
* | | Merge pull request #1542 from google/beta-3Jisi Liu2016-05-1616-23/+206
|\ \ \ | | |/ | |/|
| * | Merge pull request #1540 from pherl/changelogv3.0.0-beta-3Jisi Liu2016-05-161-2/+8
| |\ \
| | * | Update changes for liteJisi Liu2016-05-161-2/+8
| * | | Merge pull request #1533 from pherl/mapcommentJisi Liu2016-05-161-3/+1
| |\ \ \
| | * | | Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
| |/ / /
| * | | Merge pull request #1532 from pherl/changelogJisi Liu2016-05-131-1/+6
| |\| |
| | * | Update changelogs for C++ mapsJisi Liu2016-05-131-1/+6
| |/ /
| * | Merge pull request #1527 from haberman/changelogJisi Liu2016-05-121-1/+14
| |\ \
| | * | Added release notes for Ruby and JavaScript.Josh Haberman2016-05-121-1/+14
| |/ /
| * | Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
| |\ \
| | * | Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
| * | | Merge pull request #1524 from anandolee/masterJisi Liu2016-05-121-1/+5
| |\ \ \ | | | |/ | | |/|
| | * | python changesJie Luo2016-05-111-1/+5
| | * | Merge pull request #1 from google/beta-3Jie Luo2016-05-11862-26667/+104755
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1515 from pherl/changelog-beta3Jisi Liu2016-05-111-0/+104
| |\ \ \
| | * | | Update comments for csharp, zero-copy and objc.Jisi Liu2016-05-111-3/+55
| | * | | Fix typo.Jisi Liu2016-05-111-1/+1
| | * | | Initial draft for changelog.Jisi Liu2016-05-101-0/+52
| | | |/ | | |/|
| * | | Merge pull request #1512 from pherl/beta-3Jisi Liu2016-05-1112-14/+14
| |\ \ \
| | * | | Fix csharp versionJisi Liu2016-05-111-1/+1
| | * | | Update version numbers for other languagesJisi Liu2016-05-108-10/+10
| | * | | Update version numbers for beta3Jisi Liu2016-05-103-3/+3
| | |/ /
| * | | Merge pull request #1514 from pherl/fix_heap_checkJisi Liu2016-05-101-3/+4
| |\ \ \
| | * | | Fix the command line interface unittest againJisi Liu2016-05-101-3/+4
| | |/ /
| * | | Merge pull request #1513 from pherl/fix-build-protocJisi Liu2016-05-101-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix protoc build artifact script.Jisi Liu2016-05-101-1/+1
| |/ /
* | | Merge pull request #1529 from gkraynov/test-redundant-varintJoshua Haberman2016-05-131-0/+52
|\ \ \
| * | | Test redundant varint fields decoding in JS.Grigoriy Kraynov2016-05-121-0/+52
* | | | Merge pull request #1528 from pherl/masterJisi Liu2016-05-131-4/+1
|\ \ \ \
| * | | | Remove the instructions for pbconfig.hJisi Liu2016-05-121-4/+1
|/ / / /
* | | | Merge pull request #1521 from zhangkun83/masterJisi Liu2016-05-122-5/+23
|\ \ \ \
| * | | | Fix the server id in exampleKun Zhang2016-05-121-1/+1