aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated upb and simplified ruby code a bit with new upb method.Josh Haberman2016-04-224-1222/+1552
* Merge pull request #1444 from mbrtargeting/masterFeng Xiao2016-04-221-0/+2
|\
| * Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
* | Add initial design document for Swift protocol buffers. (#1442)Tony Allevato2016-04-221-0/+674
|/
* Merge pull request #1438 from xfxyjwf/docsFeng Xiao2016-04-211-0/+147
|\
| * Add a docs directory and move the third-party add-ons page here.Feng Xiao2016-04-201-0/+147
* | Merge pull request #1416 from cwhipkey/masterFeng Xiao2016-04-209-29/+743
|\ \
| * | Change protobuf CPP proto generator to support the 'lite' option inChad Whipkey2016-04-159-29/+743
* | | Merge pull request #1414 from xyzzyz/googletestFeng Xiao2016-04-201-1/+0
|\ \ \
| * | | Remove googletest.h header from stringprintf.ccAdam Michalik2016-04-141-1/+0
* | | | Merge pull request #1434 from jskeet/regenerateThomas Van Lenten2016-04-208-103/+130
|\ \ \ \
| * | | | Regenerate well-known types for C#Jon Skeet2016-04-208-103/+130
|/ / / /
* | | | Merge pull request #1433 from thomasvl/check_wktThomas Van Lenten2016-04-202-31/+38
|\ \ \ \
| * | | | ObjC support for failing the build in the generated WKTs are out of dateThomas Van Lenten2016-04-202-31/+38
* | | | | Merge pull request #1401 from jskeet/enum-casingJon Skeet2016-04-2034-294/+542
|\ \ \ \ \
| * | | | | Attempt to fix AppVeyor build by exporting GetEnumValueNameJon Skeet2016-04-202-1/+9
| * | | | | Use the original name in JSON formatting.Jon Skeet2016-04-202-2/+45
| * | | | | Regenerate all C# code and make it compileJon Skeet2016-04-2022-285/+285
| * | | | | Add C# codegen changes to enum value names (mostly C++)Jon Skeet2016-04-209-6/+201
| * | | | | Use 0 as the default value for all enums, rather than finding the actual enum...Jon Skeet2016-04-111-1/+3
* | | | | | Merge pull request #1417 from seishun/windows2Joshua Haberman2016-04-192-2/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Support Windows in gulpfile.jsNikolai Vavilov2016-04-162-2/+6
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1428 from pherl/masterJisi Liu2016-04-191-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add missing includes in field mask testJisi Liu2016-04-191-0/+2
* | | | | Merge pull request #1426 from thomasvl/fix_comment_typoThomas Van Lenten2016-04-1921-20/+175
|\ \ \ \ \
| * | | | | Regenerate the WKT to pick up current changes to the proto files.Thomas Van Lenten2016-04-1920-5/+160
| * | | | | Fix comment typoThomas Van Lenten2016-04-191-15/+15
* | | | | | Merge pull request #1402 from davidzchen/py2and3Feng Xiao2016-04-191-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add missing PY2AND3 srcs_versions attributes to Python Bazel build targets.David Z. Chen2016-04-081-3/+6
* | | | | | Merge pull request #1422 from pherl/masterJisi Liu2016-04-182-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update file list to include the missing extension lite file.Jisi Liu2016-04-182-1/+2
|/ / / / /
* | | | | Merge pull request #1413 from haberman/updateupbJoshua Haberman2016-04-159-1395/+1663
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bugfix for JSON error case.Josh Haberman2016-04-142-3/+1
| * | | | Remove no longer applicable documentation from README.md.Josh Haberman2016-04-141-68/+0
| * | | | Ruby JSON: always accept both camelCase and original field names.Josh Haberman2016-04-147-33/+82
| * | | | Documented the JSON change and compatibility flags.Josh Haberman2016-04-141-13/+83
| * | | | Updated upb: picked up legacy JSON flags to help Ruby users migrate.Josh Haberman2016-04-142-1354/+1573
|/ / / /
* | | | Merge pull request #1397 from google/internal-mergeJoshua Haberman2016-04-11273-4795/+34425
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix for gulpfile.js.Josh Haberman2016-04-111-1/+10
| * | | Removed duplicated operator delete from merge conflict.Josh Haberman2016-04-071-6/+0
| * | | Merge branch 'master' into internal-mergeJosh Haberman2016-04-0742-124/+371
| |\ \ \
| * | | | Fix for CommonJS tests.Josh Haberman2016-04-072-8/+30
| * | | | Merge pull request #1381 from pherl/internal-mergeJisi Liu2016-04-01270-4796/+34417
| |\ \ \ \
| | * | | | Merge branch 'master' into internal-mergeJisi Liu2016-04-01270-4796/+34417
| |/| | | |
| | * | | | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-0112-106/+218
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Do not use C++11 unicode escape in unittest.Jisi Liu2016-04-011-1/+1
| | * | | | Do not let windows.h define min/max macrosJisi Liu2016-04-011-0/+1
| | * | | | Allow bigobj for map_unittestJisi Liu2016-04-011-0/+2
| | * | | | Fix re-definition issue of winsock.h and winsock2.hJisi Liu2016-03-311-0/+1
| | * | | | Disable sign-compare warning.Jisi Liu2016-03-311-1/+3