Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #11656 from muxi/move-nanopb-to-cocoapods | Muxi Yan | 2017-07-05 |
|\ | | | | | Use Cocoapods to manage nanopb | ||
* \ | Merge pull request #11627 from murgatroid99/node_consistent_runtime_version | Michael Lumish | 2017-07-05 |
|\ \ | | | | | | | Make various scripts use the same version of Node | ||
* \ \ | Merge pull request #11582 from jtattermusch/cmake_various_fixes | Jan Tattermusch | 2017-07-03 |
|\ \ \ | | | | | | | | | cmake: various fixes | ||
* \ \ \ | Merge pull request #11637 from kskalski/protobuf_cmake2 | Jan Tattermusch | 2017-07-03 |
|\ \ \ \ | | | | | | | | | | | Make CMake find_package work for preinstalled libprotobuf on Raspbian. | ||
* | | | | | Run Android interops on Firebase | Eric Gribkoff | 2017-06-30 |
| | | | | | |||
| | | | * | Polish gRPC-Core.podspec | Muxi Yan | 2017-06-29 |
| | | | | | |||
| | | | * | Use Cocoapods to manage nanopb | Muxi Yan | 2017-06-29 |
| |_|_|/ |/| | | | |||
| * | | | Make CMake find_package work for preinstalled libprotobuf on Raspbian. | Kamil Skalski | 2017-06-28 |
|/ / / | |||
| | * | Fix how npm is upgraded, add npm update line for electron | murgatroid99 | 2017-06-27 |
| | | | |||
| | * | Make various scripts use the same version of Node | murgatroid99 | 2017-06-27 |
| |/ |/| | |||
| * | dont reuse protobuf cmake install dirs | Jan Tattermusch | 2017-06-23 |
| | | |||
| * | make some headers public | Jan Tattermusch | 2017-06-23 |
| | | |||
| * | build protobuf without zlib | Jan Tattermusch | 2017-06-23 |
| | | |||
| * | workaround zlib cmake issue | Jan Tattermusch | 2017-06-23 |
|/ | |||
* | Merge pull request #11412 from kpayson64/upgrade_boringssl | kpayson64 | 2017-06-20 |
|\ | | | | | Upgrade boringssl | ||
* \ | Merge pull request #11516 from murgatroid99/upmerge_1.4.x | Michael Lumish | 2017-06-19 |
|\ \ | | | | | | | Upmerge 1.4.x into Master | ||
* \ \ | Merge pull request #11140 from randomguy3/cmake-install | Jan Tattermusch | 2017-06-19 |
|\ \ \ | | | | | | | | | Fix CMake installation issues | ||
* \ \ \ | Merge pull request #11469 from jtattermusch/cmake_explicit_protoc | Jan Tattermusch | 2017-06-19 |
|\ \ \ \ | | | | | | | | | | | Explicitly use built protoc for CMake build | ||
| | | * \ | Merge remote-tracking branch 'upstream/v1.4.x' into upmerge_1.4.x | murgatroid99 | 2017-06-15 |
| | | |\ \ | |||
| | | | | * | Update boringssl | Ken Payson | 2017-06-15 |
| | | | |/ | | | |/| | |||
* | | / | | cmake: add zlib and cares dep | Jan Tattermusch | 2017-06-13 |
| |_|/ / |/| | | | |||
| * | | | explicitly use built protoc for CMake build | Jan Tattermusch | 2017-06-13 |
|/ / / | |||
* | | | license fixes | Jan Tattermusch | 2017-06-08 |
| | | | |||
* | | | fix remaining license notices | Jan Tattermusch | 2017-06-08 |
| | | | |||
* | | | auto-fix most of licenses | Jan Tattermusch | 2017-06-08 |
| | | | |||
* | | | Merge pull request #11349 from yongni/matrix | yongni | 2017-06-07 |
|\ \ \ | | | | | | | | | Created a Java Oracle8 Dockerfile directory and moved build_inter… | ||
* \ \ \ | Merge pull request #11396 from matt-kwong/fix_csharp | Jan Tattermusch | 2017-06-06 |
|\ \ \ \ | | | | | | | | | | | Update Mono to Jessie for C# Dockerfiles | ||
| | | | * | Merge pull request #11264 from smulikHakipod/master | Michael Lumish | 2017-06-05 |
| | | | |\ | | | | | | | | | | | | | Compilation without ALPN support does not work | ||
* | | | | | | Check the version of system c-ares | Yuchen Zeng | 2017-06-02 |
| | | | | | | |||
| * | | | | | Update Mono to Jessie for C# Dockerfiles | Matt Kwong | 2017-06-02 |
|/ / / / / | |||
| | | * | | PHP: windows config.w32 fix | Stanley Cheung | 2017-06-01 |
| | | | | | |||
| * | | | | Create Dockerfile.include for java to be shared for java and java_oracle8. | Yong Ni | 2017-05-31 |
| | | | | | |||
| * | | | | Created a Java Oracle8 Dockerfile directory and moved all build_interop.sh ↵ | Yong Ni | 2017-05-31 |
|/ / / / | | | | | | | | | | | | | to under template/. Added java_oracle8 to the client matrix. | ||
| | * / | Add artifact builds for Node 8 | murgatroid99 | 2017-05-30 |
| |/ / |/| | | |||
* | | | Merge pull request #11309 from murgatroid99/master_1.3.x_upmerge | Michael Lumish | 2017-05-30 |
|\ \ \ | | | | | | | | | Master 1.3.x upmerge | ||
| * \ \ | Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmerge | murgatroid99 | 2017-05-25 |
| |\ \ \ | |||
* | | | | | improve CONTRIBUTING.md and add rules for PRs | Jan Tattermusch | 2017-05-25 |
|/ / / / | |||
| * | | | remove now unnecessary extra args | Jan Tattermusch | 2017-05-23 |
| | | | | |||
| | | * | update template | Yaron Shani | 2017-05-23 |
| | | | | |||
* | | | | PHP: Fixed bug in protoc plugin escaping comments | Stanley Cheung | 2017-05-22 |
| | | | | |||
* | | | | PHP: windows config.w32 file | Stanley Cheung | 2017-05-19 |
| |_|/ |/| | | |||
* | | | Merge matrix feature branch into master. | Yong Ni | 2017-05-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features included in this merge: - Added script to build and upload docker image for matrix test. - Added script to create test cases and created go__master testcases based on it. - Created dictionary for runtimes and gRPC releases for supported languages. - Added go 1.7 and 1.8 Dockerfile/templates. See tools/interop_matrix/README.md for details. | ||
* | | | Merge pull request #11198 from stanley-cheung/upmerge-v1_3_2-to-master | Stanley Cheung | 2017-05-18 |
|\ \ \ | | | | | | | | | Upmerge v1.3.x branch to master | ||
* \ \ \ | Merge pull request #11174 from stanley-cheung/php-fix-c-ext-version | Stanley Cheung | 2017-05-17 |
|\ \ \ \ | | | | | | | | | | | PHP: fix pecl extension version | ||
| | * | | | Upmerge from v1.3.x branch to master | Stanley Cheung | 2017-05-17 |
| |/| | | |/| |/ / | |||
* | | | | PHP: fix pecl extension after cc files are added | Stanley Cheung | 2017-05-17 |
| | | | | |||
| * | | | PHP: fix pecl extension reported version | Stanley Cheung | 2017-05-17 |
|/ / / | |||
* | | | PHP: stop requiring google/protobuf PHP implementation | Stanley Cheung | 2017-05-16 |
| | | | |||
| | * | Set gRPC_INSTALL to ON by default for MSVC and OFF if a subproject | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | Now that gRPC_INSTALL is forced off if using bundled third-party libraries, it no longer makes sense to set it OFF by default for MSVC. However, we do want to set it OFF by default if gRPC is being built as a subproject of another project. | ||
| | * | CMake: Disable installation when using bundled third party libraries | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | | | | If gRPC is not getting its (link-time) dependencies from the system, it should not be attempting installation. |