2946 Commits (764a2248ccaca942ab15e69c456bbe87cb5a45b1)
 

Author SHA1 Message Date
Jan Tattermusch 64aa954dae Merge pull request #954 from jskeet/blank-lines-in-comments 9 years ago
Paul Yang 1e54dcfc70 Merge pull request #949 from thomasvl/newer_sims 9 years ago
Jon Skeet cff900e8f9 Generated code for previous commit. 9 years ago
Jon Skeet f4f601bd47 Stop removing all blank lines in doc comments. 9 years ago
Jan Tattermusch ffe25c76ea Merge pull request #941 from jskeet/recursion-limit 9 years ago
Feng Xiao 1470ced7ce Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtime 9 years ago
Thomas Van Lenten f1a3c8fe0d Tweaks to the Mac build script 9 years ago
Joshua Humphries 37b262bfb4 include plugin.proto and generated code in protobuf-java 9 years ago
Jon Skeet 6fa17e7597 Reimplement JSON recursion by detecting the depth in the tokenizer. 9 years ago
Jon Skeet 3a72a1eeaf Merge pull request #940 from jskeet/json-names 9 years ago
Jan Tattermusch 25c045a180 Merge pull request #942 from jskeet/json-exception 9 years ago
Paul Yang a030cc750c Merge pull request #943 from thomasvl/conformance 9 years ago
Jon Skeet 0fb39c4afe Created a new exception for JSON failures. 9 years ago
Thomas Van Lenten f0411ec974 Update the Mac build script to include the conformance tests 9 years ago
Jon Skeet 3d257a9dc1 Add recursion limit handling to JSON parsing. 9 years ago
Jon Skeet 6a94273549 Move the creation of the "fields by JSON name" dictionary to the descriptor. 9 years ago
Jon Skeet b6a32e909b Merge pull request #923 from jskeet/json-parsing 9 years ago
Feng Xiao 55ad57a235 Merge pull request #936 from andrewharp/patch-1 9 years ago
Feng Xiao 0cf6198cf1 Merge pull request #939 from dougkwan/master 9 years ago
Doug Kwan 2a50e67c78 Add support for POWER Linux 9 years ago
Andrew Harp 38f131fd8c Build protoc for host platform to enable cross-compilation. 9 years ago
Jon Skeet fb2488225f Implement JSON parsing in C#. 9 years ago
Jisi Liu aa3675415e Merge pull request #930 from pherl/bazel_test 9 years ago
Feng Xiao ec9f45b106 Merge pull request #931 from xfxyjwf/fix_compile 9 years ago
Feng Xiao 9659ea9e56 Fix compilation errors when built internally. 9 years ago
Jisi Liu d4bef7d41b add warning notes for cc|py_proto_library rules. 9 years ago
Jan Tattermusch 59635c13d9 Merge pull request #929 from jskeet/unsafe-internal 9 years ago
Jon Skeet 885406abcf Make BytesString.Unsafe internal (which it should have been all along) 9 years ago
Feng Xiao 8eebad1082 Merge pull request #924 from bbarenblat/master 9 years ago
Benjamin Barenblat a2ce9cb9ea Correct spelling 9 years ago
Jan Tattermusch 46f8a79826 Merge pull request #905 from jskeet/wrapper-clear 9 years ago
Jon Skeet f5a0a7feeb Fix clearing wrapper type fields with reflection. 9 years ago
Feng Xiao a74e912a8b Merge pull request #922 from randomascii/master 9 years ago
Bruce Dawson 86ba70ec41 Get VS 2015 to use const int definitions 9 years ago
Joshua Haberman 86f6f53db3 Merge pull request #861 from haberman/pywarnings 9 years ago
Josh Haberman c3ca920509 Pass $CC environment variable through tox. 9 years ago
Josh Haberman d8814ed59e Special-case Clang-only warning flags to Clang. 9 years ago
Josh Haberman 30cbd4c561 Disable some more warnings to be warnings-free. 9 years ago
Josh Haberman 70ffefa551 Fixed compile errors after rebase. 9 years ago
Josh Haberman 00700b7219 Removed all warnings from the Python/C++ build. 9 years ago
Jisi Liu 12fb61b292 Merge pull request #915 from pherl/master 9 years ago
Jisi Liu be92ffbf74 add default_runtime attribute to cc|py rules. 9 years ago
Jan Tattermusch d4569d1f5e Merge pull request #908 from jskeet/oneof-equality 9 years ago
Jon Skeet 55313c9c5d Generated code for previous commit (oneof case contributing to hash code and equality). 9 years ago
Jon Skeet 964627ece0 Include the oneof-case in equality and hash code generated code. 9 years ago
Jisi Liu dfae9e36c7 Merge pull request #904 from matthew-wu/master 9 years ago
Matthew Wu 187cfc5700 Change the #include for any.h to use angle brackets instead of quotes, to be consistent with other protobuf library includes. 9 years ago
Jisi Liu 1abf297fb9 Merge pull request #903 from pherl/bazel_test 9 years ago
Jisi Liu e1f60f5043 Update comments. 9 years ago
Jisi Liu b657cb4b91 fix six package path. 9 years ago