Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | updated README | beardedn5rd | 2016-05-06 | 1 | -1/+4 |
* | Merge pull request #1467 from pherl/master | Jisi Liu | 2016-04-30 | 213 | -3836/+10987 |
|\ | |||||
| * | Update descritpor protos for objc | Jisi Liu | 2016-04-29 | 22 | -3863/+3 |
| * | Merge the script fix. | Jisi Liu | 2016-04-29 | 1 | -1/+1 |
| |\ | |||||
| * | | Update file lists. | Jisi Liu | 2016-04-28 | 2 | -1/+6 |
| * | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-28 | 25 | -1234/+3354 |
| |\ \ | |||||
| * | | | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 228 | -3859/+14739 |
* | | | | Merge pull request #1474 from pherl/fixscript | Thomas Van Lenten | 2016-04-29 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | Fix cp -r usage to be portable. | Jisi Liu | 2016-04-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1462 from acozzette/ruby-2.3 | Adam Cozzette | 2016-04-28 | 1 | -2/+2 |
|\ \ | |||||
| * | | Added dig and bsearch_index to RepeatedField methods forwarded to array | Adam Cozzette | 2016-04-27 | 1 | -2/+2 |
* | | | Merge pull request #1461 from thomasvl/fix_bool_handing | Thomas Van Lenten | 2016-04-27 | 3 | -5/+114 |
|\ \ \ | |||||
| * | | | Fix up -hash/-isEqual: for bool storage. | Thomas Van Lenten | 2016-04-27 | 3 | -5/+114 |
| |/ / | |||||
* | | | Merge pull request #1455 from haberman/updateupb | Joshua Haberman | 2016-04-27 | 4 | -1222/+1552 |
|\ \ \ | |/ / |/| | | |||||
| * | | Updated upb and simplified ruby code a bit with new upb method. | Josh Haberman | 2016-04-22 | 4 | -1222/+1552 |
* | | | Merge pull request #1454 from thomasvl/enum_defaults | Thomas Van Lenten | 2016-04-26 | 3 | -4/+22 |
|\ \ \ | |/ / |/| | | |||||
| * | | Proper checking of enum with non zero default | Thomas Van Lenten | 2016-04-26 | 3 | -4/+22 |
|/ / | |||||
* | | Merge pull request #1444 from mbrtargeting/master | Feng Xiao | 2016-04-22 | 1 | -0/+2 |
|\ \ | |||||
| * | | Added serialVersionUID to ExtendableMessage. | Jakub Kukul | 2016-04-22 | 1 | -0/+2 |
* | | | Add initial design document for Swift protocol buffers. (#1442) | Tony Allevato | 2016-04-22 | 1 | -0/+674 |
|/ / | |||||
* | | Merge pull request #1438 from xfxyjwf/docs | Feng Xiao | 2016-04-21 | 1 | -0/+147 |
|\ \ | |||||
| * | | Add a docs directory and move the third-party add-ons page here. | Feng Xiao | 2016-04-20 | 1 | -0/+147 |
* | | | Merge pull request #1416 from cwhipkey/master | Feng Xiao | 2016-04-20 | 9 | -29/+743 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Change protobuf CPP proto generator to support the 'lite' option in | Chad Whipkey | 2016-04-15 | 9 | -29/+743 |
* | | | Merge pull request #1414 from xyzzyz/googletest | Feng Xiao | 2016-04-20 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Remove googletest.h header from stringprintf.cc | Adam Michalik | 2016-04-14 | 1 | -1/+0 |
* | | | | Merge pull request #1434 from jskeet/regenerate | Thomas Van Lenten | 2016-04-20 | 8 | -103/+130 |
|\ \ \ \ | |||||
| * | | | | Regenerate well-known types for C# | Jon Skeet | 2016-04-20 | 8 | -103/+130 |
|/ / / / | |||||
* | | | | Merge pull request #1433 from thomasvl/check_wkt | Thomas Van Lenten | 2016-04-20 | 2 | -31/+38 |
|\ \ \ \ | |||||
| * | | | | ObjC support for failing the build in the generated WKTs are out of date | Thomas Van Lenten | 2016-04-20 | 2 | -31/+38 |
* | | | | | Merge pull request #1401 from jskeet/enum-casing | Jon Skeet | 2016-04-20 | 34 | -294/+542 |
|\ \ \ \ \ | |||||
| * | | | | | Attempt to fix AppVeyor build by exporting GetEnumValueName | Jon Skeet | 2016-04-20 | 2 | -1/+9 |
| * | | | | | Use the original name in JSON formatting. | Jon Skeet | 2016-04-20 | 2 | -2/+45 |
| * | | | | | Regenerate all C# code and make it compile | Jon Skeet | 2016-04-20 | 22 | -285/+285 |
| * | | | | | Add C# codegen changes to enum value names (mostly C++) | Jon Skeet | 2016-04-20 | 9 | -6/+201 |
| * | | | | | Use 0 as the default value for all enums, rather than finding the actual enum... | Jon Skeet | 2016-04-11 | 1 | -1/+3 |
* | | | | | | 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 |