aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fixed typo (#5206)Nazarbek Altybay2018-09-301-1/+1
* Merge pull request #4816 from hrsht/hrsht/zanker-proto2Joshua Haberman2018-09-275-81/+363
|\
| * Adds support for proto2 syntax for Ruby gem.Harshit Chopra2018-09-275-81/+363
* | Merge pull request #5172 from shields/smear-commentsAdam Cozzette2018-09-241-11/+13
|\ \
| * | Update comments to discuss leap smearing in detail.Michael Shields2018-09-181-11/+13
* | | C# Proto2 feature : Field presence and default values (#4642)Sydney Acksman2018-09-2423-162/+384
|/ /
* | Merge pull request #5105 from sigurdm/invoke_plugin_via_cmdFeng Xiao2018-09-101-4/+5
|\ \
| * | On Windows invoke plugins using cmd.exeSigurd Meldgaard2018-09-031-4/+5
* | | Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-07215-4812/+6048
|\ \ \ | |/ / |/| |
| * | Down-integrate from google3.Josh Haberman2018-09-04215-4812/+6048
* | | Also make sure known fields come across as expectedBrandon Cole2018-08-301-1/+6
* | | Code fixes for the original unit test.Brandon Cole2018-08-302-1/+18
* | | Add unit test for loading unknown fields in Any messagesBrandon Cole2018-08-301-0/+18
|/ /
* | Replace repo links.Feng Xiao2018-08-2210-14/+14
* | Merge pull request #5024 from greenhouse-org/fix-windows-pathFeng Xiao2018-08-201-1/+2
|\ \
| * | Always spilt on '\' and '/'Sam Smith2018-08-131-5/+1
| * | Fix TryCreateParentDirectory on WindowsSam Smith2018-08-091-0/+5
* | | Document wrapper non-usesJoe Tsai2018-08-131-0/+5
* | | Merge pull request #5033 from xfxyjwf/upFeng Xiao2018-08-131-1/+1
|\ \ \
| * | | Fix issues discovered in up-integration.Feng Xiao2018-08-131-1/+1
* | | | Add status badge for bazel build.Feng Xiao2018-08-131-1/+1
|/ / /
* | | Down-integrate proto2 namespace fix.Feng Xiao2018-08-1336-116/+117
* | | Fix failing tests.Feng Xiao2018-08-095-5/+20
* | | Merge remote-tracking branch 'google/master' into integration_baseintegration_baseFeng Xiao2018-08-091-1/+1
|\ \ \
| * | | Fix broken test of const repeated field iteratorsBrian Silverman2018-08-081-1/+1
| |/ /
* | | Merge master branch.Feng Xiao2018-08-0838-169/+169
|\| |
| * | 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubsDhruv2018-08-0723-148/+148
| * | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-0114-32/+32
| |\ \
| | * | Updated version numbers to 3.6.1Adam Cozzette2018-07-2714-32/+32
| | * | Remove js_embed binary. (#4709)Feng Xiao2018-07-163-130/+226
| * | | Remove/replace travis references (#4953)Feng Xiao2018-07-221-1/+1
* | | | Down-integrate from google3.Feng Xiao2018-08-08318-15613/+24500
|/ / /
* | | When running unit tests, read reference files in text modeStephen Oberholtzer2018-07-197-10/+15
* | | Delete unused files. (#4942)Feng Xiao2018-07-198-2083/+0
* | | Add cpp tests under release docker image.Feng Xiao2018-07-151-6/+6
* | | fix commonjs js provide GOOGLE_CHECKYilun Chong2018-07-121-1/+1
| |/ |/|
* | OnShutdownDelete shadowing issueIvan Shynkarenka2018-07-101-1/+1
* | Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-0911-319/+132
|\|
| * Fix initialization with Visual StudioAdam Cozzette2018-07-0611-319/+132
* | Fix SFINAE in 'RepeatedPtrFieldBase::Add'M. Tong2018-07-061-2/+2
* | Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-styleJoshua Haberman2018-07-022-10/+36
|\ \
| * | fix(js_generator): check for protoPeter Marton2018-05-211-0/+1
| * | Fix strict JS generator with import in a protofilePeter Marton2018-05-081-3/+6
| * | Feat: add import-style=commonjs_strict option to the compilerPeter Marton2018-05-082-10/+32
* | | Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-07-011-3/+3
* | | Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-07-011-1/+1
* | | Fix to allow a compilation under mips big endian with gccCharles Hardin2018-06-281-1/+1
* | | Add -Og to no-warning-test (#4830)Paul Yang2018-06-2811-37/+42
* | | Removed forward declaration of MemBlock classMichal Matuszak2018-06-251-1/+0
* | | Merge pull request #4827 from acozzette/merge-3-6-xAdam Cozzette2018-06-2517-41/+52
|\ \ \