| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Modified NPM package to make all dependencies dev dependencies.package-json | Josh Haberman | 2016-04-13 | 1 | -4/+4 |
| | | |||||
| * | 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 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1393 from gvaish/master | Jon Skeet | 2016-04-07 | 3 | -1/+6 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Added support for internal_access for C# | ||||
| | * | | | | Added support for internal_access for C# | Gaurav Vaish | 2016-04-07 | 3 | -1/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #1392 from anandolee/master | Jie Luo | 2016-04-07 | 8 | -19/+41 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Sync the manually integrate changes in google3/third_party | ||||
| | * | | | | sync the Manually integrate changes in google3/third_party | Jie Luo | 2016-04-06 | 8 | -19/+41 |
| | | | | | | |||||
| * | | | | | Merge pull request #1390 from jskeet/tidy-up | Jon Skeet | 2016-04-07 | 21 | -49/+111 |
| |\ \ \ \ \ | | | | | | | | | | | | | Tidy up for C# codegen | ||||
| | * | | | | | Add more documentation for csharp_options.h | Jon Skeet | 2016-04-06 | 2 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also renames generate_directories to base_namespace_specified; generating directories is the immediate *effect* of specifying a base namespace, but with this change the options reflect what has been specified rather than the effect. (There may be other effects in the future, of course.) | ||||
| | * | | | | | Line-wrapping changes only for C# generator code | Jon Skeet | 2016-04-06 | 20 | -44/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should have no behavioral changes at all. This doesn't strictly enforce an 80-column limit, but removes the most egregious violations. The indentation in the C# generator code is inconsistent in general, unfortunately - if we have any good tools that can be trusted to reformat, I'd be happy to apply them. | ||||
| * | | | | | | Merge pull request #1391 from thomasvl/string_tweaks | Thomas Van Lenten | 2016-04-06 | 2 | -9/+47 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | ObjC String followups: one test case only addition, behavior change for invalid UTF-8 | ||||
| | * | | | | | | Error during parsing for invalid UTF-8 instead of dropping dropping data. | Thomas Van Lenten | 2016-04-05 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to be some code evolution side effects. Back when there was a custom string class, we couldn't really error when we finally saw the string was bad so we had to return the empty string, but now that full validation is done up front, it can error out. | ||||
| | * | | | | | | Add tests to ensure we read strings with BOMs so we don't forget about ↵ | Thomas Van Lenten | 2016-04-05 | 1 | -0/+38 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | lessons of the past. | ||||
| * / / / / / | Updating Xcode Settings to use iOS 9.3 | Geoffrey Wiseman | 2016-04-06 | 1 | -0/+8 |
| |/ / / / / | | | | | | | | | | | | | | | | Update the simulators used for some tests under Xcode 7.3 to be iOS 9.3. | ||||
| * | | | | | Merge pull request #1349 from gvaish/master | Jon Skeet | 2016-04-05 | 32 | -84/+177 |
| |\ \ \ \ \ | | | | | | | | | | | | | Added CLI option internal_access for types (C#) | ||||
| | * | | | | | Added access_level for types | Gaurav Vaish | 2016-04-05 | 32 | -84/+177 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `csharp_options`: Added `Options` to encapsulate generator options. Supported options for now - file_extension, base_namespace * `{Blah}Generator`: Now accept `Options*` as parameter to constructor * `csharp_generator.cc`: Parse and populate options * `Makefile.am`: Added `csharp_options.h` * `extract_includes.bat.in`: Added `csharp_options.h` Refactoring code to two commits. This is the first commit | ||||
| * | | | | | Merge pull request #1386 from andrewharp/patch-2 | Feng Xiao | 2016-04-05 | 1 | -2/+12 |
| |\ \ \ \ \ | | | | | | | | | | | | | Do not link in pthread library for Android builds. | ||||
| | * | | | | | Update BUILD | Andrew Harp | 2016-04-04 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Do not link in pthread library for Android builds. | Andrew Harp | 2016-04-04 | 1 | -2/+12 |
| |/ / / / / | | | | | | | | | | | This is required to allow Tensorflow to build on Android without hacks. Currently we create a dummy pthread library just to satisfy this dependency for a library that does not exist on Android. See https://github.com/google/protobuf/issues/1373 for more context. | ||||
| * | | | | | Merge pull request #852 from qzix/master | Thomas Van Lenten | 2016-04-04 | 5 | -11/+41 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Added deprecated option handling to objective-c | ||||
| | * | | | | Added deprecated option handling for objective-c generator | Oleg Vereshko | 2016-04-04 | 5 | -11/+41 |
| | | | | | | |||||
| * | | | | | Merge pull request #1353 from keveman/master | Joshua Haberman | 2016-04-01 | 2 | -17/+30 |
| |\ \ \ \ \ | | | | | | | | | | | | | Linking the cpp implementation extension statically with libprotobuf | ||||
| | * | | | | | Linking the cpp implementation extension statically with libprotobuf | Manjunath Kudlur | 2016-04-01 | 2 | -17/+30 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1377 from jskeet/remove-duplicate-tests | Jon Skeet | 2016-04-01 | 2 | -2/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove duplicate test cases. | ||||
| | * | | | | | | Remove duplicate test cases. | Jon Skeet | 2016-04-01 | 2 | -2/+0 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | (NCrunch noticed these.) | ||||
| * | | | | | | Merge pull request #1378 from thomasvl/manual_stream_parsing_helpers | Thomas Van Lenten | 2016-04-01 | 2 | -0/+17 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add -position and -isAtEnd for use when manually parsing input streams. | ||||
| | * | | | | | Add -position and -isAtEnd for use when manually parsing input streams. | Thomas Van Lenten | 2016-04-01 | 2 | -0/+17 |
| |/ / / / / | |||||
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |