aboutsummaryrefslogtreecommitdiffstats
path: root/python
Commit message (Expand)AuthorAgeFilesLines
* Update protobuf version (#6472)Paul Yang2019-08-051-1/+1
* Update protobuf version (#6366)Paul Yang2019-07-111-1/+1
* Update version to 3.9.0Hao Nguyen2019-06-171-1/+1
* Merge pull request #6245 from haon4/201906111559Hao Nguyen2019-06-126-64/+188
|\
| * Down integrate to GitHubHao Nguyen2019-06-116-64/+188
* | add compatibility check badges to READMELily Li2019-06-101-1/+1
|/
* Merge branch '3.8.x' into 3.8.x-201905311515Hao Nguyen2019-05-311-1/+1
|\
| * Update protobuf versionHao Nguyen2019-05-211-1/+1
| * Revert "Update protobuf version"Hao Nguyen2019-05-211-1/+1
| * Update protobuf versionHao Nguyen2019-05-211-1/+1
| * Update version to 3.8.0Hao Nguyen2019-04-231-1/+1
* | Down integrate to GitHubHao Nguyen2019-05-303-42/+47
* | Down integrate to GitHubHao Nguyen2019-05-174-42/+34
* | Down integrate to GitHubHao Nguyen2019-05-132-2/+17
* | Down integrate to GitHubHao Nguyen2019-05-032-19/+36
|/
* Down integrate to GitHubHao Nguyen2019-04-227-30/+12
* Down integrate to GitHubHao Nguyen2019-04-171-11/+14
* Down integrate to GithubHao Nguyen2019-04-102-15/+52
* Merge branch 'master' of https://github.com/protocolbuffers/protobuf into syn...Hao Nguyen2019-04-091-1/+1
|\
| * Revert accidentally commitHao Nguyen2019-04-0529-1226/+1467
| * Merge branch 'master' of https://github.com/protocolbuffers/protobufHao Nguyen2019-04-051-1/+1
| |\
| | * Merge branch '3.7.x' into merge-3-7-xAdam Cozzette2019-03-261-1/+1
| | |\
| | | * Update version number to 3.7.1 (#5947)Paul Yang2019-03-261-1/+1
| * | | Down integrate to GithubHao Nguyen2019-04-0529-1467/+1226
| |/ /
* / / Down integrate to GithubHao Nguyen2019-04-0930-1467/+1232
|/ /
* | Merge pull request #5921 from haon4/contributingHao Nguyen2019-03-2120-254/+471
|\ \
| * | Undelete python/google/protobuf/pyext/proto2_api_test.proto that was accident...Hao Nguyen2019-03-201-0/+40
| * | Down integrate to GithubHao Nguyen2019-03-2021-294/+471
* | | Fix several DeprecationWarning: invalid escape sequence (#5897)Mickaƫl Schoentgen2019-03-211-1/+1
|/ /
* | Down integrate to Github (#5839)Hao Nguyen2019-03-0610-14/+83
* | Merge branch '3.7.x'Bo Yang2019-03-042-3/+3
|\|
| * Update version number to 3.7.0 (#5793)Paul Yang2019-02-281-1/+1
| * fix mac python cpp building (#5786)Yilun Chong2019-02-261-0/+1
| * Update version to 3.7.0rc3Bo Yang2019-02-221-1/+1
| * Update version to 3.7.0 (#5749)Paul Yang2019-02-191-1/+1
| * Add several fixes for python toolchain (#5667)Paul Yang2019-02-011-2/+2
| * Updated version to 3.7.0rc2Adam Cozzette2019-01-301-1/+1
| * Update version to 3.7.0Hao Nguyen2019-01-241-1/+1
* | Fix for construction of messages in the C++ Python implementation. (#2299)Peter Ebden2019-02-272-8/+29
* | Add EnumTypeWrapper.__getattr__ to access values (#5234)Oliver Bristow2019-02-272-0/+40
* | Merge pull request #5765 from BSBandme/integrationPaul Yang2019-02-2615-247/+814
|\ \
| * \ Merge branch 'master' into integrationYilun Chong2019-02-243-3/+3
| |\ \
| * | | down integration from internalYilun Chong2019-02-2215-247/+814
* | | | fix mac python cpp building (#5786)Yilun Chong2019-02-261-0/+1
* | | | pyext: missing cast to constant char* (#5713)grindhold2019-02-261-3/+5
| |/ / |/| |
* | | delete all duplicate empty blanks (#5758)Xiang Dai2019-02-203-3/+3
|/ /
* / Allowed json_format.ParseDict to parse extensions with scalar types. (#5609)Peter Sobot2019-01-312-1/+15
|/
* Down-integrate internal changes to github. (#5555)Yilun Chong2019-01-081-0/+3
* Merge pull request #5502 from TeBoring/github-syncPaul Yang2018-12-208-63/+150
|\
| * Down-integrate internal changes to github.Bo Yang2018-12-208-63/+150