[devdocsgjs/main: 680/1867] Fix merge conflicts
- From: Andy Holmes <andyholmes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devdocsgjs/main: 680/1867] Fix merge conflicts
- Date: Fri, 19 Nov 2021 23:47:23 +0000 (UTC)
commit 8aa8ae1035b01e5f22a12cdadbf5d75da476d3eb
Merge: 85f57fe5 536003c5
Author: Jasper van Merle <jaspervmerle gmail com>
Date: Sat Jul 20 03:00:52 2019 +0200
Fix merge conflicts
.editorconfig | 3 +
CONTRIBUTING.md => .github/CONTRIBUTING.md | 19 +-
ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md | 2 +-
.github/no-response.yml | 8 +
.gitignore | 7 +-
.ruby-version | 2 +-
.travis.yml | 11 +
CODE_OF_CONDUCT.md | 2 +
COPYRIGHT | 8 +-
Dockerfile | 3 +-
Dockerfile-alpine | 3 +-
Gemfile | 12 +-
Gemfile.lock | 115 ++++++-----
PULL_REQUEST_TEMPLATE.md | 11 +
README.md | 71 ++++---
Rakefile | 4 +
assets/images/docs-2.png | Bin 19346 -> 20060 bytes
assets/images/docs-2 2x png | Bin 47420 -> 48657 bytes
assets/javascripts/app/app.coffee | 28 +--
assets/javascripts/app/appcache.coffee | 42 ----
assets/javascripts/app/config.coffee.erb | 2 +
assets/javascripts/app/serviceworker.coffee | 49 +++++
assets/javascripts/app/settings.coffee | 32 +++
assets/javascripts/app/update_checker.coffee | 6 +-
assets/javascripts/lib/license.coffee | 2 +-
assets/javascripts/lib/page.coffee | 20 +-
assets/javascripts/lib/util.coffee | 4 +
assets/javascripts/news.json | 7 +
assets/javascripts/templates/error_tmpl.coffee | 21 +-
assets/javascripts/templates/notif_tmpl.coffee | 6 +
.../javascripts/templates/pages/about_tmpl.coffee | 52 ++---
.../templates/pages/offline_tmpl.coffee | 13 +-
.../templates/pages/root_tmpl.coffee.erb | 17 +-
.../templates/pages/settings_tmpl.coffee | 4 +
assets/javascripts/tracking.js | 50 ++---
assets/javascripts/views/content/entry_page.coffee | 2 +-
.../javascripts/views/content/offline_page.coffee | 1 +
assets/javascripts/views/content/root_page.coffee | 4 -
.../javascripts/views/content/settings_page.coffee | 21 +-
assets/javascripts/views/layout/document.coffee | 12 +-
assets/javascripts/views/layout/resizer.coffee | 11 +-
assets/javascripts/views/layout/settings.coffee | 10 +-
assets/javascripts/views/search/search.coffee | 8 +
.../javascripts/views/search/search_scope.coffee | 28 ++-
assets/javascripts/views/sidebar/sidebar.coffee | 2 +-
assets/stylesheets/application-dark.css.scss | 108 ----------
assets/stylesheets/application.css.scss | 6 +-
assets/stylesheets/components/_app.scss | 10 +-
assets/stylesheets/components/_content.scss | 60 +++---
assets/stylesheets/components/_fail.scss | 6 +-
assets/stylesheets/components/_header.scss | 61 +++---
assets/stylesheets/components/_mobile.scss | 4 +-
assets/stylesheets/components/_notice.scss | 10 +-
assets/stylesheets/components/_notif.scss | 28 +--
assets/stylesheets/components/_page.scss | 8 +-
assets/stylesheets/components/_path.scss | 12 +-
assets/stylesheets/components/_prism.scss | 57 +++---
assets/stylesheets/components/_settings.scss | 24 +--
assets/stylesheets/components/_sidebar.scss | 76 ++++---
assets/stylesheets/global/_base.scss | 68 ++++---
assets/stylesheets/global/_classes.scss | 49 +++--
assets/stylesheets/global/_icons.scss | 6 +-
assets/stylesheets/global/_mixins.scss | 6 +
assets/stylesheets/global/_print.scss | 4 +-
assets/stylesheets/global/_variables-dark.scss | 122 +++++------
assets/stylesheets/global/_variables-light.scss | 76 +++++++
assets/stylesheets/global/_variables.scss | 107 +++-------
assets/stylesheets/pages/_angularjs.scss | 2 +-
assets/stylesheets/pages/_async.scss | 4 +-
assets/stylesheets/pages/_bash.scss | 2 +-
assets/stylesheets/pages/_bootstrap.scss | 2 +-
assets/stylesheets/pages/_c.scss | 4 +-
assets/stylesheets/pages/_clojure.scss | 2 +-
assets/stylesheets/pages/_d.scss | 6 +-
assets/stylesheets/pages/_dart.scss | 2 +-
assets/stylesheets/pages/_dojo.scss | 2 +-
assets/stylesheets/pages/_ember.scss | 4 +-
assets/stylesheets/pages/_erlang.scss | 2 +-
assets/stylesheets/pages/_jquery.scss | 4 +-
assets/stylesheets/pages/_love.scss | 4 +-
assets/stylesheets/pages/_mdn.scss | 31 ++-
assets/stylesheets/pages/_meteor.scss | 4 +-
assets/stylesheets/pages/_node.scss | 3 +
assets/stylesheets/pages/_npm.scss | 2 +-
assets/stylesheets/pages/_phalcon.scss | 2 +-
assets/stylesheets/pages/_php.scss | 4 +-
assets/stylesheets/pages/_postgres.scss | 2 +-
assets/stylesheets/pages/_qt.scss | 2 +-
assets/stylesheets/pages/_rdoc.scss | 15 +-
assets/stylesheets/pages/_react_native.scss | 2 +-
assets/stylesheets/pages/_redis.scss | 4 +-
assets/stylesheets/pages/_rfc.scss | 2 +-
assets/stylesheets/pages/_rust.scss | 11 +-
assets/stylesheets/pages/_simple.scss | 32 +--
assets/stylesheets/pages/_sphinx.scss | 4 +-
assets/stylesheets/pages/_sphinx_simple.scss | 2 +-
assets/stylesheets/pages/_support_tables.scss | 2 +-
assets/stylesheets/pages/_yard.scss | 2 +-
assets/stylesheets/pages/_yii.scss | 2 +-
docs/adding-docs.md | 23 +++
docs/filter-reference.md | 224 +++++++++++++++++++++
docs/maintainers.md | 102 ++++++++++
docs/scraper-reference.md | 186 +++++++++++++++++
lib/app.rb | 75 +++----
lib/docs.rb | 19 +-
lib/docs/core/doc.rb | 6 +
lib/docs/core/requester.rb | 12 +-
lib/docs/core/scrapers/file_scraper.rb | 23 ++-
lib/docs/core/url.rb | 2 +-
lib/docs/filters/codeceptjs/entries.rb | 4 +-
lib/docs/filters/cordova/clean_html.rb | 2 +-
lib/docs/filters/cpp/entries.rb | 2 +
lib/docs/filters/css/entries.rb | 27 ++-
lib/docs/filters/dom/clean_html.rb | 2 +-
lib/docs/filters/dom/entries.rb | 14 +-
lib/docs/filters/elixir/clean_html.rb | 1 +
lib/docs/filters/express/clean_html.rb | 5 +
lib/docs/filters/handlebars/clean_html.rb | 44 ++++
lib/docs/filters/handlebars/entries.rb | 19 ++
lib/docs/filters/haskell/clean_html.rb | 4 +
lib/docs/filters/haskell/entries.rb | 4 +-
lib/docs/filters/html/entries.rb | 2 +-
lib/docs/filters/javascript/clean_html.rb | 4 +-
lib/docs/filters/javascript/entries.rb | 2 +-
lib/docs/filters/mdn/clean_html.rb | 90 +++++++++
lib/docs/filters/node/clean_html.rb | 2 +-
lib/docs/filters/node/entries.rb | 2 +
lib/docs/filters/puppeteer/clean_html.rb | 24 +++
lib/docs/filters/puppeteer/entries.rb | 41 ++++
lib/docs/filters/python/clean_html.rb | 8 +-
lib/docs/filters/python/entries_v3.rb | 22 +-
lib/docs/filters/rdoc/clean_html.rb | 6 +-
lib/docs/filters/react/entries.rb | 8 +-
lib/docs/filters/redis/entries.rb | 2 +-
lib/docs/filters/rust/clean_html.rb | 38 +++-
lib/docs/filters/rust/entries.rb | 12 +-
lib/docs/filters/sqlite/entries.rb | 3 +-
lib/docs/scrapers/ansible.rb | 22 +-
lib/docs/scrapers/apache.rb | 2 +-
lib/docs/scrapers/apache_pig.rb | 2 +-
lib/docs/scrapers/async.rb | 4 +-
lib/docs/scrapers/bower.rb | 2 +-
lib/docs/scrapers/c.rb | 1 -
lib/docs/scrapers/chai.rb | 2 +-
lib/docs/scrapers/codeception.rb | 2 +-
lib/docs/scrapers/codeceptjs.rb | 4 +-
lib/docs/scrapers/cordova.rb | 7 +-
lib/docs/scrapers/cpp.rb | 1 -
lib/docs/scrapers/crystal.rb | 2 +-
lib/docs/scrapers/d.rb | 2 +-
lib/docs/scrapers/d3.rb | 2 +-
lib/docs/scrapers/dart.rb | 2 -
lib/docs/scrapers/django.rb | 6 -
lib/docs/scrapers/docker.rb | 2 +-
lib/docs/scrapers/electron.rb | 2 +-
lib/docs/scrapers/elixir.rb | 2 +-
lib/docs/scrapers/erlang.rb | 4 -
lib/docs/scrapers/eslint.rb | 2 +-
lib/docs/scrapers/express.rb | 2 +-
lib/docs/scrapers/fish.rb | 2 +-
lib/docs/scrapers/flow.rb | 4 +-
lib/docs/scrapers/git.rb | 2 +-
lib/docs/scrapers/gnu.rb | 2 +-
lib/docs/scrapers/gnu/gcc.rb | 8 -
lib/docs/scrapers/gnu/gnu_fortran.rb | 4 -
lib/docs/scrapers/go.rb | 2 +-
lib/docs/scrapers/godot.rb | 2 +-
lib/docs/scrapers/graphite.rb | 2 +-
lib/docs/scrapers/grunt.rb | 2 +-
lib/docs/scrapers/handlebars.rb | 23 +++
lib/docs/scrapers/haskell.rb | 2 +-
lib/docs/scrapers/haxe.rb | 2 +-
lib/docs/scrapers/homebrew.rb | 5 +-
lib/docs/scrapers/immutable.rb | 2 +-
lib/docs/scrapers/influxdata.rb | 2 +-
lib/docs/scrapers/jasmine.rb | 4 +-
lib/docs/scrapers/jest.rb | 2 +-
lib/docs/scrapers/julia.rb | 4 +-
lib/docs/scrapers/koa.rb | 2 +-
lib/docs/scrapers/laravel.rb | 13 ++
lib/docs/scrapers/leaflet.rb | 2 +-
lib/docs/scrapers/less.rb | 2 +-
lib/docs/scrapers/lodash.rb | 2 +-
lib/docs/scrapers/marionette.rb | 2 +-
lib/docs/scrapers/markdown.rb | 2 +-
lib/docs/scrapers/matplotlib.rb | 40 +++-
lib/docs/scrapers/mocha.rb | 4 +-
lib/docs/scrapers/mongoose.rb | 2 +-
lib/docs/scrapers/nginx.rb | 2 +-
lib/docs/scrapers/nim.rb | 6 +-
lib/docs/scrapers/node.rb | 9 +-
lib/docs/scrapers/nokogiri2.rb | 12 +-
lib/docs/scrapers/numpy.rb | 1 -
lib/docs/scrapers/openjdk.rb | 5 +-
lib/docs/scrapers/pandas.rb | 5 +
lib/docs/scrapers/perl.rb | 1 -
lib/docs/scrapers/phoenix.rb | 2 +-
lib/docs/scrapers/php.rb | 5 +-
lib/docs/scrapers/puppeteer.rb | 18 ++
lib/docs/scrapers/python.rb | 12 +-
lib/docs/scrapers/rdoc/minitest.rb | 9 +-
lib/docs/scrapers/rdoc/rails.rb | 13 +-
lib/docs/scrapers/rdoc/ruby.rb | 27 +--
lib/docs/scrapers/react.rb | 2 +-
lib/docs/scrapers/redis.rb | 2 +-
lib/docs/scrapers/redux.rb | 2 +-
lib/docs/scrapers/requirejs.rb | 2 +-
lib/docs/scrapers/rust.rb | 5 +-
lib/docs/scrapers/scikit_image.rb | 4 +-
lib/docs/scrapers/scikit_learn.rb | 4 +-
lib/docs/scrapers/sinon.rb | 21 +-
lib/docs/scrapers/sqlite.rb | 3 +-
lib/docs/scrapers/statsmodels.rb | 2 +-
lib/docs/scrapers/symfony.rb | 21 +-
lib/docs/scrapers/twig.rb | 12 +-
lib/docs/scrapers/typescript.rb | 4 +-
lib/docs/scrapers/underscore.rb | 8 +-
lib/docs/scrapers/vagrant.rb | 4 +-
lib/docs/scrapers/vulkan.rb | 2 +-
lib/docs/scrapers/yarn.rb | 4 +-
lib/docs/subscribers/requester_subscriber.rb | 13 ++
lib/tasks/docs.thor | 132 ++++++++++--
public/docs/docs.json | 1 -
public/favicon.pxm | Bin 0 -> 159961 bytes
public/favicon 2x pxm | Bin 0 -> 190253 bytes
public/icons/docs-2.pxm | Bin 1343093 -> 1411876 bytes
public/icons/docs-2 2x pxm | Bin 1456026 -> 1523904 bytes
public/icons/docs/css/CSS3.sketch/Data | Bin 0 -> 69815 bytes
.../docs/css/CSS3.sketch/QuickLook/Preview.png | Bin 0 -> 19757 bytes
.../docs/css/CSS3.sketch/QuickLook/Thumbnail.png | Bin 0 -> 82586 bytes
public/icons/docs/css/CSS3.sketch/fonts | 0
public/icons/docs/css/CSS3.sketch/version | 1 +
public/icons/docs/dom/DOM.sketch/Data | Bin 0 -> 71791 bytes
.../docs/dom/DOM.sketch/QuickLook/Preview.png | Bin 0 -> 20363 bytes
.../docs/dom/DOM.sketch/QuickLook/Thumbnail.png | Bin 0 -> 95153 bytes
public/icons/docs/dom/DOM.sketch/fonts | 0
public/icons/docs/dom/DOM.sketch/version | 1 +
.../icons/docs/dom_events/DOM_events.sketch/Data | Bin 0 -> 96701 bytes
.../DOM_events.sketch/QuickLook/Preview.png | Bin 0 -> 19452 bytes
.../DOM_events.sketch/QuickLook/Thumbnail.png | Bin 0 -> 88324 bytes
.../icons/docs/dom_events/DOM_events.sketch/fonts | 0
.../docs/dom_events/DOM_events.sketch/version | 1 +
public/icons/docs/express/16.pxm | Bin 0 -> 216121 bytes
public/icons/docs/express/16 2x pxm | Bin 0 -> 216822 bytes
public/icons/docs/handlebars/16.png | Bin 0 -> 303 bytes
public/icons/docs/handlebars/16 2x png | Bin 0 -> 534 bytes
public/icons/docs/handlebars/SOURCE | 1 +
public/icons/docs/html/HTML5.sketch/Data | Bin 0 -> 77064 bytes
.../docs/html/HTML5.sketch/QuickLook/Preview.png | Bin 0 -> 19675 bytes
.../docs/html/HTML5.sketch/QuickLook/Thumbnail.png | Bin 0 -> 84121 bytes
public/icons/docs/html/HTML5.sketch/fonts | 0
public/icons/docs/html/HTML5.sketch/version | 1 +
public/icons/docs/http/16.pxm | Bin 0 -> 105216 bytes
public/icons/docs/http/16 2x pxm | Bin 0 -> 127095 bytes
public/icons/docs/javascript/16.pxm | Bin 0 -> 24870 bytes
public/icons/docs/javascript/16 2x pxm | Bin 0 -> 218914 bytes
public/icons/docs/knockout/16 2x pxm | Bin 0 -> 229176 bytes
public/icons/docs/less/less.pxm | Bin 0 -> 85177 bytes
public/icons/docs/moment/moment.sketch/Data | Bin 0 -> 13875 bytes
.../moment/moment.sketch/QuickLook/Preview.png | Bin 0 -> 378 bytes
.../moment/moment.sketch/QuickLook/Thumbnail.png | Bin 0 -> 49727 bytes
public/icons/docs/moment/moment.sketch/fonts | 0
public/icons/docs/moment/moment.sketch/metadata | 14 ++
public/icons/docs/moment/moment.sketch/version | 1 +
public/icons/docs/nokogiri/icon.pxm | Bin 0 -> 103911 bytes
public/icons/docs/php/16 2x pxm | Bin 0 -> 172499 bytes
public/icons/docs/puppeteer/16.png | Bin 0 -> 484 bytes
public/icons/docs/puppeteer/16 2x png | Bin 0 -> 857 bytes
public/icons/docs/puppeteer/SOURCE | 1 +
public/icons/docs/rails/rails.pxm | Bin 0 -> 333016 bytes
public/icons/docs/sass/sass.pxm | Bin 0 -> 111000 bytes
public/icons/docs/support_tables/16.pxm | Bin 0 -> 101020 bytes
public/icons/docs/support_tables/16 2x pxm | Bin 0 -> 118881 bytes
public/icons/docs/xpath/XPath.sketch/Data | Bin 0 -> 22373 bytes
.../docs/xpath/XPath.sketch/QuickLook/Preview.png | Bin 0 -> 26202 bytes
.../xpath/XPath.sketch/QuickLook/Thumbnail.png | Bin 0 -> 109471 bytes
public/icons/docs/xpath/XPath.sketch/metadata | 18 ++
public/icons/docs/xpath/XPath.sketch/version | 1 +
public/images/apple-icon.pxm | Bin 0 -> 396318 bytes
public/images/fluid-icon.pxm | Bin 0 -> 522097 bytes
public/images/icon.pxm | Bin 0 -> 214911 bytes
public/images/webapp-icon-192.png | Bin 0 -> 32187 bytes
public/images/webapp-icon-512.png | Bin 0 -> 246851 bytes
public/images/webapp-icon-small.pxm | Bin 0 -> 143934 bytes
public/manifest.json | 11 +
test/app_test.rb | 126 ++++--------
test/lib/docs/core/scrapers/file_scraper_test.rb | 138 ++++++++-----
views/app.erb | 14 +-
views/index.erb | 7 +-
views/manifest.erb | 14 --
views/other.erb | 5 +-
views/service-worker.js.erb | 49 +++++
views/unsupported.erb | 17 +-
293 files changed, 2532 insertions(+), 1365 deletions(-)
---
diff --cc assets/javascripts/templates/pages/settings_tmpl.coffee
index d4108749,e03a7744..94afe3df
--- a/assets/javascripts/templates/pages/settings_tmpl.coffee
+++ b/assets/javascripts/templates/pages/settings_tmpl.coffee
@@@ -15,10 -15,10 +15,14 @@@ app.templates.settingsPage = (settings
<input type="checkbox" form="settings" name="layout" value="_sidebar-hidden"#{if
settings['_sidebar-hidden'] then ' checked' else ''}>Automatically hide and show the sidebar
<small>Tip: drag the edge of the sidebar to resize it.</small>
</label>
+ <label class="_settings-label">
+ <input type="checkbox" form="settings" name="autoInstall" value="_auto-install"#{if
settings.autoInstall then ' checked' else ''}>Automatically download documentation for offline use
+ <small>Only enable this when bandwidth isn't a concern to you.</small>
+ </label>
+ <label class="_settings-label">
+ <input type="checkbox" form="settings" name="analyticsConsent"#{if settings.analyticsConsent then '
checked' else ''}>Enable tracking cookies
+ <small>With this checked, we enable Google Analytics and Gauges to collect anonymous traffic
information.</small>
+ </label>
</div>
</div>
diff --cc assets/javascripts/views/content/settings_page.coffee
index c0fc59d1,21de111a..9ca606c6
--- a/assets/javascripts/views/content/settings_page.coffee
+++ b/assets/javascripts/views/content/settings_page.coffee
@@@ -17,8 -14,8 +14,9 @@@ class app.views.SettingsPage extends ap
settings.dark = app.settings.get('dark')
settings.smoothScroll = !app.settings.get('fastScroll')
settings.arrowScroll = app.settings.get('arrowScroll')
+ settings.autoInstall = app.settings.get('autoInstall')
- settings[layout] = app.settings.hasLayout(layout) for layout in LAYOUTS
+ settings.analyticsConsent = app.settings.get('analyticsConsent')
+ settings[layout] = app.settings.hasLayout(layout) for layout in app.settings.LAYOUTS
settings
getTitle: ->
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
