[devdocsgjs/main: 737/1867] Merge branch 'master' into typo-fixes




commit 971d2c67dd20dd1177b2404c74cde63c65b00c57
Merge: f3898a07 22ae7978
Author: Jasper van Merle <jaspervmerle gmail com>
Date:   Tue Aug 6 01:06:40 2019 +0200

    Merge branch 'master' into typo-fixes

 Dockerfile                                         |   2 +-
 Dockerfile-alpine                                  |   2 +-
 assets/javascripts/app/app.coffee                  |   2 +-
 assets/javascripts/app/config.coffee.erb           |   1 +
 assets/javascripts/app/settings.coffee             |   2 +-
 .../{cookie_store.coffee => cookies_store.coffee}  |   6 +-
 assets/javascripts/lib/favicon.coffee              |  64 ++++++++
 assets/javascripts/views/content/content.coffee    |   3 +
 assets/javascripts/views/content/entry_page.coffee |   1 +
 assets/javascripts/views/content/type_page.coffee  |   1 +
 lib/docs/filters/elixir/clean_html.rb              |   5 +
 lib/docs/filters/homebrew/clean_html.rb            |   5 +
 lib/docs/filters/homebrew/entries.rb               |   4 +-
 lib/docs/filters/kotlin/clean_html.rb              |   7 +
 lib/docs/filters/kotlin/entries.rb                 |   4 +-
 lib/docs/filters/pandas/entries.rb                 |   8 +-
 lib/docs/filters/qt/clean_html.rb                  |   1 +
 lib/docs/filters/qt/entries.rb                     |   1 +
 lib/docs/scrapers/clojure.rb                       |  13 +-
 lib/docs/scrapers/django.rb                        |  11 +-
 lib/docs/scrapers/docker.rb                        | 173 +++++++++++++++++----
 lib/docs/scrapers/elixir.rb                        |  30 +++-
 lib/docs/scrapers/homebrew.rb                      |   2 +-
 lib/docs/scrapers/kotlin.rb                        |  14 +-
 lib/docs/scrapers/padrino.rb                       |   6 +-
 lib/docs/scrapers/pandas.rb                        |  25 ++-
 lib/docs/scrapers/qt.rb                            |  14 +-
 lib/tasks/sprites.thor                             |   2 +
 views/service-worker.js.erb                        |  26 +++-
 29 files changed, 366 insertions(+), 69 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]