Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1417 from seishun/windows2 | Joshua Haberman | 2016-04-19 | 2 | -2/+6 |
|\ | |||||
| * | Support Windows in gulpfile.js | Nikolai Vavilov | 2016-04-16 | 2 | -2/+6 |
* | | Merge pull request #1428 from pherl/master | Jisi Liu | 2016-04-19 | 1 | -0/+2 |
|\ \ | |||||
| * | | Add missing includes in field mask test | Jisi Liu | 2016-04-19 | 1 | -0/+2 |
* | | | Merge pull request #1426 from thomasvl/fix_comment_typo | Thomas Van Lenten | 2016-04-19 | 21 | -20/+175 |
|\ \ \ | |||||
| * | | | Regenerate the WKT to pick up current changes to the proto files. | Thomas Van Lenten | 2016-04-19 | 20 | -5/+160 |
| * | | | Fix comment typo | Thomas Van Lenten | 2016-04-19 | 1 | -15/+15 |
* | | | | Merge pull request #1402 from davidzchen/py2and3 | Feng Xiao | 2016-04-19 | 1 | -3/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add missing PY2AND3 srcs_versions attributes to Python Bazel build targets. | David Z. Chen | 2016-04-08 | 1 | -3/+6 |
* | | | | Merge pull request #1422 from pherl/master | Jisi Liu | 2016-04-18 | 2 | -1/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Update file list to include the missing extension lite file. | Jisi Liu | 2016-04-18 | 2 | -1/+2 |
|/ / / | |||||
* | | | Merge pull request #1413 from haberman/updateupb | Joshua Haberman | 2016-04-15 | 9 | -1395/+1663 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Bugfix for JSON error case. | Josh Haberman | 2016-04-14 | 2 | -3/+1 |
| * | | Remove no longer applicable documentation from README.md. | Josh Haberman | 2016-04-14 | 1 | -68/+0 |
| * | | Ruby JSON: always accept both camelCase and original field names. | Josh Haberman | 2016-04-14 | 7 | -33/+82 |
| * | | Documented the JSON change and compatibility flags. | Josh Haberman | 2016-04-14 | 1 | -13/+83 |
| * | | Updated upb: picked up legacy JSON flags to help Ruby users migrate. | Josh Haberman | 2016-04-14 | 2 | -1354/+1573 |
|/ / | |||||
* | | Merge pull request #1397 from google/internal-merge | Joshua Haberman | 2016-04-11 | 273 | -4795/+34425 |
|\ \ | |||||
| * | | Fix for gulpfile.js. | Josh Haberman | 2016-04-11 | 1 | -1/+10 |
| * | | Removed duplicated operator delete from merge conflict. | Josh Haberman | 2016-04-07 | 1 | -6/+0 |
| * | | Merge branch 'master' into internal-merge | Josh Haberman | 2016-04-07 | 42 | -124/+371 |
| |\ \ | |||||
| * | | | Fix for CommonJS tests. | Josh Haberman | 2016-04-07 | 2 | -8/+30 |
| * | | | Merge pull request #1381 from pherl/internal-merge | Jisi Liu | 2016-04-01 | 270 | -4796/+34417 |
| |\ \ \ | |||||
| | * | | | Merge branch 'master' into internal-merge | Jisi Liu | 2016-04-01 | 270 | -4796/+34417 |
| |/| | | | |||||
| | * | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-01 | 12 | -106/+218 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Do not use C++11 unicode escape in unittest. | Jisi Liu | 2016-04-01 | 1 | -1/+1 |
| | * | | | Do not let windows.h define min/max macros | Jisi Liu | 2016-04-01 | 1 | -0/+1 |
| | * | | | Allow bigobj for map_unittest | Jisi Liu | 2016-04-01 | 1 | -0/+2 |
| | * | | | Fix re-definition issue of winsock.h and winsock2.h | Jisi Liu | 2016-03-31 | 1 | -0/+1 |
| | * | | | Disable sign-compare warning. | Jisi Liu | 2016-03-31 | 1 | -1/+3 |
| | * | | | Fix signed-compare warning. | Jisi Liu | 2016-03-31 | 1 | -1/+1 |
| | * | | | revert unexpected change for py26 | Jisi Liu | 2016-03-31 | 1 | -1/+4 |
| | * | | | Fix WIN32 build for map_test. | Jisi Liu | 2016-03-31 | 1 | -0/+6 |
| | * | | | Remove export macros for classes nested in a template class. | Jisi Liu | 2016-03-31 | 1 | -3/+3 |
| | * | | | Fix javanano package | Jisi Liu | 2016-03-31 | 1 | -0/+3 |
| | * | | | Fix json_format.py in py26 | Jisi Liu | 2016-03-31 | 1 | -2/+4 |
| | * | | | Fix breakage of referring to table_ in static func | Jisi Liu | 2016-03-31 | 1 | -1/+1 |
| | * | | | Temporarily disable begin is fast test. | Jisi Liu | 2016-03-31 | 1 | -1/+2 |
| | * | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 114 | -6935/+4729 |
| | |\ \ \ | |||||
| | * | | | | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 269 | -4802/+34402 |
* | | | | | | Merge pull request #1400 from jskeet/fix-internal | Jan Tattermusch | 2016-04-10 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix to csharp_options - initialize internal_access to false. | Jon Skeet | 2016-04-08 | 1 | -1/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #1393 from gvaish/master | Jon Skeet | 2016-04-07 | 3 | -1/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Added support for internal_access for C# | Gaurav Vaish | 2016-04-07 | 3 | -1/+6 |
* | | | | | Merge pull request #1392 from anandolee/master | Jie Luo | 2016-04-07 | 8 | -19/+41 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | sync the Manually integrate changes in google3/third_party | Jie Luo | 2016-04-06 | 8 | -19/+41 |
* | | | | | Merge pull request #1390 from jskeet/tidy-up | Jon Skeet | 2016-04-07 | 21 | -49/+111 |
|\ \ \ \ \ | |||||
| * | | | | | Add more documentation for csharp_options.h | Jon Skeet | 2016-04-06 | 2 | -6/+18 |
| * | | | | | Line-wrapping changes only for C# generator code | Jon Skeet | 2016-04-06 | 20 | -44/+94 |
* | | | | | | Merge pull request #1391 from thomasvl/string_tweaks | Thomas Van Lenten | 2016-04-06 | 2 | -9/+47 |
|\ \ \ \ \ \ |