aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* updated READMEbeardedn5rd2016-05-061-1/+4
|
* Merge pull request #1467 from pherl/masterJisi Liu2016-04-30213-3836/+10987
|\ | | | | Merge Google internal changes
| * Update descritpor protos for objcJisi Liu2016-04-2922-3863/+3
| |
| * Merge the script fix.Jisi Liu2016-04-291-1/+1
| |\
| * | Update file lists.Jisi Liu2016-04-282-1/+6
| | |
| * | Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-2825-1234/+3354
| |\ \
| * | | Down integrate from Google internal.Jisi Liu2016-04-28228-3859/+14739
| | | |
* | | | Merge pull request #1474 from pherl/fixscriptThomas Van Lenten2016-04-291-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| Fix cp -r usage to be portable.
| * | Fix cp -r usage to be portable.Jisi Liu2016-04-291-1/+1
|/ / | | | | | | | | | | | | | | cp -r foo/ bar/ in linux will create a bar/foo directoy. In the objectivec generate descritpor case, well known types will be created in objectivec/google/google/protobuf/.. if the command is run under linux. Adding the trailing period fixes the behavior inconsistency.
* | Merge pull request #1462 from acozzette/ruby-2.3Adam Cozzette2016-04-281-2/+2
|\ \ | | | | | | Added dig and bsearch_index to RepeatedField methods forwarded to array
| * | Added dig and bsearch_index to RepeatedField methods forwarded to arrayAdam Cozzette2016-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | This fixes the test_acts_likes_an_array test in RepeatedFieldTest, which checks that repeated fields respond to the same methods as regular Ruby arrays. The bsearch_index and dig array methods seem to be new in Ruby 2.3 and so we should support those.
* | | Merge pull request #1461 from thomasvl/fix_bool_handingThomas Van Lenten2016-04-273-5/+114
|\ \ \ | | | | | | | | Fix up -hash/-isEqual: for bool storage.
| * | | Fix up -hash/-isEqual: for bool storage.Thomas Van Lenten2016-04-273-5/+114
| |/ / | | | | | | | | | | | | | | | | | | Both methods weren't checking the has_bits (where the bools are stored), so it resulted in invalid results. Add a test that should shake out something like this in the future also.
* | | Merge pull request #1455 from haberman/updateupbJoshua Haberman2016-04-274-1222/+1552
|\ \ \ | |/ / |/| | Updated upb and simplified ruby code a bit with new upb method.
| * | Updated upb and simplified ruby code a bit with new upb method.Josh Haberman2016-04-224-1222/+1552
| | |
* | | Merge pull request #1454 from thomasvl/enum_defaultsThomas Van Lenten2016-04-263-4/+22
|\ \ \ | |/ / |/| | Proper checking of enum with non zero default
| * | Proper checking of enum with non zero defaultThomas Van Lenten2016-04-263-4/+22
|/ / | | | | | | | | | | | | | | | | proto2 syntax allows the first enum to have a non zero value. This means any field using that default has a non zero default without having an explicit default being set. So when deciding what runtime info is needed, don't rely on an explicit default, always check that the values aren't zero. Fixes https://github.com/google/protobuf/issues/1453
* | Merge pull request #1444 from mbrtargeting/masterFeng Xiao2016-04-221-0/+2
|\ \ | | | | | | Added serialVersionUID to ExtendableMessage.
| * | Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
| | |
* | | Add initial design document for Swift protocol buffers. (#1442)Tony Allevato2016-04-221-0/+674
|/ / | | | | | | * Add initial design doc for Swift protocol buffers.
* | Merge pull request #1438 from xfxyjwf/docsFeng Xiao2016-04-211-0/+147
|\ \ | | | | | | Add a docs directory and move the third-party add-ons page here.
| * | Add a docs directory and move the third-party add-ons page here.Feng Xiao2016-04-201-0/+147
| | |
* | | Merge pull request #1416 from cwhipkey/masterFeng Xiao2016-04-209-29/+743
|\ \ \ | |_|/ |/| | Change protobuf CPP proto generator to support the 'lite' option in
| * | Change protobuf CPP proto generator to support the 'lite' option inChad Whipkey2016-04-159-29/+743
| | | | | | | | | | | | | | | | | | | | | | | | | | | proto3. Added a couple unit test proto3 files, for arena_lite and lite. Cloned the proto3_arena_unittest to test some of the basics of generated code (and to ensure that the generated proto3 test files are used by some test).
* | | Merge pull request #1414 from xyzzyz/googletestFeng Xiao2016-04-201-1/+0
|\ \ \ | | | | | | | | Remove googletest.h header from stringprintf.cc
| * | | Remove googletest.h header from stringprintf.ccAdam Michalik2016-04-141-1/+0
| | | | | | | | | | | | | | | | | | | | It doesn't seem to be necessary here, and it pulls other testing headers during compilation of release protobuf.
* | | | Merge pull request #1434 from jskeet/regenerateThomas Van Lenten2016-04-208-103/+130
|\ \ \ \ | | | | | | | | | | Regenerate descriptor/well-known types for C#
| * | | | Regenerate well-known types for C#Jon Skeet2016-04-208-103/+130
|/ / / / | | | | | | | | | | | | | | | | (There are documentation changes and new fields in descriptor.proto that have resulted in changes to the serialized descriptor, but no breaking changes for C#.)
* | | | Merge pull request #1433 from thomasvl/check_wktThomas Van Lenten2016-04-202-31/+38
|\ \ \ \ | | | | | | | | | | ObjC support for failing the build in the generated WKTs are out of date
| * | | | ObjC support for failing the build in the generated WKTs are out of dateThomas Van Lenten2016-04-202-31/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Always generated into a temp directory so we can see if things changed. - Add a flag to control exiting with error when stale vs updating. This should let the continuous builds error out when ObjC needs to have the checked in sources updated.
* | | | | Merge pull request #1401 from jskeet/enum-casingJon Skeet2016-04-2034-294/+542
|\ \ \ \ \ | | | | | | | | | | | | Enum casing in C#
| * | | | | Attempt to fix AppVeyor build by exporting GetEnumValueNameJon Skeet2016-04-202-1/+9
| | | | | |
| * | | | | Use the original name in JSON formatting.Jon Skeet2016-04-202-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | (JSON parsing already does the right thing.)
| * | | | | Regenerate all C# code and make it compileJon Skeet2016-04-2022-285/+285
| | | | | | | | | | | | | | | | | | | | | | | | JSON tests fail, as we're not using OriginalNameAttribute yet.
| * | | | | Add C# codegen changes to enum value names (mostly C++)Jon Skeet2016-04-209-6/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overview of changes: - A new C#-specific command-line option, legacy_enum_values to revert to the old behavior - When legacy_enum_values isn't specified, we strip the enum name as a prefix, and PascalCase the value name - A new attribute within the C# code so that we can always tell the original in-proto name Regenerating the C# code with legacy_enum_values leads to code which still compiles and works - but there's more still to do.
| * | | | | Use 0 as the default value for all enums, rather than finding the actual ↵Jon Skeet2016-04-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enum value name This will make it easier to change the enum value names, as it reduces the number of places they're used.
* | | | | | Merge pull request #1417 from seishun/windows2Joshua Haberman2016-04-192-2/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Support Windows in gulpfile.js
| * | | | | Support Windows in gulpfile.jsNikolai Vavilov2016-04-162-2/+6
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1428 from pherl/masterJisi Liu2016-04-191-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Add missing includes in field mask test
| * | | | Add missing includes in field mask testJisi Liu2016-04-191-0/+2
| | | | |
* | | | | Merge pull request #1426 from thomasvl/fix_comment_typoThomas Van Lenten2016-04-1921-20/+175
|\ \ \ \ \ | | | | | | | | | | | | Fix comments typo and update WKTs
| * | | | | Regenerate the WKT to pick up current changes to the proto files.Thomas Van Lenten2016-04-1920-5/+160
| | | | | |
| * | | | | Fix comment typoThomas Van Lenten2016-04-191-15/+15
| | | | | |
* | | | | | Merge pull request #1402 from davidzchen/py2and3Feng Xiao2016-04-191-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add missing PY2AND3 srcs_versions attributes to Python Bazel build targets
| * | | | | Add missing PY2AND3 srcs_versions attributes to Python Bazel build targets.David Z. Chen2016-04-081-3/+6
| | | | | |
* | | | | | Merge pull request #1422 from pherl/masterJisi Liu2016-04-182-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Update file list to include the missing extension lite file.
| * | | | | Update file list to include the missing extension lite file.Jisi Liu2016-04-182-1/+2
|/ / / / /
* | | | | Merge pull request #1413 from haberman/updateupbJoshua Haberman2016-04-159-1395/+1663
|\ \ \ \ \ | |_|/ / / |/| | | | Updated upb: JSON parser now accepts both camelCase and original case, and flag to choose on output.
| * | | | Bugfix for JSON error case.Josh Haberman2016-04-142-3/+1
| | | | |
| * | | | Remove no longer applicable documentation from README.md.Josh Haberman2016-04-141-68/+0
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 08:52:48 +0000