Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1574 from thomasvl/test_schemes | Thomas Van Lenten | 2016-05-19 | 2 | -0/+182 |
|\ | |||||
| * | Add shared schemes for the CocoaPods integration tests | Thomas Van Lenten | 2016-05-19 | 2 | -0/+182 |
|/ | |||||
* | Merge pull request #1572 from thomasvl/podspec_tests_2 | Thomas Van Lenten | 2016-05-19 | 25 | -7/+2091 |
|\ | |||||
| * | CocoaPod Integration Tests | Thomas Van Lenten | 2016-05-19 | 23 | -0/+2063 |
| * | Expand the OS X/Xcode gitignores | Thomas Van Lenten | 2016-05-19 | 2 | -7/+28 |
* | | Merge pull request #1558 from haberman/rubyoneof | Joshua Haberman | 2016-05-19 | 3 | -24/+59 |
|\ \ | |/ |/| | |||||
| * | Fixed oneof behavior for enums and fixed JRuby. | Josh Haberman | 2016-05-18 | 3 | -11/+24 |
| * | Ruby oneofs: return default instead of nil for unset fields. | Josh Haberman | 2016-05-18 | 2 | -20/+42 |
* | | Merge pull request #1549 from xyzzyz/arena_export | Joshua Haberman | 2016-05-18 | 1 | -1/+1 |
|\ \ | |||||
| * | | Export class Arena to shared library. | Adam Michalik | 2016-05-17 | 1 | -1/+1 |
* | | | Merge pull request #1547 from xyzzyz/js_generator | Joshua Haberman | 2016-05-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix #include in js_generator.cc | Adam Michalik | 2016-05-17 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1559 from google/beta-3 | Jisi Liu | 2016-05-18 | 2 | -1/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge pull request #1551 from pherl/beta-3 | Jisi Liu | 2016-05-17 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix protoc artifact pom version | Jisi Liu | 2016-05-17 | 1 | -1/+1 |
| * | | | Merge pull request #1546 from pherl/beta-3 | Jisi Liu | 2016-05-17 | 1 | -0/+1 |
| |\| | | |||||
| | * | | Added download_url to be able to upload to pypi. | Jisi Liu | 2016-05-17 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #1412 from google/internal | Paul Yang | 2016-05-18 | 2 | -1/+2 |
|\ \ \ | |||||
| * | | | Integrate interanl changes | Bo Yang | 2016-05-18 | 2 | -1/+2 |
|/ / / | |||||
* | | | Merge pull request #1548 from anandolee/master | Joshua Haberman | 2016-05-17 | 2 | -1/+22 |
|\ \ \ | |_|/ |/| | | |||||
| * | | JSON format for Any message must print @type first, use OrderedDict instead o... | Jie Luo | 2016-05-17 | 2 | -1/+22 |
* | | | Merge pull request #1542 from google/beta-3 | Jisi Liu | 2016-05-16 | 16 | -23/+206 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #1540 from pherl/changelogv3.0.0-beta-3 | Jisi Liu | 2016-05-16 | 1 | -2/+8 |
| |\ \ | |||||
| | * | | Update changes for lite | Jisi Liu | 2016-05-16 | 1 | -2/+8 |
| * | | | Merge pull request #1533 from pherl/mapcomment | Jisi Liu | 2016-05-16 | 1 | -3/+1 |
| |\ \ \ | |||||
| | * | | | Remove the comments about iterator validation | Jisi Liu | 2016-05-13 | 1 | -3/+1 |
| |/ / / | |||||
| * | | | Merge pull request #1532 from pherl/changelog | Jisi Liu | 2016-05-13 | 1 | -1/+6 |
| |\| | | |||||
| | * | | Update changelogs for C++ maps | Jisi Liu | 2016-05-13 | 1 | -1/+6 |
| |/ / | |||||
| * | | Merge pull request #1527 from haberman/changelog | Jisi Liu | 2016-05-12 | 1 | -1/+14 |
| |\ \ | |||||
| | * | | Added release notes for Ruby and JavaScript. | Josh Haberman | 2016-05-12 | 1 | -1/+14 |
| |/ / | |||||
| * | | Merge pull request #1520 from pherl/hashmapvs2008 | Jisi Liu | 2016-05-12 | 1 | -3/+55 |
| |\ \ | |||||
| | * | | Bridge vs2008 hashmaps. | Jisi Liu | 2016-05-11 | 1 | -3/+55 |
| * | | | Merge pull request #1524 from anandolee/master | Jisi Liu | 2016-05-12 | 1 | -1/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | python changes | Jie Luo | 2016-05-11 | 1 | -1/+5 |
| | * | | Merge pull request #1 from google/beta-3 | Jie Luo | 2016-05-11 | 862 | -26667/+104755 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1515 from pherl/changelog-beta3 | Jisi Liu | 2016-05-11 | 1 | -0/+104 |
| |\ \ \ | |||||
| | * | | | Update comments for csharp, zero-copy and objc. | Jisi Liu | 2016-05-11 | 1 | -3/+55 |
| | * | | | Fix typo. | Jisi Liu | 2016-05-11 | 1 | -1/+1 |
| | * | | | Initial draft for changelog. | Jisi Liu | 2016-05-10 | 1 | -0/+52 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1512 from pherl/beta-3 | Jisi Liu | 2016-05-11 | 12 | -14/+14 |
| |\ \ \ | |||||
| | * | | | Fix csharp version | Jisi Liu | 2016-05-11 | 1 | -1/+1 |
| | * | | | Update version numbers for other languages | Jisi Liu | 2016-05-10 | 8 | -10/+10 |
| | * | | | Update version numbers for beta3 | Jisi Liu | 2016-05-10 | 3 | -3/+3 |
| | |/ / | |||||
| * | | | Merge pull request #1514 from pherl/fix_heap_check | Jisi Liu | 2016-05-10 | 1 | -3/+4 |
| |\ \ \ | |||||
| | * | | | Fix the command line interface unittest again | Jisi Liu | 2016-05-10 | 1 | -3/+4 |
| | |/ / | |||||
| * | | | Merge pull request #1513 from pherl/fix-build-protoc | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Fix protoc build artifact script. | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1529 from gkraynov/test-redundant-varint | Joshua Haberman | 2016-05-13 | 1 | -0/+52 |
|\ \ \ | |||||
| * | | | Test redundant varint fields decoding in JS. | Grigoriy Kraynov | 2016-05-12 | 1 | -0/+52 |
* | | | | Merge pull request #1528 from pherl/master | Jisi Liu | 2016-05-13 | 1 | -4/+1 |
|\ \ \ \ |