Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Down-integrate from internal branch. | Jisi Liu | 2015-08-21 | 2 | -0/+66 |
| | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | ||||
* | Internal local modifications. | Bo Yang | 2015-07-09 | 1 | -0/+7 |
| | |||||
* | Update version number to 3.0.0-alpha-4 | Bo Yang | 2015-05-29 | 1 | -1/+1 |
| | |||||
* | Update version number to 3.0.0-alpha-3 | teboring | 2015-05-23 | 1 | -1/+1 |
| | |||||
* | down-integrate internal changes | Bo Yang | 2015-05-21 | 41 | -544/+3281 |
| | |||||
* | Whitespace | Tamir Duberstein | 2015-05-06 | 1 | -1/+1 |
| | |||||
* | Don't hard-code the python path | Tamir Duberstein | 2015-05-06 | 15 | -15/+15 |
| | |||||
* | [PYTHON] Drop dependency on 'google.apputils'. | Tamir Duberstein | 2015-04-10 | 15 | -89/+94 |
| | | | | Use stdlib's 'unittest' instead. | ||||
* | [PYTHON] Remove awkward duplicate tests | Tamir Duberstein | 2015-04-10 | 3 | -162/+0 |
| | | | | We already run all tests with and without `--cpp_implementation` | ||||
* | [PYTHON] Clarify API version comment | Tamir Duberstein | 2015-04-10 | 1 | -2/+2 |
| | |||||
* | Remove useless file that doesn't load | Tamir Duberstein | 2015-04-08 | 1 | -663/+0 |
| | | | | This file was broken in ada6556. | ||||
* | Merge pull request #196 from Zex/master | Joshua Haberman | 2015-03-31 | 1 | -2/+2 |
|\ | | | | | Fix raise and except syntax issues for py3 | ||||
| * | fix raise syntax issues for py3, | zex | 2015-02-06 | 1 | -2/+2 |
| | | | | | | | | fix except syntax issue for py3 | ||||
* | | Fix python versions to comply with pep-0440. | Jisi Liu | 2015-03-04 | 1 | -1/+1 |
| | | | | | | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c | ||||
* | | Merge remote-tracking branch 'github/alpha-2-fix' | Jisi Liu | 2015-03-04 | 1 | -1/+1 |
|\ \ | | | | | | | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e | ||||
| * | | Fix python package version to alpha-2. | Jisi Liu | 2015-03-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf | ||||
* | | | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 6 | -15/+22 |
|/ / | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||||
* | | Fixes for Python/C++ implementation in open-source: | Josh Haberman | 2015-02-25 | 9 | -23/+484 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Rosy hack doesn't apply (that test should be removed for the open-source release). * Added our own copy of parameterized.py (the open-source version of Google Apputils doesn't contain it). * The C++ Descriptor object didn't implement extension_ranges. * Had to implement a hack around returning EncodeError, to work around the module-loading behavior of the test runner. | ||||
* | | Down integrate from Google internal. | Jisi Liu | 2015-02-25 | 34 | -2057/+5683 |
|/ | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145 | ||||
* | Delete unused files. | Feng Xiao | 2015-01-27 | 1 | -27/+0 |
| | |||||
* | Merge pull request #46 from adalq/version | Feng Xiao | 2014-12-20 | 1 | -0/+35 |
|\ | | | | | Add __version__ | ||||
| * | Updated __version__ | Adal Chiriliuc | 2014-12-14 | 1 | -1/+1 |
| | | |||||
| * | Add __version__ | Adal Chiriliuc | 2014-10-10 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__" | ||||
| * | Revert "Add __version__" | Adal Chiriliuc | 2014-10-10 | 2 | -35/+0 |
| | | | | | | | | This reverts commit 5337cf564f5eb43c1975d1cfd87b4efba9e6bf35. | ||||
| * | Add __version__ | Adal Chiriliuc | 2014-10-10 | 2 | -0/+35 |
| | | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__" | ||||
* | | Fix Python C++ implementation build issues: | Feng Xiao | 2014-11-25 | 1 | -4/+8 |
| | | | | | | | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword. | ||||
* | | Down-integrate from internal code base. | Feng Xiao | 2014-11-20 | 1 | -1/+1 |
| | | |||||
* | | Down-integrate from internal code base (C++ maps support). | Feng Xiao | 2014-11-14 | 3 | -24/+20 |
| | | |||||
* | | Merge branch 'typofixes-vlajos-20141108' of ↵ | Feng Xiao | 2014-11-11 | 5 | -5/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc | ||||
| * | | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-08 | 5 | -5/+5 |
| |/ | |||||
* / | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 | 44 | -594/+1220 |
|/ | |||||
* | Down-integrate from internal branch. | Feng Xiao | 2014-10-07 | 4 | -6/+22 |
| | |||||
* | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 | 67 | -67/+67 |
| | | | | developers.google.com/protocol-buffers | ||||
* | merge tags/2.6.0 into trunk | jieluo@google.com | 2014-08-25 | 2 | -22/+1 |
| | |||||
* | make dist complains the file name is too long and refuse to put it to tar. ↵ | jieluo@google.com | 2014-08-14 | 1 | -1/+1 |
| | | | | Change the file to a shorter name | ||||
* | Add deleted tests back for reflection_cpp2_test.py by addtional exception catch | jieluo@google.com | 2014-08-14 | 1 | -0/+47 |
| | |||||
* | put python cpp tests into pyext/ | jieluo@google.com | 2014-08-13 | 4 | -26/+0 |
| | |||||
* | down integrate python opensource to svn | jieluo@google.com | 2014-08-12 | 59 | -864/+9873 |
| | |||||
* | down integrate to svn | jieluo@google.com | 2014-07-18 | 5 | -2261/+0 |
| | |||||
* | Down-integrate from internal branch | xiaofeng@google.com | 2013-02-25 | 2 | -2/+27 |
| | |||||
* | Fix issues: 342, 424, 428, 430, 436 | xiaofeng@google.com | 2012-12-04 | 1 | -6/+0 |
| | |||||
* | Down-integrate from internal branch | xiaofeng@google.com | 2012-09-22 | 31 | -227/+3159 |
| | |||||
* | Fixed a memory leak in python CPP implementation. | liujisi@google.com | 2011-06-07 | 1 | -1/+3 |
| | |||||
* | Escape C++ Trigraphs. | liujisi@google.com | 2010-12-21 | 1 | -0/+1 |
| | |||||
* | Boost version number to 2.4.0-pre, add more test cases for text_format.py ↵ | liujisi@google.com | 2010-12-09 | 1 | -4/+15 |
| | | | | about unicode field. | ||||
* | Add new files for vcprojs, fix issues: 165, 211, 228, 240 | liujisi@google.com | 2010-12-07 | 1 | -1/+1 |
| | |||||
* | Fix issues: 166 167 172 175 181 188 192 194 195. | liujisi@google.com | 2010-12-03 | 1 | -0/+3 |
| | |||||
* | Submit recent changes from internal branch. See CHANGES.txt for more details. | liujisi@google.com | 2010-11-02 | 19 | -1149/+4871 |
| | |||||
* | Fix issue 208. | kenton@google.com | 2010-07-27 | 2 | -3/+33 |
| | |||||
* | Fix issue 207 | kenton@google.com | 2010-07-27 | 2 | -1/+22 |
| |