Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #1595 from thomasvl/objc_travis_tweaks | Thomas Van Lenten | 2016-05-25 | 3 | -79/+84 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Automated testing tweaks for ObjC | Thomas Van Lenten | 2016-05-24 | 3 | -79/+84 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #1593 from thomasvl/framework_includes | Thomas Van Lenten | 2016-05-24 | 28 | -95/+543 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Better support for using the proto library from a framework. | Thomas Van Lenten | 2016-05-24 | 28 | -95/+543 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1589 from hochhaus/master | Joshua Haberman | 2016-05-24 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add js/binary/encoder.js to js_EXTRA_DIST. | Andy Hochhaus | 2016-05-22 | 1 | -0/+1 | |
* | | | | | | Merge pull request #1588 from jeffmvr/master | Feng Xiao | 2016-05-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88 | Jeff Merver | 2016-05-21 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1578 from wal-rus/cmake-install-namespace | Feng Xiao | 2016-05-20 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | add protobuf:: namespace to installed targets | Walter Gray | 2016-05-20 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1523 from xfxyjwf/compatibility_tests | Feng Xiao | 2016-05-20 | 78 | -0/+19521 | |
|\ \ \ \ | ||||||
| * | | | | Describe platform requirements for the compatibility tests. | Feng Xiao | 2016-05-20 | 1 | -0/+4 | |
| * | | | | Add compatiblity tests against v2.5.0 | Feng Xiao | 2016-05-17 | 78 | -0/+19517 | |
* | | | | | Merge pull request #1583 from thomasvl/pods_integration_followup | Thomas Van Lenten | 2016-05-20 | 5 | -14/+36 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make the CocoaPods integration tests more robust | Thomas Van Lenten | 2016-05-20 | 5 | -14/+36 | |
* | | | | | | Merge pull request #1576 from wal-rus/cmake-versionfile | Feng Xiao | 2016-05-20 | 1 | -0/+35 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update protobuf-config-version.cmake.in to correctly set the required variabl... | Walter Gray | 2016-05-19 | 1 | -0/+35 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1575 from wal-rus/cmake-install-msvc | Feng Xiao | 2016-05-20 | 1 | -2/+8 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix the cmake configuration file install path to be more standards compliant ... | Walter Gray | 2016-05-19 | 1 | -2/+8 | |
|/ / / / / | ||||||
* | | | | | 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 | |
| |\ \ \ \ |