aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| * Bump version number to 3.1.0-alpha-1.Gravatar Bo Yang2016-10-10
| |
| * Fix for maps_test.js in JavaScript. (#2145)Gravatar Joshua Haberman2016-10-10
| | | | | | | | | | Had to strip out some JSPB-format test code, but also added some .proto test messages that had been improperly stripped out.
| * Fix bugs for internal integration.Gravatar Bo Yang2016-10-10
| |
| * Integrate internal changesGravatar Bo Yang2016-10-10
|/
* Merge pull request #2236 from hochhaus/masterGravatar Feng Xiao2016-10-09
|\ | | | | Silence compile warnings in bazel
| * Silence compile warnings in bazelGravatar Andy Hochhaus2016-10-09
|/
* Merge pull request #2229 from xfxyjwf/fixbuildGravatar Feng Xiao2016-10-06
|\ | | | | Remove missing files from build.
| * Remove inexist files from build.Gravatar Feng Xiao2016-10-06
|/
* update files to include php generators (#2165)Gravatar Jisi Liu2016-10-06
|
* Merge pull request #2199 from JasonLunn/patch-1Gravatar Joshua Haberman2016-10-04
|\ | | | | Set platform to "java" under JRuby
* \ Merge pull request #2218 from thomasvl/xcode8_updatesGravatar Thomas Van Lenten2016-10-03
|\ \ | | | | | | Update the ObjC projects for Xcode 8
| * | Update the ObjC projects for Xcode 8Gravatar Thomas Van Lenten2016-10-03
|/ / | | | | | | | | | | | | | | | | | | - Let Xcode 8 update settings on the projects/schemes. - Migrate Swift tests to Swift 3 syntax. - Update the build/test script: - Require Xcode 8 (because of the Swift 3 requirement for tests) - Update the devices to what Xcode 8 has (8.x simulator seem to fail even though they can be downloaded in Xcode 8) - Update the travis images to ones with Xcode 8.
* | Merge pull request #2206 from acozzette/gitignoreGravatar Adam Cozzette2016-09-30
|\ \ | | | | | | Updated .gitignore with Java and JavaScript build artifacts
| * | Updated .gitignore with Java and JavaScript build artifactsGravatar Adam Cozzette2016-09-29
|/ /
| * Add development dependency requirementsGravatar Jason Lunn2016-09-29
| | | | | | Uses values from the removed `Gemfile.lock` as a baseline for version requirements, though it has been observed to work with the latest versions of all the referenced gems - see https://travis-ci.org/google/protobuf/builds/163625616 for details
| * Remove hanging reference to Gemfile.lockGravatar Jason Lunn2016-09-29
| |
| * Delete Gemfile.lockGravatar Jason Lunn2016-09-29
| | | | | | Avoid [failures in travis](https://travis-ci.org/google/protobuf/jobs/163611664) under jruby
| * Set platform to "java" under JRubyGravatar Jason Lunn2016-09-29
|/ | | Proposed fix for #1594
* Merge pull request #2197 from thomasvl/swift_docsGravatar Thomas Van Lenten2016-09-28
|\ | | | | Drop the swift docs directory (and content).
| * Drop the swift docs directory (and content).Gravatar Thomas Van Lenten2016-09-28
|/ | | | | Since the official home is looking like it will be in another repo, it makes more sense for the relevant docs to live there instead.
* Merge pull request #2192 from google/3.0.xGravatar Jisi Liu2016-09-27
|\ | | | | Merge 3.0.x into master.
* | Added C++ benchmark. (#1525)Gravatar Joshua Haberman2016-09-23
| |
* | Merge pull request #2153 from haberman/generatechangelogGravatar Feng Xiao2016-09-23
|\ \ | | | | | | Added convenient script for generating changelog draft.
* \ \ Merge pull request #2159 from google/jtattermusch-patch-1Gravatar Jan Tattermusch2016-09-22
|\ \ \ | | | | | | | | Update README.md
| * | | Update README.mdGravatar Jan Tattermusch2016-09-22
|/ / /
| | * Merge pull request #2157 from google/csharp_remove_beta_noticeGravatar Jan Tattermusch2016-09-22
| | |\ | | | | | | | | Update README.md
| | | * Update README.mdGravatar Jan Tattermusch2016-09-22
| | |/
* | | Fix gson dependency.Gravatar Bo Yang2016-09-21
| | | | | | | | | | | | gson 2.3 has internal bug that it doesn't work with some versions of maven.
* | | Merge pull request #2035 from sergiocampama/cppGravatar Feng Xiao2016-09-21
|\ \ \ | | | | | | | | Fixes static analyzer issues from xcode.
| | * | Added convenient script for generating changelog draft.Gravatar Josh Haberman2016-09-21
| |/ / |/| |
* | | Merge pull request #2149 from khingblue/remove-obsoleted-projectGravatar Feng Xiao2016-09-21
|\ \ \ | | | | | | | | Remove obsoleted project of j2me
| * | | Remove obsoleted project of j2meGravatar Khing2016-09-21
|/ / /
| * / Fixes static analyzer issues from xcode.Gravatar Sergio Campama2016-09-20
|/ /
* | Merge pull request #2144 from abscondment/fix-jruby-hashGravatar Joshua Haberman2016-09-20
|\ \ | | | | | | Fix hash computation for JRuby's RubyMessage
| * | Fix hash computation for JRuby's RubyMessageGravatar Brendan Ribera2016-09-20
|/ / | | | | | | | | | | | | | | | | | | `System.identityHashCode` returns a hash that does not consider a Message's values. This means two Messages with identical values will not have identical hashCodes. This patch uses the pattern from RubyMap to combine the hashCodes from all values in a given message and produce a unique, consistent, value-based hash.
* | Merge pull request #2137 from thomasvl/objc_extensions_tweakGravatar Thomas Van Lenten2016-09-19
|\ \ | | | | | | Objc extensions tweaks
| * | Use a custom dictionary to avoid NSNumber operations.Gravatar Thomas Van Lenten2016-09-19
| | | | | | | | | | | | | | | For the secondary dictionary, use a custom CFDictionary with integer keys to avoid the NSNumber conversions.
| * | Remove the custom key functions and just use the system provided defaults.Gravatar Thomas Van Lenten2016-09-19
|/ /
* | Merge pull request #2037 from abscondment/fix-2036-ruby-hashGravatar Joshua Haberman2016-09-18
|\ \ | | | | | | Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
* \ \ Merge pull request #2130 from kilink/substring-comment-fixGravatar Feng Xiao2016-09-16
|\ \ \ | | | | | | | | Fix erroneous comment regarding String.substring
| * | | Fix erroneous comment regarding String.substringGravatar Patrick Strawderman2016-09-16
|/ / / | | | | | | Since Java 7, Strings produced with String.substring do not share byte arrays.
* | | Some php engine implementation doesn't have return_value_ptr properly set. ↵Gravatar Bo Yang2016-09-15
| | | | | | | | | | | | Explicitly use &return_value.
* | | Auto-generate proto files for tests.Gravatar Bo Yang2016-09-15
| | |
* | | Add back missing test proto files.Gravatar Bo Yang2016-09-15
| | |
| | * Merge pull request #2111 from pherl/3.0.xGravatar Jisi Liu2016-09-15
| | |\ | | | | | | | | Fix the version number for 3.0.2
* | | \ Merge pull request #2112 from pherl/mergeGravatar Jisi Liu2016-09-15
|\ \ \ \ | | | | | | | | | | Merge 3.0.x into master
* \ \ \ \ Merge pull request #2123 from thomasvl/objc_better_versioning_take2Gravatar Thomas Van Lenten2016-09-15
|\ \ \ \ \ | | | | | | | | | | | | Update the ObjC version checks to support a min and current version.
| * | | | | Update the ObjC version checks to support a min and current version.Gravatar Thomas Van Lenten2016-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Capture the version used to generated. - Check at compile time and runtime that generated code isn't from a newer version, also check that the min version required is also supported. - Keep the old constants/macros/functions to special case the last version that was working so those generated sources still work until we decide otherwise.
* | | | | | Check in php implementation. (#2052)Gravatar Paul Yang2016-09-15
|/ / / / / | | | | | | | | | | | | | | | | | | | | This pull request includes two implementation: C extension and PHP package. Both implementations support encode/decode of singular, repeated and map fields.
| | | | * Update generated files.Gravatar Jisi Liu2016-09-14
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 19:49:00 +0000