4345 Commits (a60cc08d838d3075ec0e38e5ed2791d78b200630)
 

Author SHA1 Message Date
Feng Xiao a60cc08d83 Merge pull request #2691 from cgrushko/patch-3 8 years ago
Paul Yang cba04b19e8 Implement json encoding decoding for php. (#2682) 8 years ago
cgrushko 6fffd4adb4 Bazel can build protobuf when it's not in the root 8 years ago
Paul Yang c00274313d Add fixed version to phpunit used in travis (#2673) 8 years ago
Thomas Van Lenten 36f51f963c Merge pull request #2681 from sergiocampama/spaces 8 years ago
Sergio Campama e7f5c9d071 Removes trailing whitespaces 8 years ago
Paul Yang 5a3405c51a Update upb for php. (#2662) 8 years ago
Jon Skeet bd29f86804 Fix CopyTo argument validation 8 years ago
Paul Yang 39756643df Add conformance test for php (#2655) 8 years ago
Paul Yang 7f3e237071 Merge 3.2.x branch into master (#2648) 8 years ago
Joshua Haberman 9d3288e651 Merge pull request #2226 from kchodorow/master 8 years ago
Jon Skeet afc59ab55a C#: Implement IReadOnlyList<T> in RepeatedField<T> 8 years ago
Jie Luo 87e4976ba4 Merge pull request #2639 from anandolee/master 8 years ago
michaelpengcn a83ac8663f fix compile error on centos in metadata.h for constructors. (#2599) 8 years ago
Paul Yang a323f1e65d Oneof accessor should return the field name that is actually set. (#2631) 8 years ago
Jie Luo ccb76fff44 Add Oneof custom options test 8 years ago
Jie Luo 5af0b547de Merge pull request #2619 from anandolee/master 8 years ago
Jie Luo 1f09786229 Merge pull request #2633 from anandolee/jieluo_branch1 8 years ago
Jie Luo ea51149100 Add python compatibility tests against v2.5.0 amd run on Travis. 8 years ago
Jie Luo c15217f922 Allow OneofOptions to be extended in proto3. 8 years ago
Thomas Van Lenten c2a5669773 Merge pull request #2626 from sergiocampama/8_3 8 years ago
Kristina Chodorow 4e7ecde15c Update genfiles paths to work with a different execroot arrangement 8 years ago
Sergio Campama 3d7b42d1a6 Adds nullability modifiers to resolve Xcode 8.3 warnings 8 years ago
Jie Luo 140e28d12e Add python compatibility tests against v2.5.0: copy tests and proto files from v2.5.0 8 years ago
Adam Cozzette 0aa5af3e68 Merge pull request #2614 from acozzette/gzip-output-stream-options 8 years ago
Adam Cozzette a101fa5289 Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options 8 years ago
Jon Skeet 047575f20c Support custom options in C# 8 years ago
Thomas Van Lenten eed9951991 Merge pull request #2591 from thomasvl/objc_timestamps_take2 8 years ago
Thomas Van Lenten d0bc096b4a Timestamp helper fix, Duration helper cleanup. 8 years ago
Thomas Van Lenten c9cd6acd71 Merge pull request #2587 from google/revert-2586-objc_timestamp 8 years ago
Thomas Van Lenten 1651342501 Revert "Fix Timestamps with dates before the Unix epoch that contain fractional seconds." 8 years ago
Thomas Van Lenten cf477d46ca Merge pull request #2586 from thomasvl/objc_timestamp 8 years ago
Thomas Van Lenten adcccd0f81 Fix Timestamps with dates before the Unix epoch that contain fractional seconds. 8 years ago
Feng Xiao feb78fb293 Merge pull request #2584 from cgrushko/patch-2 8 years ago
cgrushko e4baf3f58a Add a proto_lang_toolchain for Java 8 years ago
Adam Cozzette e53dd99350 Merge pull request #2529 from wackoisgod/master 8 years ago
Andrew Spiering 75ac3973ef Fixing code formatting issues 8 years ago
Andrew Spiering effcb132e1 Merge branch 'master' of https://github.com/wackoisgod/protobuf 8 years ago
Adam Cozzette 228d242c58 Merge pull request #2567 from acozzette/distcheck-fix 8 years ago
Jon Skeet fb71df9f0b Add ByteString.FromStream and ByteString.FromStreamAsync in C# 8 years ago
Jon Skeet e76d91a9d1 Add global.json file to pick dotnet core SDK version. 8 years ago
Adam Cozzette 0bdf4a617f Fixed "make distcheck" for the Autotools build 8 years ago
Sufir 2bddffc993 PHP fix int64 decoding (#2516) 8 years ago
Marcus Longmuir 2c16f6979a Fix generation of extending nested messages in JavaScript (#2439) 8 years ago
Joshua Haberman ffa71f8007 A few more cases for binary conformance tests. (#2500) 8 years ago
Adam Cozzette 1041710fce Merge pull request #2565 from acozzette/cross-compilation 8 years ago
Thomas Van Lenten 24f0d5691e Merge pull request #2563 from thomasvl/autocreator_tweaks 8 years ago
Thomas Van Lenten 988ffe0a78 Minor fix for autocreated object repeated fields and maps. 8 years ago
Adam Cozzette 2deb139bc9 Merge pull request #2544 from tiziano88/master 8 years ago
Adam Cozzette 17a8a7619a Merge pull request #2536 from jbrianceau/fix-js-embed-include-style 8 years ago