aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #1414 from xyzzyz/googletestGravatar Feng Xiao2016-04-20
|\
* \ Merge pull request #1434 from jskeet/regenerateGravatar Thomas Van Lenten2016-04-20
|\ \
| * | Regenerate well-known types for C#Gravatar Jon Skeet2016-04-20
|/ /
* | Merge pull request #1433 from thomasvl/check_wktGravatar Thomas Van Lenten2016-04-20
|\ \
| * | ObjC support for failing the build in the generated WKTs are out of dateGravatar Thomas Van Lenten2016-04-20
* | | Merge pull request #1401 from jskeet/enum-casingGravatar Jon Skeet2016-04-20
|\ \ \
* \ \ \ Merge pull request #1417 from seishun/windows2Gravatar Joshua Haberman2016-04-19
|\ \ \ \
| | * | | Attempt to fix AppVeyor build by exporting GetEnumValueNameGravatar Jon Skeet2016-04-20
| | * | | Use the original name in JSON formatting.Gravatar Jon Skeet2016-04-20
| | * | | Regenerate all C# code and make it compileGravatar Jon Skeet2016-04-20
| | * | | Add C# codegen changes to enum value names (mostly C++)Gravatar Jon Skeet2016-04-20
* | | | | Merge pull request #1428 from pherl/masterGravatar Jisi Liu2016-04-19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add missing includes in field mask testGravatar Jisi Liu2016-04-19
* | | | | Merge pull request #1426 from thomasvl/fix_comment_typoGravatar Thomas Van Lenten2016-04-19
|\ \ \ \ \
| * | | | | Regenerate the WKT to pick up current changes to the proto files.Gravatar Thomas Van Lenten2016-04-19
* | | | | | Merge pull request #1402 from davidzchen/py2and3Gravatar Feng Xiao2016-04-19
|\ \ \ \ \ \
| | * | | | | Fix comment typoGravatar Thomas Van Lenten2016-04-19
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1422 from pherl/masterGravatar Jisi Liu2016-04-18
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update file list to include the missing extension lite file.Gravatar Jisi Liu2016-04-18
|/ / / / /
| | * | | Support Windows in gulpfile.jsGravatar Nikolai Vavilov2016-04-16
* | | | | Merge pull request #1413 from haberman/updateupbGravatar Joshua Haberman2016-04-15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bugfix for JSON error case.Gravatar Josh Haberman2016-04-14
| * | | | Remove no longer applicable documentation from README.md.Gravatar Josh Haberman2016-04-14
| * | | | Ruby JSON: always accept both camelCase and original field names.Gravatar Josh Haberman2016-04-14
| | | | * Remove googletest.h header from stringprintf.ccGravatar Adam Michalik2016-04-14
| * | | | Documented the JSON change and compatibility flags.Gravatar Josh Haberman2016-04-14
| * | | | Updated upb: picked up legacy JSON flags to help Ruby users migrate.Gravatar Josh Haberman2016-04-14
|/ / / /
* | | | Merge pull request #1397 from google/internal-mergeGravatar Joshua Haberman2016-04-11
|\ \ \ \
| * | | | Fix for gulpfile.js.Gravatar Josh Haberman2016-04-11
| | | * | Use 0 as the default value for all enums, rather than finding the actual enum...Gravatar Jon Skeet2016-04-11
| |_|/ / |/| | |
* | | | Merge pull request #1400 from jskeet/fix-internalGravatar Jan Tattermusch2016-04-10
|\ \ \ \
| | | * | Add missing PY2AND3 srcs_versions attributes to Python Bazel build targets.Gravatar David Z. Chen2016-04-08
| |_|/ / |/| | |
| * | | Fix to csharp_options - initialize internal_access to false.Gravatar Jon Skeet2016-04-08
|/ / /
| * | Removed duplicated operator delete from merge conflict.Gravatar Josh Haberman2016-04-07
| * | Merge branch 'master' into internal-mergeGravatar Josh Haberman2016-04-07
| |\ \
* | \ \ Merge pull request #1393 from gvaish/masterGravatar Jon Skeet2016-04-07
|\ \ \ \ | |_|/ / |/| | |
| | * | Fix for CommonJS tests.Gravatar Josh Haberman2016-04-07
* | | | Merge pull request #1392 from anandolee/masterGravatar Jie Luo2016-04-07
|\ \ \ \
| | * | | Added support for internal_access for C#Gravatar Gaurav Vaish2016-04-07
| |/ / / |/| | |
* | | | Merge pull request #1390 from jskeet/tidy-upGravatar Jon Skeet2016-04-07
|\ \ \ \
| | * | | sync the Manually integrate changes in google3/third_partyGravatar Jie Luo2016-04-06
* | | | | Merge pull request #1391 from thomasvl/string_tweaksGravatar Thomas Van Lenten2016-04-06
|\ \ \ \ \
* | | | | | Updating Xcode Settings to use iOS 9.3Gravatar Geoffrey Wiseman2016-04-06
| | * | | | Add more documentation for csharp_options.hGravatar Jon Skeet2016-04-06
| | * | | | Line-wrapping changes only for C# generator codeGravatar Jon Skeet2016-04-06
| |/ / / / |/| | | |
| * | | | Error during parsing for invalid UTF-8 instead of dropping dropping data.Gravatar Thomas Van Lenten2016-04-05
| * | | | Add tests to ensure we read strings with BOMs so we don't forget about lesson...Gravatar Thomas Van Lenten2016-04-05
|/ / / /
* | | | Merge pull request #1349 from gvaish/masterGravatar Jon Skeet2016-04-05
|\ \ \ \
* \ \ \ \ Merge pull request #1386 from andrewharp/patch-2Gravatar Feng Xiao2016-04-05
|\ \ \ \ \
| | * | | | Added access_level for typesGravatar Gaurav Vaish2016-04-05