You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2017/10/27 07:10:21 UTC
[couchdb] 01/01: Merge branch '1.x.x' into
merge-kxepal-2752-validate-host
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch merge-kxepal-2752-validate-host
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 5ebadd8f67ad5ebc6bcd5d4e9435865f5327144c
Merge: e27edfc a12fe97
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Oct 27 09:10:19 2017 +0200
Merge branch '1.x.x' into merge-kxepal-2752-validate-host
.gitignore | 28 -
.travis.yml | 3 -
LICENSE | 705 +-
NOTICE | 24 +-
license.skip | 38 -
share/Makefile.am | 24 -
share/doc/build/Makefile.am | 9 -
share/doc/src/contents.rst | 1 -
share/doc/src/fauxton/addons.rst | 199 -
share/doc/src/fauxton/index.rst | 23 -
share/doc/src/fauxton/install.rst | 109 -
share/www/fauxton/css/index.css | 37 -
share/www/fauxton/img/FontAwesome.otf | Bin 61896 -> 0 bytes
share/www/fauxton/img/couchdb-site.png | Bin 4946 -> 0 bytes
share/www/fauxton/img/couchdblogo.png | Bin 2738 -> 0 bytes
share/www/fauxton/img/fontawesome-webfont.eot | Bin 37405 -> 0 bytes
share/www/fauxton/img/fontawesome-webfont.svg | 399 -
share/www/fauxton/img/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes
share/www/fauxton/img/fontawesome-webfont.woff | Bin 43572 -> 0 bytes
share/www/fauxton/img/fontcustom_fauxton.eot | Bin 7364 -> 0 bytes
share/www/fauxton/img/fontcustom_fauxton.svg | 200 -
share/www/fauxton/img/fontcustom_fauxton.ttf | Bin 9636 -> 0 bytes
share/www/fauxton/img/fontcustom_fauxton.woff | Bin 4816 -> 0 bytes
.../www/fauxton/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
share/www/fauxton/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes
share/www/fauxton/img/linen.png | Bin 87134 -> 0 bytes
share/www/fauxton/img/loader.gif | Bin 5193 -> 0 bytes
share/www/fauxton/img/minilogo.png | Bin 2927 -> 0 bytes
share/www/fauxton/index.html | 45 -
share/www/fauxton/js/ace/mode-javascript.js | 886 -
share/www/fauxton/js/ace/mode-json.js | 578 -
share/www/fauxton/js/ace/theme-crimson_editor.js | 148 -
share/www/fauxton/js/ace/worker-javascript.js | 10088 -----------
share/www/fauxton/js/ace/worker-json.js | 2271 ---
share/www/fauxton/js/require.js | 35 -
src/Makefile.am | 317 -
src/fauxton/CONTRIBUTING.md | 22 -
src/fauxton/Gruntfile.js | 451 -
src/fauxton/TODO.md | 26 -
.../activetasks/assets/less/activetasks.less | 16 -
src/fauxton/app/addons/activetasks/base.js | 26 -
src/fauxton/app/addons/activetasks/resources.js | 118 -
src/fauxton/app/addons/activetasks/routes.js | 58 -
.../app/addons/activetasks/templates/detail.html | 21 -
.../app/addons/activetasks/templates/table.html | 52 -
.../addons/activetasks/templates/tabledetail.html | 32 -
.../app/addons/activetasks/templates/tabs.html | 46 -
.../app/addons/activetasks/tests/viewsSpec.js | 136 -
src/fauxton/app/addons/activetasks/views.js | 197 -
src/fauxton/app/addons/auth/assets/less/auth.less | 15 -
src/fauxton/app/addons/auth/base.js | 73 -
src/fauxton/app/addons/auth/resources.js | 380 -
src/fauxton/app/addons/auth/routes.js | 102 -
.../app/addons/auth/templates/change_password.html | 26 -
.../app/addons/auth/templates/create_admin.html | 36 -
src/fauxton/app/addons/auth/templates/login.html | 26 -
.../app/addons/auth/templates/nav_dropdown.html | 26 -
.../app/addons/auth/templates/nav_link_title.html | 32 -
.../app/addons/auth/templates/noAccess.html | 22 -
src/fauxton/app/addons/auth/test/baseSpec.js | 34 -
.../addons/compaction/assets/less/compaction.less | 19 -
src/fauxton/app/addons/compaction/base.js | 31 -
src/fauxton/app/addons/compaction/resources.js | 48 -
src/fauxton/app/addons/compaction/routes.js | 65 -
.../addons/compaction/templates/compact_view.html | 14 -
.../app/addons/compaction/templates/layout.html | 28 -
src/fauxton/app/addons/compaction/views.js | 139 -
.../app/addons/config/assets/less/config.less | 47 -
src/fauxton/app/addons/config/base.js | 30 -
src/fauxton/app/addons/config/resources.js | 83 -
src/fauxton/app/addons/config/routes.js | 59 -
.../app/addons/config/templates/dashboard.html | 31 -
src/fauxton/app/addons/config/templates/item.html | 40 -
src/fauxton/app/addons/config/templates/modal.html | 33 -
.../app/addons/config/tests/resourcesSpec.js | 97 -
src/fauxton/app/addons/config/views.js | 248 -
src/fauxton/app/addons/contribute/base.js | 33 -
.../addons/databases/assets/less/databases.less | 34 -
src/fauxton/app/addons/databases/base.js | 37 -
src/fauxton/app/addons/databases/resources.js | 207 -
src/fauxton/app/addons/databases/routes.js | 69 -
.../app/addons/databases/templates/item.html | 30 -
.../app/addons/databases/templates/list.html | 37 -
.../addons/databases/templates/newdatabase.html | 16 -
.../app/addons/databases/templates/sidebar.html | 31 -
.../app/addons/databases/tests/resourcesSpec.js | 39 -
src/fauxton/app/addons/databases/views.js | 259 -
.../addons/documents/assets/less/documents.less | 134 -
src/fauxton/app/addons/documents/base.js | 24 -
src/fauxton/app/addons/documents/resources.js | 588 -
src/fauxton/app/addons/documents/routes.js | 505 -
.../documents/templates/advanced_options.html | 132 -
.../addons/documents/templates/all_docs_item.html | 26 -
.../documents/templates/all_docs_layout.html | 21 -
.../addons/documents/templates/all_docs_list.html | 44 -
.../documents/templates/all_docs_number.html | 35 -
.../app/addons/documents/templates/changes.html | 68 -
.../app/addons/documents/templates/ddoc_info.html | 28 -
.../documents/templates/delete_database_modal.html | 39 -
.../documents/templates/design_doc_selector.html | 35 -
.../app/addons/documents/templates/doc.html | 55 -
.../documents/templates/doc_field_editor.html | 74 -
.../documents/templates/doc_field_editor_tabs.html | 19 -
.../documents/templates/duplicate_doc_modal.html | 36 -
.../app/addons/documents/templates/edit_tools.html | 44 -
.../documents/templates/index_menu_item.html | 17 -
.../documents/templates/index_row_docular.html | 29 -
.../documents/templates/index_row_tabular.html | 25 -
.../app/addons/documents/templates/jumpdoc.html | 20 -
.../app/addons/documents/templates/search.html | 15 -
.../app/addons/documents/templates/sidebar.html | 68 -
.../addons/documents/templates/upload_modal.html | 42 -
.../addons/documents/templates/view_editor.html | 91 -
.../app/addons/documents/tests/resourcesSpec.js | 57 -
src/fauxton/app/addons/documents/views.js | 1989 ---
src/fauxton/app/addons/exampleAuth/base.js | 59 -
.../app/addons/exampleAuth/templates/noAccess.html | 19 -
src/fauxton/app/addons/fauxton/base.js | 345 -
src/fauxton/app/addons/fauxton/components.js | 554 -
src/fauxton/app/addons/fauxton/resizeColumns.js | 88 -
.../app/addons/fauxton/templates/api_bar.html | 30 -
.../app/addons/fauxton/templates/breadcrumbs.html | 24 -
.../app/addons/fauxton/templates/footer.html | 15 -
.../addons/fauxton/templates/index_pagination.html | 24 -
.../app/addons/fauxton/templates/nav_bar.html | 75 -
.../app/addons/fauxton/templates/notification.html | 18 -
.../app/addons/fauxton/templates/pagination.html | 31 -
src/fauxton/app/addons/fauxton/tests/baseSpec.js | 79 -
src/fauxton/app/addons/fauxton/tests/navbarSpec.js | 107 -
.../app/addons/fauxton/tests/paginateSpec.js | 87 -
src/fauxton/app/addons/logs/assets/less/logs.less | 24 -
src/fauxton/app/addons/logs/base.js | 28 -
src/fauxton/app/addons/logs/resources.js | 224 -
src/fauxton/app/addons/logs/routes.js | 58 -
.../app/addons/logs/templates/dashboard.html | 46 -
.../app/addons/logs/templates/filterItem.html | 16 -
src/fauxton/app/addons/logs/templates/sidebar.html | 27 -
src/fauxton/app/addons/logs/tests/baseSpec.js | 38 -
src/fauxton/app/addons/logs/tests/resourcesSpec.js | 38 -
.../permissions/assets/less/permissions.less | 27 -
src/fauxton/app/addons/permissions/base.js | 25 -
src/fauxton/app/addons/permissions/resources.js | 70 -
src/fauxton/app/addons/permissions/routes.js | 63 -
.../app/addons/permissions/templates/item.html | 17 -
.../addons/permissions/templates/permissions.html | 15 -
.../app/addons/permissions/templates/section.html | 46 -
.../app/addons/permissions/tests/resourceSpec.js | 51 -
.../app/addons/permissions/tests/viewsSpec.js | 159 -
src/fauxton/app/addons/permissions/views.js | 200 -
src/fauxton/app/addons/plugins/base.js | 24 -
src/fauxton/app/addons/plugins/resources.js | 26 -
src/fauxton/app/addons/plugins/routes.js | 47 -
.../app/addons/plugins/templates/plugins.html | 102 -
src/fauxton/app/addons/pouchdb/base.js | 58 -
src/fauxton/app/addons/pouchdb/pouch.collate.js | 115 -
.../app/addons/pouchdb/pouchdb.mapreduce.js | 324 -
.../replication/assets/less/replication.less | 188 -
src/fauxton/app/addons/replication/base.js | 24 -
src/fauxton/app/addons/replication/resources.js | 69 -
src/fauxton/app/addons/replication/route.js | 50 -
.../app/addons/replication/templates/form.html | 74 -
.../app/addons/replication/templates/progress.html | 22 -
.../addons/replication/tests/replicationSpec.js | 28 -
src/fauxton/app/addons/replication/views.js | 297 -
.../app/addons/stats/assets/less/stats.less | 20 -
src/fauxton/app/addons/stats/base.js | 26 -
src/fauxton/app/addons/stats/resources.js | 38 -
src/fauxton/app/addons/stats/routes.js | 63 -
.../app/addons/stats/templates/by_method.html | 16 -
.../app/addons/stats/templates/pie_table.html | 54 -
src/fauxton/app/addons/stats/templates/stats.html | 16 -
.../app/addons/stats/templates/statselect.html | 22 -
src/fauxton/app/addons/stats/views.js | 171 -
src/fauxton/app/addons/styletests/base.js | 33 -
src/fauxton/app/addons/styletests/resources.js | 22 -
src/fauxton/app/addons/styletests/routes.js | 40 -
.../app/addons/styletests/templates/theme.html | 497 -
src/fauxton/app/addons/styletests/views.js | 29 -
.../verifyinstall/assets/less/verifyinstall.less | 16 -
src/fauxton/app/addons/verifyinstall/base.js | 31 -
src/fauxton/app/addons/verifyinstall/resources.js | 176 -
src/fauxton/app/addons/verifyinstall/routes.js | 37 -
.../app/addons/verifyinstall/templates/main.html | 50 -
src/fauxton/app/addons/verifyinstall/views.js | 127 -
src/fauxton/app/app.js | 111 -
src/fauxton/app/config.js | 64 -
src/fauxton/app/core/api.js | 53 -
src/fauxton/app/core/auth.js | 65 -
src/fauxton/app/core/base.js | 145 -
src/fauxton/app/core/couchdbSession.js | 60 -
src/fauxton/app/core/layout.js | 91 -
src/fauxton/app/core/routeObject.js | 297 -
src/fauxton/app/core/router.js | 113 -
src/fauxton/app/core/tests/layoutSpec.js | 92 -
src/fauxton/app/core/tests/routeObjectSpec.js | 96 -
src/fauxton/app/core/utils.js | 94 -
src/fauxton/app/helpers.js | 84 -
src/fauxton/app/initialize.js.underscore | 33 -
src/fauxton/app/load_addons.js.underscore | 27 -
src/fauxton/app/main.js | 47 -
src/fauxton/app/templates/layouts/one_pane.html | 28 -
src/fauxton/app/templates/layouts/two_pane.html | 30 -
.../app/templates/layouts/with_sidebar.html | 27 -
src/fauxton/app/templates/layouts/with_tabs.html | 28 -
.../app/templates/layouts/with_tabs_sidebar.html | 41 -
src/fauxton/assets/css/nv.d3.css | 769 -
src/fauxton/assets/img/FontAwesome.otf | Bin 61896 -> 0 bytes
src/fauxton/assets/img/couchdb-site.png | Bin 4946 -> 0 bytes
src/fauxton/assets/img/couchdblogo.png | Bin 2738 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.eot | Bin 37405 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.svg | 399 -
src/fauxton/assets/img/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.woff | Bin 43572 -> 0 bytes
src/fauxton/assets/img/fontcustom_fauxton.eot | Bin 7364 -> 0 bytes
src/fauxton/assets/img/fontcustom_fauxton.svg | 200 -
src/fauxton/assets/img/fontcustom_fauxton.ttf | Bin 9636 -> 0 bytes
src/fauxton/assets/img/fontcustom_fauxton.woff | Bin 4816 -> 0 bytes
.../assets/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
src/fauxton/assets/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes
src/fauxton/assets/img/linen.png | Bin 87134 -> 0 bytes
src/fauxton/assets/img/loader.gif | Bin 5193 -> 0 bytes
src/fauxton/assets/img/minilogo.png | Bin 2927 -> 0 bytes
src/fauxton/assets/index.underscore | 47 -
src/fauxton/assets/js/libs/ace/ace.js | 16541 -------------------
src/fauxton/assets/js/libs/ace/ext-chromevox.js | 537 -
.../js/libs/ace/ext-elastic_tabstops_lite.js | 301 -
src/fauxton/assets/js/libs/ace/ext-emmet.js | 1096 --
.../assets/js/libs/ace/ext-keybinding_menu.js | 207 -
.../assets/js/libs/ace/ext-language_tools.js | 1615 --
src/fauxton/assets/js/libs/ace/ext-modelist.js | 166 -
src/fauxton/assets/js/libs/ace/ext-old_ie.js | 499 -
src/fauxton/assets/js/libs/ace/ext-options.js | 252 -
src/fauxton/assets/js/libs/ace/ext-searchbox.js | 420 -
.../assets/js/libs/ace/ext-settings_menu.js | 634 -
src/fauxton/assets/js/libs/ace/ext-spellcheck.js | 68 -
src/fauxton/assets/js/libs/ace/ext-split.js | 271 -
.../assets/js/libs/ace/ext-static_highlight.js | 165 -
src/fauxton/assets/js/libs/ace/ext-statusbar.js | 47 -
src/fauxton/assets/js/libs/ace/ext-textarea.js | 478 -
src/fauxton/assets/js/libs/ace/ext-themelist.js | 90 -
src/fauxton/assets/js/libs/ace/ext-whitespace.js | 206 -
src/fauxton/assets/js/libs/ace/mode-javascript.js | 886 -
src/fauxton/assets/js/libs/ace/mode-json.js | 578 -
src/fauxton/assets/js/libs/ace/mode-jsoniq.js | 2714 ---
.../assets/js/libs/ace/snippets/javascript.js | 202 -
src/fauxton/assets/js/libs/ace/snippets/json.js | 7 -
src/fauxton/assets/js/libs/ace/snippets/jsoniq.js | 7 -
.../assets/js/libs/ace/theme-crimson_editor.js | 148 -
.../assets/js/libs/ace/worker-javascript.js | 10088 -----------
src/fauxton/assets/js/libs/ace/worker-json.js | 2271 ---
src/fauxton/assets/js/libs/almond.js | 314 -
src/fauxton/assets/js/libs/backbone.js | 1583 --
src/fauxton/assets/js/libs/bootstrap.js | 2291 ---
src/fauxton/assets/js/libs/d3.js | 9275 -----------
src/fauxton/assets/js/libs/jquery.js | 10337 ------------
src/fauxton/assets/js/libs/lodash.js | 4493 -----
src/fauxton/assets/js/libs/nv.d3.js | 14374 ----------------
src/fauxton/assets/js/libs/require.js | 2045 ---
src/fauxton/assets/js/libs/spin.min.js | 1 -
.../assets/js/plugins/backbone.layoutmanager.js | 976 --
src/fauxton/assets/js/plugins/beautify.js | 1630 --
.../assets/js/plugins/cloudant.pagingcollection.js | 224 -
src/fauxton/assets/js/plugins/jquery.form.js | 1190 --
src/fauxton/assets/js/plugins/prettify.js | 28 -
.../js/plugins/zeroclipboard/ZeroClipboard.js | 1031 --
.../js/plugins/zeroclipboard/ZeroClipboard.swf | Bin 2157 -> 0 bytes
src/fauxton/assets/less/bootstrap/accordion.less | 34 -
src/fauxton/assets/less/bootstrap/alerts.less | 79 -
src/fauxton/assets/less/bootstrap/bootstrap.less | 62 -
src/fauxton/assets/less/bootstrap/breadcrumbs.less | 24 -
.../assets/less/bootstrap/button-groups.less | 229 -
src/fauxton/assets/less/bootstrap/buttons.less | 228 -
src/fauxton/assets/less/bootstrap/carousel.less | 158 -
src/fauxton/assets/less/bootstrap/close.less | 32 -
src/fauxton/assets/less/bootstrap/code.less | 61 -
.../less/bootstrap/component-animations.less | 22 -
src/fauxton/assets/less/bootstrap/dropdowns.less | 248 -
.../less/bootstrap/font-awesome/bootstrap.less | 84 -
.../assets/less/bootstrap/font-awesome/core.less | 129 -
.../assets/less/bootstrap/font-awesome/extras.less | 93 -
.../bootstrap/font-awesome/font-awesome-ie7.less | 1953 ---
.../less/bootstrap/font-awesome/font-awesome.less | 33 -
.../assets/less/bootstrap/font-awesome/icons.less | 381 -
.../assets/less/bootstrap/font-awesome/mixins.less | 48 -
.../assets/less/bootstrap/font-awesome/path.less | 14 -
.../less/bootstrap/font-awesome/variables.less | 735 -
src/fauxton/assets/less/bootstrap/forms.less | 690 -
src/fauxton/assets/less/bootstrap/grid.less | 21 -
src/fauxton/assets/less/bootstrap/hero-unit.less | 25 -
.../assets/less/bootstrap/labels-badges.less | 84 -
src/fauxton/assets/less/bootstrap/layouts.less | 16 -
src/fauxton/assets/less/bootstrap/media.less | 55 -
src/fauxton/assets/less/bootstrap/mixins.less | 716 -
src/fauxton/assets/less/bootstrap/modals.less | 95 -
src/fauxton/assets/less/bootstrap/navbar.less | 497 -
src/fauxton/assets/less/bootstrap/navs.less | 409 -
src/fauxton/assets/less/bootstrap/pager.less | 43 -
src/fauxton/assets/less/bootstrap/pagination.less | 123 -
src/fauxton/assets/less/bootstrap/popovers.less | 133 -
.../assets/less/bootstrap/progress-bars.less | 122 -
src/fauxton/assets/less/bootstrap/reset.less | 216 -
.../less/bootstrap/responsive-1200px-min.less | 28 -
.../less/bootstrap/responsive-767px-max.less | 193 -
.../less/bootstrap/responsive-768px-979px.less | 19 -
.../assets/less/bootstrap/responsive-navbar.less | 189 -
.../less/bootstrap/responsive-utilities.less | 59 -
src/fauxton/assets/less/bootstrap/responsive.less | 48 -
src/fauxton/assets/less/bootstrap/scaffolding.less | 53 -
src/fauxton/assets/less/bootstrap/sprites.less | 197 -
src/fauxton/assets/less/bootstrap/tables.less | 244 -
.../assets/less/bootstrap/tests/buttons.html | 139 -
.../assets/less/bootstrap/tests/css-tests.css | 150 -
src/fauxton/assets/less/bootstrap/thumbnails.less | 53 -
src/fauxton/assets/less/bootstrap/tooltip.less | 70 -
src/fauxton/assets/less/bootstrap/type.less | 247 -
src/fauxton/assets/less/bootstrap/utilities.less | 30 -
src/fauxton/assets/less/bootstrap/variables.less | 301 -
src/fauxton/assets/less/bootstrap/wells.less | 29 -
src/fauxton/assets/less/couchdb.less | 72 -
src/fauxton/assets/less/fauxton.less | 871 -
src/fauxton/assets/less/icons.less | 111 -
src/fauxton/assets/less/prettyprint.less | 35 -
src/fauxton/assets/less/variables.less | 84 -
src/fauxton/bin/grunt | 18 -
src/fauxton/couchapp.js | 39 -
src/fauxton/extensions.md | 17 -
src/fauxton/favicon.ico | Bin 1150 -> 0 bytes
src/fauxton/index.html | 53 -
src/fauxton/package.json | 48 -
src/fauxton/readme.md | 83 -
src/fauxton/settings.json.default | 77 -
src/fauxton/settings.json.dev | 62 -
src/fauxton/settings.json.sample_external | 10 -
src/fauxton/tasks/addon/rename.json | 5 -
src/fauxton/tasks/addon/root/base.js.underscore | 21 -
.../tasks/addon/root/resources.js.underscore | 21 -
src/fauxton/tasks/addon/root/routes.js.underscore | 42 -
src/fauxton/tasks/addon/template.js | 70 -
src/fauxton/tasks/couchserver.js | 123 -
src/fauxton/tasks/fauxton.js | 136 -
src/fauxton/tasks/helper.js | 45 -
src/fauxton/test/mocha/chai.js | 4696 ------
src/fauxton/test/mocha/mocha.css | 251 -
src/fauxton/test/mocha/mocha.js | 5428 ------
src/fauxton/test/mocha/sinon-chai.js | 109 -
src/fauxton/test/mocha/sinon.js | 4290 -----
src/fauxton/test/mocha/testUtils.js | 51 -
src/fauxton/test/runner.html | 33 -
src/fauxton/test/test.config.underscore | 20 -
src/fauxton/writing_addons.md | 173 -
350 files changed, 14 insertions(+), 150211 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.