Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix usage of assertItemsEqual on Py3 | Dan O'Reilly | 2015-08-14 | 1 | -2/+2 |
* | Fix some more Python 3 compat issues | Dan O'Reilly | 2015-08-14 | 3 | -14/+25 |
* | Fixing some long/int bugs | Dan O'Reilly | 2015-08-14 | 4 | -12/+21 |
* | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-14 | 11 | -125/+470 |
|\ | |||||
| * | Merge pull request #716 from haberman/fixruby | Joshua Haberman | 2015-08-13 | 3 | -123/+141 |
| |\ | |||||
| | * | Fixed several Ruby conformance test cases through upb update. | Josh Haberman | 2015-08-12 | 3 | -123/+141 |
| * | | Merge pull request #718 from jskeet/descriptor-descriptor | Jan Tattermusch | 2015-08-13 | 3 | -2/+27 |
| |\ \ | |||||
| | * | | Allow public access to descriptor.proto as a dependency. | Jon Skeet | 2015-08-13 | 3 | -2/+27 |
| |/ / | |||||
| * | | Merge pull request #673 from podsvirov/topic-cmake-install | Feng Xiao | 2015-08-12 | 5 | -0/+302 |
| |\ \ | | |/ | |/| | |||||
| | * | Install headers from extract_includes for all platforms | Konstantin Podsvirov | 2015-08-04 | 1 | -1/+1 |
| | * | Fix: comment typo | Konstantin Podsvirov | 2015-08-03 | 1 | -1/+1 |
| | * | Install well-known type proto files from CMake project | Konstantin Podsvirov | 2015-08-03 | 2 | -3/+57 |
| | * | CMake installation now compatible with origin FindProtobuf module | Konstantin Podsvirov | 2015-08-02 | 3 | -2/+156 |
| | * | Parsing version from configure.ac for CMake project | Konstantin Podsvirov | 2015-08-01 | 2 | -15/+24 |
| | * | Install protobuf from cmake project | Konstantin Podsvirov | 2015-07-31 | 4 | -0/+85 |
* | | | Build protobuf files in as part of tox runs. | Dan O'Reilly | 2015-08-13 | 1 | -0/+1 |
* | | | Fixing some tests | Dan O'Reilly | 2015-08-13 | 4 | -42/+30 |
* | | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-12 | 930 | -21697/+246414 |
|\| | | |||||
| * | | Merge pull request #702 from jtattermusch/visual_studio_build_static_runtime | Feng Xiao | 2015-08-12 | 1 | -0/+13 |
| |\ \ | |||||
| | * | | only link runtime libraries statically for a static build | Jan Tattermusch | 2015-08-12 | 1 | -12/+13 |
| | * | | make VS build link runtime statically | Jan Tattermusch | 2015-08-08 | 1 | -0/+12 |
| * | | | Merge pull request #706 from thomasvl/revert_any_change_2 | Paul Yang | 2015-08-11 | 3 | -121/+1 |
| |\ \ \ | |||||
| | * | | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any." | Thomas Van Lenten | 2015-08-11 | 3 | -121/+1 |
| |/ / / | |||||
| * | | | Merge pull request #649 from cijianzy/master | Paul Yang | 2015-08-11 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Update GPBWellKnownTypes.m | Yue Zhang | 2015-07-29 | 1 | -1/+1 |
| * | | | | Merge pull request #703 from jskeet/more-todos | Jan Tattermusch | 2015-08-10 | 7 | -126/+168 |
| |\ \ \ \ | |||||
| | * | | | | More TODOs done. | Jon Skeet | 2015-08-10 | 7 | -126/+168 |
| |/ / / / | |||||
| * | | | | Merge pull request #701 from jskeet/map-views | Jon Skeet | 2015-08-10 | 2 | -4/+180 |
| |\ \ \ \ | |||||
| | * | | | | Fix parameter name in exception. | Jon Skeet | 2015-08-10 | 1 | -1/+1 |
| | * | | | | Implement ICollection.CopyTo (using Array) for MapField views. | Jon Skeet | 2015-08-10 | 2 | -1/+26 |
| | * | | | | Implement Keys and Values as views | Jon Skeet | 2015-08-08 | 2 | -4/+155 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #699 from jskeet/validate_packed | Jon Skeet | 2015-08-10 | 3 | -4/+18 |
| |\ \ \ \ | |||||
| | * | | | | Make FieldDescriptor.IsPacked work appropriately. | Jon Skeet | 2015-08-08 | 3 | -4/+18 |
| | |/ / / | |||||
| * | | | | Merge pull request #700 from jskeet/remove-packed-hack | Jan Tattermusch | 2015-08-08 | 2 | -12/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Remove our own version of MakeTag now that the main one is fixed. | Jon Skeet | 2015-08-07 | 2 | -12/+1 |
| * | | | | Merge pull request #695 from jskeet/remove-todos | Jon Skeet | 2015-08-08 | 17 | -103/+83 |
| |\ \ \ \ | |||||
| | * | | | | Address review comments. | Jon Skeet | 2015-08-08 | 1 | -2/+0 |
| | * | | | | Remove reference to generic types within XML comment. | Jon Skeet | 2015-08-08 | 1 | -2/+2 |
| | * | | | | Tidying up - fix a bunch of TODOs and remove outdated ones. | Jon Skeet | 2015-08-08 | 17 | -102/+84 |
| |/ / / / | |||||
| * | | | | Merge pull request #694 from jskeet/groups | Jon Skeet | 2015-08-08 | 29 | -488/+303 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Address review comments. | Jon Skeet | 2015-08-08 | 2 | -2/+24 |
| | * | | | Generated code for previous commit. | Jon Skeet | 2015-08-06 | 21 | -452/+142 |
| | * | | | Skip groups properly. | Jon Skeet | 2015-08-06 | 7 | -36/+139 |
| * | | | | Merge pull request #645 from zsurocking/master | Paul Yang | 2015-08-06 | 35 | -104/+225 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Xiao Hang | 2015-08-04 | 411 | -255904/+34404 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-08-04 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-07-29 | 0 | -0/+0 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-08-04 | 20 | -28/+28 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / | |||||
| | | * | | / / | Generate a package name suffix ".nano" for nano messages | Xiao Hang | 2015-07-27 | 5 | -58/+174 |
| | | | |_|/ / | | | |/| | | | |||||
| | * / | | | | Generate a package name suffix ".nano" for nano messages | Xiao Hang | 2015-07-29 | 6 | -63/+179 |
| | |/ / / / |