aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix python versions to comply with pep-0440.Jisi Liu2015-03-042-2/+14
* Merge remote-tracking branch 'github/alpha-2-fix'Jisi Liu2015-03-041-1/+1
|\
| * Fix python package version to alpha-2.Jisi Liu2015-03-041-1/+1
* | Merge pull request #225 from google/post-alpha2-integrateJisi Liu2015-03-03147-3306/+11280
|\ \
| * | Remove the extra -j8 as it can be passed in $@ already.Jisi Liu2015-03-021-1/+1
| * | Initialize data members in constructors instead of direct initialize inJisi Liu2015-03-011-3/+3
| * | use is_proto_enum instead of is_enum for repeated accessor field.Jisi Liu2015-03-011-1/+1
| * | Fix hash.h for MSVC and platforms without hash map/set support.Jisi Liu2015-03-013-43/+48
| * | Fix hash_map type parameter to add Alloc for other platforms.Jisi Liu2015-03-011-4/+6
| * | Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.Jisi Liu2015-03-012-2/+2
| * | Add missing files in vsprojects.Jisi Liu2015-03-015-8/+49
| * | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-28140-3257/+11183
* | | Merge "Add a release profile for Java mvn project, which includes source file...Jisi Liu2015-03-041-0/+58
|\ \ \ | | |/ | |/|
| * | Add a release profile for Java mvn project, which includes source file,Jisi Liu2015-03-031-0/+58
* | | Updated Ruby gem version and added note to ruby/README.md regarding version n...Chris Fallin2015-03-032-1/+25
* | | Bump the version number to 3.0.0-alpha-3-preJisi Liu2015-03-025-7/+7
| |/ |/|
* | Add .so to .gitignore.Jisi Liu2015-02-281-0/+1
* | Merge pull request #185 from mzhaom/remove-unusedJisi Liu2015-02-262-26/+1
|\ \
| * | Remove unused methods:Ming Zhao2015-01-292-26/+1
* | | Merge pull request #199 from google/wktJisi Liu2015-02-266-0/+635
|\ \ \
| * | | Add the .proto files for well-known types.Feng Xiao2015-02-096-0/+635
* | | | Merge pull request #216 from cnauroth/Parser-JavaDocJisi Liu2015-02-261-2/+2
|\ \ \ \
| * | | | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom.cnauroth2015-02-231-2/+2
* | | | | Merge pull request #222 from google/v3.0.0-alpha-2Jisi Liu2015-02-2652-2126/+6363
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | A few tweaks to CHANGES.txt.v3.0.0-alpha-2Josh Haberman2015-02-251-3/+3
| * | | | Added release notes about Python changes.Josh Haberman2015-02-251-0/+17
| * | | | Fix the order of BUILT_FILES so that pbconfig.h will be built beforeJisi Liu2015-02-251-1/+1
| * | | | Exclude pbconfg.h from dist, otherwise it breaks VS builds.Jisi Liu2015-02-251-3/+4
| * | | | Merge pull request #221 from google/python_proto3Jisi Liu2015-02-2543-2099/+6234
| |\ \ \ \
| | * | | | Fixes for Python/C++ implementation in open-source:Josh Haberman2015-02-2511-27/+490
| | * | | | Down integrate from Google internal.Jisi Liu2015-02-2539-2087/+5759
| |/ / / / |/| | | |
* | | | | Merge alpha branch 'review/v3.0.0-alpha-2'Jisi Liu2015-02-2320-633/+898
|\ \ \ \ \
| | * \ \ \ Merge "Update .gitignore so that the newly-added config.h is visible to git."...Jisi Liu2015-02-261-1/+1
| | |\ \ \ \
| | | * | | | Update .gitignore so that the newly-added config.h is visible to git.Jisi Liu2015-02-251-1/+1
| | * | | | | Include shared_ptr.h into headers to make maps proto work. It is usedJisi Liu2015-02-251-0/+1
| | * | | | | Make maps fields work on installed C++ protobufs.Jisi Liu2015-02-258-25/+92
| | |/ / / /
| | * / / / Add unix tools instructions for Mac.Jisi Liu2015-02-241-0/+16
| |/ / / /
| * | | | Propogate onChange() event when getFooBuilder() is on an oneof messageJisi Liu2015-02-232-1/+14
| * | | | Fix Java maps reflection to call onChange to populate changes to parentJisi Liu2015-02-232-89/+132
| * | | | Updated Ruby README with more details on getting started.Chris Fallin2015-02-231-2/+45
| * | | | Add JavaNano and Ruby protoc files into vs projJisi Liu2015-02-222-519/+539
| * | | | Add shutdown code for several newly introduced leaks;Jisi Liu2015-02-214-1/+41
| * | | | Include Ruby and JavaNano into dist packages.Jisi Liu2015-02-213-3/+43
| * | | | Update version number to 3.0.0-alpha-2Jisi Liu2015-02-214-6/+6
| * | | | Merge pull request #215 from cfallin/ruby-gem-versionChris Fallin2015-02-201-1/+1
| |\ \ \ \
| | * | | | Update Ruby gem version to 3.0.0.alpha.2.0.Chris Fallin2015-02-201-1/+1
| * | | | | Merge pull request #214 from cfallin/ruby-changelogChris Fallin2015-02-202-3/+27
| |\| | | |
| | * | | | Updated Ruby README.Chris Fallin2015-02-201-1/+0
| | * | | | Updated CHANGES.txt to mention Ruby extension.Chris Fallin2015-02-201-2/+27
| |/ / / /
| * / / / Add changelog for 3.0.0-alpha2 release.Jisi Liu2015-02-202-10/+52
|/ / / /