3579 Commits (f180ef63985fb410dceda1e299020ee4ebd696e0)
 

Author SHA1 Message Date
Jisi Liu 1dc81948f5 Merge pull request #1428 from pherl/master 9 years ago
Jisi Liu 1b0ff34b90 Add missing includes in field mask test 9 years ago
Thomas Van Lenten 52825bf91a Merge pull request #1426 from thomasvl/fix_comment_typo 9 years ago
Thomas Van Lenten e664aa6d91 Regenerate the WKT to pick up current changes to the proto files. 9 years ago
Feng Xiao 83a7a5e885 Merge pull request #1402 from davidzchen/py2and3 9 years ago
Thomas Van Lenten 3633bcd5e4 Fix comment typo 9 years ago
Jisi Liu 072296f186 Merge pull request #1422 from pherl/master 9 years ago
Jisi Liu 1f4f3e26bd Update file list to include the missing extension lite file. 9 years ago
Nikolai Vavilov 7ff229fa4e Support Windows in gulpfile.js 9 years ago
Joshua Haberman ca9bbd71d5 Merge pull request #1413 from haberman/updateupb 9 years ago
Chad Whipkey baf52bd79e Change protobuf CPP proto generator to support the 'lite' option in 9 years ago
Josh Haberman e67ef3d449 Bugfix for JSON error case. 9 years ago
Josh Haberman 800e986012 Remove no longer applicable documentation from README.md. 9 years ago
Josh Haberman 194ad621bb Ruby JSON: always accept both camelCase and original field names. 9 years ago
Adam Michalik 1b912fceee Remove googletest.h header from stringprintf.cc 9 years ago
Josh Haberman 90c7f6e55e Documented the JSON change and compatibility flags. 9 years ago
Josh Haberman 94e54b39c8 Updated upb: picked up legacy JSON flags to help Ruby users migrate. 9 years ago
Joshua Haberman 814685ca2c Merge pull request #1397 from google/internal-merge 9 years ago
Josh Haberman 3c4ce528c6 Fix for gulpfile.js. 9 years ago
Jon Skeet 2a197b3eb0 Use 0 as the default value for all enums, rather than finding the actual enum value name 9 years ago
Jan Tattermusch 3ffbdd712f Merge pull request #1400 from jskeet/fix-internal 9 years ago
David Z. Chen 5ebeefb94c Add missing PY2AND3 srcs_versions attributes to Python Bazel build targets. 9 years ago
Jon Skeet 0a902ee0ac Fix to csharp_options - initialize internal_access to false. 9 years ago
Josh Haberman 2cd79bf3a8 Removed duplicated operator delete from merge conflict. 9 years ago
Josh Haberman 4465daa57a Merge branch 'master' into internal-merge 9 years ago
Jon Skeet 667f4a6282 Merge pull request #1393 from gvaish/master 9 years ago
Josh Haberman 15239361e3 Fix for CommonJS tests. 9 years ago
Jie Luo 09292d5759 Merge pull request #1392 from anandolee/master 9 years ago
Gaurav Vaish a6e39316a7 Added support for internal_access for C# 9 years ago
Jon Skeet cef46e115a Merge pull request #1390 from jskeet/tidy-up 9 years ago
Jie Luo c61207492e sync the Manually integrate changes in google3/third_party 9 years ago
Thomas Van Lenten 28c5c25397 Merge pull request #1391 from thomasvl/string_tweaks 9 years ago
Geoffrey Wiseman f98d2f5147 Updating Xcode Settings to use iOS 9.3 9 years ago
Jon Skeet 2a18bb5a33 Add more documentation for csharp_options.h 9 years ago
Jon Skeet bfd1c84a3d Line-wrapping changes only for C# generator code 9 years ago
Thomas Van Lenten c9167f2acd Error during parsing for invalid UTF-8 instead of dropping dropping data. 9 years ago
Thomas Van Lenten f3f5b3fb64 Add tests to ensure we read strings with BOMs so we don't forget about lessons of the past. 9 years ago
Jon Skeet 89719f07a3 Merge pull request #1349 from gvaish/master 9 years ago
Feng Xiao f3fe75bae5 Merge pull request #1386 from andrewharp/patch-2 9 years ago
Gaurav Vaish 74d8b0bebc Added access_level for types 9 years ago
Andrew Harp 3b4e7dcf29 Update BUILD 9 years ago
Andrew Harp b56b461e49 Do not link in pthread library for Android builds. 9 years ago
Thomas Van Lenten a771c9e11c Merge pull request #852 from qzix/master 9 years ago
Oleg Vereshko 268ce2818f Added deprecated option handling for objective-c generator 9 years ago
Jisi Liu aeacf51602 Merge pull request #1381 from pherl/internal-merge 9 years ago
Jisi Liu 7630a83767 Merge branch 'master' into internal-merge 9 years ago
Jisi Liu cba75ad404 Merge branch 'master' of github.com:google/protobuf 9 years ago
Jisi Liu 89343d87c6 Do not use C++11 unicode escape in unittest. 9 years ago
Joshua Haberman 452e2b2c5c Merge pull request #1353 from keveman/master 9 years ago
Manjunath Kudlur cf828deb9b Linking the cpp implementation extension statically with libprotobuf 9 years ago