| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update protobuf version (#6472) | Paul Yang | 2019-08-05 | 1 | -1/+1 |
| | | |||||
| * | Update protobuf version (#6366) | Paul Yang | 2019-07-11 | 1 | -1/+1 |
| | | |||||
| * | Update version to 3.9.0 | Hao Nguyen | 2019-06-17 | 1 | -6/+6 |
| | | |||||
| * | Merge branch '3.8.x' into 3.8.x-201905311515 | Hao Nguyen | 2019-05-31 | 1 | -1/+1 |
| |\ | |||||
| | * | Update protobuf version | Hao Nguyen | 2019-05-21 | 1 | -1/+1 |
| | | | |||||
| | * | Revert "Update protobuf version" | Hao Nguyen | 2019-05-21 | 1 | -1/+1 |
| | | | | | | | | | This reverts commit 6d96493b3147a0f253f7eef2447785e19361afe3. | ||||
| | * | Update protobuf version | Hao Nguyen | 2019-05-21 | 1 | -1/+1 |
| | | | |||||
| | * | Update version to 3.8.0 | Hao Nguyen | 2019-04-23 | 1 | -1/+1 |
| | | | |||||
| * | | Add dependency to truth in test | Hao Nguyen | 2019-05-31 | 1 | -0/+5 |
| | | | |||||
| * | | Down integrate to GitHub | Hao Nguyen | 2019-05-30 | 4 | -0/+311 |
| | | | |||||
| * | | Down integrate to GitHub | Hao Nguyen | 2019-04-30 | 2 | -21/+32 |
| |/ | |||||
| * | Down integrate to GitHub | Hao Nguyen | 2019-04-22 | 1 | -5/+5 |
| | | |||||
| * | Merge branch 'master' of https://github.com/protocolbuffers/protobuf into ↵ | Hao Nguyen | 2019-04-09 | 1 | -1/+1 |
| |\ | | | | | | | sync201904090622 | ||||
| | * | Revert accidentally commit | Hao Nguyen | 2019-04-05 | 1 | -14/+0 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/protocolbuffers/protobuf | Hao Nguyen | 2019-04-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch '3.7.x' into merge-3-7-x | Adam Cozzette | 2019-03-26 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Update version number to 3.7.1 (#5947) | Paul Yang | 2019-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Update version number to 3.7.1 * Update version number in port_def.inc | ||||
| | * | | | Down integrate to Github | Hao Nguyen | 2019-04-05 | 1 | -0/+14 |
| | |/ / | |||||
| * / / | Down integrate to Github | Hao Nguyen | 2019-04-09 | 1 | -0/+14 |
| |/ / | |||||
| * | | Down integrate to Github | Hao Nguyen | 2019-03-20 | 3 | -11/+17 |
| | | | |||||
| * | | Merge branch '3.7.x' | Bo Yang | 2019-03-04 | 3 | -3/+3 |
| |\| | |||||
| | * | Update version number to 3.7.0 (#5793) | Paul Yang | 2019-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | * Update version number to 3.7.0 * Add php/releash.sh to Makefile.am * Make cpp_distcheck exit on fail | ||||
| | * | Update version to 3.7.0rc3 | Bo Yang | 2019-02-22 | 1 | -1/+1 |
| | | | |||||
| | * | Update version to 3.7.0 (#5749) | Paul Yang | 2019-02-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | * Update version to 3.7.0 * Update version number for java bom | ||||
| | * | Updated version to 3.7.0rc2 | Adam Cozzette | 2019-01-30 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed Javadoc errors | Adam Cozzette | 2019-01-30 | 2 | -2/+2 |
| | | | |||||
| | * | Update version to 3.7.0 | Hao Nguyen | 2019-01-24 | 1 | -1/+1 |
| | | | |||||
| * | | delete all duplicate empty blanks (#5758) | Xiang Dai | 2019-02-20 | 1 | -1/+1 |
| |/ | | | Signed-off-by: Xiang Dai <764524258@qq.com> | ||||
| * | Down-integrate internal changes to github. | Bo Yang | 2018-12-20 | 7 | -65/+145 |
| | | |||||
| * | Down-integrate internal changes (#5467) | Paul Yang | 2018-12-14 | 1 | -0/+5 |
| | | | | | | | | | * Down-integrate internal changes * Update generated code for php, objc and csharp. * Add missing dependency in conformance_php | ||||
| * | Make sure to add a new line at the end of XML files | Hao Nguyen | 2018-12-14 | 1 | -1/+1 |
| | | |||||
| * | Replace update_version shell script with a python script, which is much ↵ | Hao Nguyen | 2018-12-14 | 1 | -8/+6 |
| | | | | | better at handling XML rewrite. Update the PHP version too. As part of rewrite, some XML file format will change a little, but the semantics is still the same so it should be okay. | ||||
| * | Merge pull request #5332 from acozzette/integrate | Adam Cozzette | 2018-11-12 | 6 | -29/+280 |
| |\ | | | | | Integrated internal changes from Google | ||||
| | * | Integrated internal changes from Google | Adam Cozzette | 2018-11-09 | 6 | -29/+280 |
| | | | |||||
| * | | java: add BOM (#5117) | Elliotte Rusty Harold | 2018-11-12 | 1 | -1/+0 |
| |/ | |||||
| * | Down-integrate from google3. | Josh Haberman | 2018-09-04 | 2 | -30/+24 |
| | | |||||
| * | Merge master branch. | Feng Xiao | 2018-08-08 | 4 | -7/+65 |
| |\ | |||||
| | * | Fix typo in FieldMaskTree.java warning | Aleksej Kazmin | 2018-08-07 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-08-01 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Updated version numbers to 3.6.1 | Adam Cozzette | 2018-07-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Ignore unknown enum received in json when ignoreUnknownFields flag is set ↵ | vijay-bhatt | 2018-07-30 | 2 | -6/+63 |
| | |/ | | | | | | | | | (#4825) * Ignore unknown enum received in json when ignoreUnknownFields flag is set. | ||||
| * / | Down-integrate from google3. | Feng Xiao | 2018-08-08 | 6 | -54/+132 |
| |/ | |||||
| * | Update version number to 3.6.0 | Jisi Liu | 2018-05-14 | 1 | -1/+1 |
| | | |||||
| * | Merge branch (#4466) | Paul Yang | 2018-04-02 | 1 | -1/+1 |
| | | | | | | | | | * Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits | ||||
| * | fix typo in FieldMaskTree.java comment | kenji yoshida | 2018-01-22 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 1 | -1/+1 |
| |\| | |||||
| | * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 1 | -1/+1 |
| | | | |||||
| * | | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 3 | -13/+70 |
| |/ | |||||
