aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #338 from skippy/encode-decode-helpersGravatar Chris Fallin2015-05-15
|\ | | | | ruby: Encode decode cleanup and behavior normalization
* \ Merge pull request #391 from jtattermusch/generate_protos_windows_friendlyGravatar Jie Luo2015-05-15
|\ \ | | | | | | Make generate_protos.sh Windows-friendly.
* \ \ Merge pull request #385 from cfallin/travis-refactorGravatar Chris Fallin2015-05-14
|\ \ \ | | | | | | | | Refactor Travis tests: split configs and run in parallel.
* \ \ \ Merge pull request #384 from google/csharpGravatar Jie Luo2015-05-14
|\ \ \ \ | | | | | | | | | | Merge protobuf C# into master (only C# proto2 is supported)
| | * | | Refactor Travis tests: split configs and run in parallel.Gravatar Chris Fallin2015-05-14
| | | | |
* | | | | Merge pull request #340 from skippy/add-array-like-methodsGravatar Chris Fallin2015-05-14
|\ \ \ \ \ | | | | | | | | | | | | ruby: make repeated_field quack like an array
| * | | | | make repeated_field quack like an arrayGravatar Adam Greene2015-05-14
|/ / / / /
| | | * / Make generate_protos.sh Windows-friendly.Gravatar Jon Skeet2015-05-14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To my surprise, executing generate_protos.sh used the version of Bash installed with Git for Windows by default. After a few modifications to detect the most appropriate protoc to use, this worked pretty simply. This change also: - adds generation of the address book tutorial proto, - fixes the addressbook.proto to specify proto2 explicitly (to avoid a warning from protoc; I don't think we want warnings...) - fixes the addressbook.proto C# namespace (which I thought I'd done before, but apparently hadn't) - includes the regenerated UnittestCustomOptions.cs apart from the DescriptorProtoFIle => Descriptor change
* | | | Merge branch 'gerrit'Gravatar Feng Xiao2015-05-13
|\ \ \ \ | |_|/ / |/| | |
* | | | Merge pull request #383 from cfallin/ruby-travisGravatar Chris Fallin2015-05-13
|\ \ \ \ | | | | | | | | | | Add Ruby to Travis testing
| | | * \ Merge pull request #382 from jtattermusch/integrate_from_masterGravatar Jie Luo2015-05-13
| | | |\ \ | | | | | | | | | | | | Integrate changes from latest master branch into csharp branch.
| * | | | | Added Ruby to Travis testing.Gravatar Chris Fallin2015-05-13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added RVM-based Ruby test driver that tests MRI and JRuby. - Fixed JRuby compilation (at least in my current setup): force source version to 1.6 (Java 6) to allow generics and annotations. - Modify the skipped JRuby JSON tests so that the exit code is 0 (skip() results in a failing exit code from `rake test`). An upcoming PR should fix JSON under JRuby in general soon.
| | * | | Merge pull request #380 from jtattermusch/csharpGravatar Jie Luo2015-05-13
| | |\ \ \ | | | | | | | | | | | | Update README.md for C#
| | | | * | Regenerate UnittestDropUnknownFields.csGravatar Jan Tattermusch2015-05-13
| | | | | |
| | | | * | Merge branch 'master' of github.com:google/protobuf into integrate_from_masterGravatar Jan Tattermusch2015-05-13
| | | |/| | | | |/|/ / | |_|/| | |/| | | |
| | | * | Update README.md for C#Gravatar Jan Tattermusch2015-05-13
| | |/ /
| | * | Merge pull request #379 from jskeet/csharpGravatar Jie Luo2015-05-13
| | |\ \ | | | | | | | | | | Remove the C#-specific field_presence_test.proto, using unittest_no_field_presence.proto instead.
| | | | * adding and simplifying encoders/decodersGravatar Adam Greene2015-05-13
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | * make consistent between mri and jruby * create a #to_h and have it use symbols for keys * add #to_json and #to_proto helpers on the Google::Protobuf message classes
| | | * Update C# code generation scriptGravatar Jon Skeet2015-05-13
| | | |
| | | * Remove the C#-specific field_presence_test.proto, using ↵Gravatar Jon Skeet2015-05-13
| | |/ | | | | | | | | | | | | | | | | | | unittest_no_field_presence.proto instead. This is the start of establishing a C# namespace of "Google.ProtocolBuffers.TestProtos.Proto3" for proto3-syntax protos. We could optionally split the directory structure as well into Proto2 and Proto3 for clarity.
| | * Merge pull request #373 from jtattermusch/csharp_generate_protoGravatar Jon Skeet2015-05-13
| | |\ | | | | | | | | C# generate_proto.sh and buildall.sh scripts
| | | * regenerated UnittestImportLite.csGravatar Jan Tattermusch2015-05-12
| | | |
| | | * regenerated UnittestImportPublicLiteGravatar Jan Tattermusch2015-05-12
| | | |
| | | * Regenerated UnittestExtrasLite.csGravatar Jan Tattermusch2015-05-12
| | | |
| | | * Regenerated UnittestDropUnknownFields.csGravatar Jan Tattermusch2015-05-12
| | | |
| | | * remove C# files not referenced in any projectGravatar Jan Tattermusch2015-05-12
| | | |
| | | * Regenerate some proto files after ClsCompliance has been droppedGravatar Jan Tattermusch2015-05-12
| | | |
| | | * rename FieldPresence to correct nameGravatar Jan Tattermusch2015-05-12
| | | |
| | | * got rid of the outdated mono subdirectoryGravatar Jan Tattermusch2015-05-12
| | | |
| | | * draft of generate_protos.shGravatar Jan Tattermusch2015-05-12
| | | |
| | | * add buildall script for monoGravatar Jan Tattermusch2015-05-12
| | |/
| | * Merge pull request #372 from jtattermusch/csharp_cleanupGravatar Jie Luo2015-05-12
| | |\ | | | | | | | | C# cleanup
| | | * adding what was missing in .gitignoreGravatar Jan Tattermusch2015-05-12
| | | |
| | | * lib subdir is not needed anymoreGravatar Jan Tattermusch2015-05-12
| | |/
* | | Merge pull request #371 from zhangkun83/dockerGravatar Jisi Liu2015-05-12
|\ \ \ | | | | | | | | Dockerfile for building protoc on Centos 6.6
| * | | Dockerfile for building protoc on Centos 6.6Gravatar Kun Zhang2015-05-12
| | | |
| | | * Merge pull request #370 from jtattermusch/mono_fixesGravatar Jie Luo2015-05-12
| | | |\ | | | | | | | | | | Fixes for Mono
| | | | * Fix newline assertion in TestJsonFormatted on monoGravatar Jan Tattermusch2015-05-12
| | | | |
* | | | | Merge pull request #369 from ensonic/masterGravatar Feng Xiao2015-05-12
|\ \ \ \ \ | |/ / / / |/| | | | Uncomment conflict fields from pkg-config files.
| | | | * remove TreatWarningsAsError setting to allow building in MonodevelopGravatar Jan Tattermusch2015-05-12
| | | |/
| | | * Merge pull request #366 from jskeet/csharpGravatar Jan Tattermusch2015-05-12
| | | |\ | | | | | | | | | | Convert back to using NUnit, which is now loaded via NuGet.
| * | | | Uncomment conflict fields from pkg-config files.Gravatar Stefan Sauer2015-05-12
|/ / / / | | | | | | | | | | | | | | | | The referenced bug was fixed in 2007 and has been released in pkg-config-0.23 (16.Jan.2008). The fixed version is widely available.
| | | * Convert back to using NUnit, which is now loaded via NuGet.Gravatar Jon Skeet2015-05-12
| | |/ | | | | | | | | | | | | This includes the NUnit test adapter which allows NUnit tests to be run under VS without any extra plugins. Unfortunate the compatibility tests using the abstract test fixture class show up as "external" tests, and aren't well presented - but they do run.
| * | Include generated code of well-known types in protobuf C++ runtime.Gravatar Feng Xiao2015-05-11
| | | | | | | | | | | | Change-Id: I23dee1c1d27b6440658680e9c273b6250213123c
| | * Merge pull request #352 from jtattermusch/csharp_performance_fixGravatar Jon Skeet2015-05-09
| | |\ | | | | | | | | Performance optimization for small messages without unknown fields
* | | \ Merge pull request #255 from btabibian/masterGravatar Joshua Haberman2015-05-07
|\ \ \ \ | |/ / / |/| | | adding globals() to exec call for python3 compatibility
* | | | Merge branch 'gerrit' to 'master'Gravatar Feng Xiao2015-05-07
|\ \ \ \
* \ \ \ \ Merge pull request #345 from brianduff/update_aosp_againGravatar Jisi Liu2015-05-07
|\ \ \ \ \ | | | | | | | | | | | | Handle 0-length byte buffers in micro and nano protobufs
* \ \ \ \ \ Merge pull request #101 from fizbin/fix_large_proto_java_codeGravatar Feng Xiao2015-05-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix java compilation issues when processing large .proto files
| | | | * | | mendGravatar Behzad Tabibian2015-05-07
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 10:33:13 +0000