| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Merge pull request #1433 from thomasvl/check_wkt | Thomas Van Lenten | 2016-04-20 | 2 | -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 date | Thomas Van Lenten | 2016-04-20 | 2 | -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-casing | Jon Skeet | 2016-04-20 | 34 | -294/+542 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Enum casing in C# | |||||
| | * | | | | | | Attempt to fix AppVeyor build by exporting GetEnumValueName | Jon Skeet | 2016-04-20 | 2 | -1/+9 | |
| | | | | | | | | ||||||
| | * | | | | | | Use the original name in JSON formatting. | Jon Skeet | 2016-04-20 | 2 | -2/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (JSON parsing already does the right thing.) | |||||
| | * | | | | | | Regenerate all C# code and make it compile | Jon Skeet | 2016-04-20 | 22 | -285/+285 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON tests fail, as we're not using OriginalNameAttribute yet. | |||||
| | * | | | | | | Add C# codegen changes to enum value names (mostly C++) | Jon Skeet | 2016-04-20 | 9 | -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 Skeet | 2016-04-11 | 1 | -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/windows2 | Joshua Haberman | 2016-04-19 | 2 | -2/+6 | |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Support Windows in gulpfile.js | |||||
| | * | | | | | | Support Windows in gulpfile.js | Nikolai Vavilov | 2016-04-16 | 2 | -2/+6 | |
| | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | | Merge pull request #1428 from pherl/master | Jisi Liu | 2016-04-19 | 1 | -0/+2 | |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add missing includes in field mask test | |||||
| | * | | | | | Add missing includes in field mask test | Jisi Liu | 2016-04-19 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #1426 from thomasvl/fix_comment_typo | Thomas Van Lenten | 2016-04-19 | 21 | -20/+175 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix comments typo and update WKTs | |||||
| | * | | | | | | Regenerate the WKT to pick up current changes to the proto files. | Thomas Van Lenten | 2016-04-19 | 20 | -5/+160 | |
| | | | | | | | | ||||||
| | * | | | | | | Fix comment typo | Thomas Van Lenten | 2016-04-19 | 1 | -15/+15 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #1402 from davidzchen/py2and3 | Feng Xiao | 2016-04-19 | 1 | -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. Chen | 2016-04-08 | 1 | -3/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #1422 from pherl/master | Jisi Liu | 2016-04-18 | 2 | -1/+2 | |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Update file list to include the missing extension lite file. | |||||
| | * | | | | | | Update file list to include the missing extension lite file. | Jisi Liu | 2016-04-18 | 2 | -1/+2 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #1413 from haberman/updateupb | Joshua Haberman | 2016-04-15 | 9 | -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 Haberman | 2016-04-14 | 2 | -3/+1 | |
| | | | | | | | ||||||
| | * | | | | | Remove no longer applicable documentation from README.md. | Josh Haberman | 2016-04-14 | 1 | -68/+0 | |
| | | | | | | | ||||||
| | * | | | | | Ruby JSON: always accept both camelCase and original field names. | Josh Haberman | 2016-04-14 | 7 | -33/+82 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For JSON encoding we provide a new option to decide at encode time whether to use camelCase or original proto field names: json = MapMessage.encode_json(m, :preserve_proto_fieldnames => true) | |||||
| | * | | | | | Documented the JSON change and compatibility flags. | Josh Haberman | 2016-04-14 | 1 | -13/+83 | |
| | | | | | | | ||||||
| | * | | | | | Updated upb: picked up legacy JSON flags to help Ruby users migrate. | Josh Haberman | 2016-04-14 | 2 | -1354/+1573 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flags are: UPB_JSON_ACCEPT_LEGACY_FIELD_NAMES UPB_JSON_WRITE_LEGACY_FIELD_NAMES The first just allows the parser to accept the old field names. The second makes the printer print the old field names. These flags are intended to be temporary, as a migration aid for users. | |||||
| * | | | | | Merge pull request #1397 from google/internal-merge | Joshua Haberman | 2016-04-11 | 273 | -4795/+34425 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Internal merge | |||||
| | * | | | | Fix for gulpfile.js. | Josh Haberman | 2016-04-11 | 1 | -1/+10 | |
| | | | | | | ||||||
| | * | | | | Removed duplicated operator delete from merge conflict. | Josh Haberman | 2016-04-07 | 1 | -6/+0 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' into internal-merge | Josh Haberman | 2016-04-07 | 42 | -124/+371 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Fix for CommonJS tests. | Josh Haberman | 2016-04-07 | 2 | -8/+30 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #1381 from pherl/internal-merge | Jisi Liu | 2016-04-01 | 270 | -4796/+34417 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Merge Google internal changes to an internal branch | |||||
| | | * | | | | | Merge branch 'master' into internal-merge | Jisi Liu | 2016-04-01 | 270 | -4796/+34417 | |
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily merges google internal changes. The javascript tests are still failing and require additional investigation. | |||||
| | | * | | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-01 | 12 | -106/+218 | |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | | * | | | | | Do not use C++11 unicode escape in unittest. | Jisi Liu | 2016-04-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For fixing MSVC | |||||
| | | * | | | | | Do not let windows.h define min/max macros | Jisi Liu | 2016-04-01 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | Allow bigobj for map_unittest | Jisi Liu | 2016-04-01 | 1 | -0/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix re-definition issue of winsock.h and winsock2.h | Jisi Liu | 2016-03-31 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | Disable sign-compare warning. | Jisi Liu | 2016-03-31 | 1 | -1/+3 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix signed-compare warning. | Jisi Liu | 2016-03-31 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | revert unexpected change for py26 | Jisi Liu | 2016-03-31 | 1 | -1/+4 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix WIN32 build for map_test. | Jisi Liu | 2016-03-31 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stubs/common.h undefines the GetMessage macro introduced in windows.h map_test however include stubs/common.h before windows.h is transitively included. This hack force map_test.cc to include windows.h first, so we have a chance to undefine the GetMessage macro. | |||||
| | | * | | | | | Remove export macros for classes nested in a template class. | Jisi Liu | 2016-03-31 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix javanano package | Jisi Liu | 2016-03-31 | 1 | -0/+3 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix json_format.py in py26 | Jisi Liu | 2016-03-31 | 1 | -2/+4 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix breakage of referring to table_ in static func | Jisi Liu | 2016-03-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Referencing data member table_ in static functions break certain platforms. Change it to refer to the declare type void** instead. | |||||
| | | * | | | | | Temporarily disable begin is fast test. | Jisi Liu | 2016-03-31 | 1 | -1/+2 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 114 | -6935/+4729 | |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | ||||||
| | | * | | | | | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 269 | -4802/+34402 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #1400 from jskeet/fix-internal | Jan Tattermusch | 2016-04-10 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Fix to csharp_options - initialize internal_access to false. | |||||
| | * | | | | | | Fix to csharp_options - initialize internal_access to false. | Jon Skeet | 2016-04-08 | 1 | -1/+2 | |
| |/ / / / / / | ||||||
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |