couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject [48/50] couchdb commit: updated refs/heads/1.6.x to eeb31cb
Date Wed, 13 Aug 2014 23:26:36 GMT
Merge branch 'refs/heads/merge/master@ade9dae' into 1.6.x

* refs/heads/merge/master: (97 commits)
  really fix typo
  Documentation formatting typo
  local.ini must be comments only
  hash admin passwords on startup when list
  Fauxton: fix build
  Fauxton: Upgrade node-http-proxy
  Fauxton: Remove settings.json.dev
  Fauxton: Add view filter
  Fix missing stale query option
  Docs: fix typo in Accept header value
  Fauxton: updated dev dependancies
  add ZeroClipboard to LICENSE file
  Fauxton: Fix clone cancel button
  Fauxton: Create fx roles
  fix attachment view to bypass
  add sinon.js
  Fauxton: Content Security Policy optional for dev
  Fauxton: Fix font awesome url to work for release
  Tentatively update version on master
  Fauxton: Fix show me api link
  ...

Conflicts:
	configure.ac
	src/fauxton/app/addons/auth/templates/nav_link_title.html
	src/fauxton/app/addons/documents/templates/code_editor.html
	src/fauxton/app/addons/documents/templates/design_doc_selector.html
	src/fauxton/app/addons/fauxton/templates/api_bar.html
	src/fauxton/app/addons/fauxton/templates/footer.html
	src/fauxton/app/addons/fauxton/templates/notification.html
	src/fauxton/app/addons/permissions/templates/section.html
	src/fauxton/app/addons/replication/templates/form.html


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/43ccf52e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/43ccf52e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/43ccf52e

Branch: refs/heads/1.6.x
Commit: 43ccf52e151079579cc7d348c5e75b432a45dac8
Parents: d1bc0a9 ade9dae
Author: Dave Cottlehuber <dch@apache.org>
Authored: Thu Aug 14 00:51:59 2014 +0200
Committer: Dave Cottlehuber <dch@apache.org>
Committed: Thu Aug 14 00:51:59 2014 +0200

----------------------------------------------------------------------
 .gitignore                                      |   1 -
 LICENSE                                         |  43 ++
 configure.ac                                    |   2 +-
 etc/couchdb/default.ini.tpl.in                  |   4 +
 etc/couchdb/local.ini                           |  15 +-
 license.skip                                    |   2 +
 share/doc/build/Makefile.am                     |   2 +
 share/doc/src/api/database/changes.rst          |  10 +
 share/doc/src/api/ddoc/render.rst               |   2 -
 share/doc/src/config/http.rst                   |  35 ++
 share/doc/src/config/misc.rst                   |  24 +
 share/doc/src/couchapp/views/intro.rst          |   2 +-
 share/doc/src/experimental.rst                  |  15 +
 share/doc/src/intro/api.rst                     |   2 +-
 share/doc/src/intro/consistency.rst             |   2 +-
 share/doc/src/intro/security.rst                |  78 ++++
 share/doc/src/replication/intro.rst             |  20 +-
 share/doc/src/replication/replicator.rst        |  46 +-
 share/doc/src/whatsnew/1.6.rst                  |  20 +-
 share/www/script/test/changes.js                |  21 +-
 src/Makefile.am                                 |  21 +-
 src/couchdb/couch_httpd.erl                     |  15 +-
 src/couchdb/couch_httpd_auth.erl                |   2 +-
 src/couchdb/couch_httpd_db.erl                  |   2 +
 src/couchdb/couch_httpd_misc_handlers.erl       |  16 +-
 src/couchdb/couch_passwords.erl                 |   4 +-
 src/fauxton/Gruntfile.js                        |  45 +-
 src/fauxton/TODO.md                             |  26 --
 src/fauxton/app/addons/activetasks/base.js      |   2 +-
 src/fauxton/app/addons/activetasks/resources.js | 112 ++---
 src/fauxton/app/addons/activetasks/routes.js    |  37 +-
 .../addons/activetasks/templates/detail.html    |  21 -
 .../app/addons/activetasks/templates/table.html |   6 +-
 .../app/addons/activetasks/tests/viewsSpec.js   |  68 ++-
 src/fauxton/app/addons/activetasks/views.js     | 197 ++++----
 src/fauxton/app/addons/auth/resources.js        |   6 +-
 src/fauxton/app/addons/auth/routes.js           |   2 +-
 .../addons/auth/templates/nav_link_title.html   |  12 +-
 src/fauxton/app/addons/compaction/views.js      |   7 +-
 src/fauxton/app/addons/config/resources.js      |   4 +-
 src/fauxton/app/addons/databases/resources.js   |  18 -
 .../app/addons/databases/templates/item.html    |   2 +-
 .../app/addons/databases/templates/sidebar.html |  31 --
 src/fauxton/app/addons/databases/views.js       |  71 +--
 .../addons/documents/assets/less/documents.less |  27 +-
 src/fauxton/app/addons/documents/resources.js   | 131 +++++-
 src/fauxton/app/addons/documents/routes.js      |  57 +--
 .../documents/templates/advanced_options.html   | 189 ++++----
 .../documents/templates/all_docs_item.html      |   4 +-
 .../documents/templates/all_docs_list.html      |   6 +-
 .../addons/documents/templates/code_editor.html |  55 +++
 .../templates/design_doc_selector.html          |   4 +-
 .../app/addons/documents/templates/doc.html     |  55 ---
 .../documents/templates/doc_field_editor.html   |  74 ---
 .../templates/doc_field_editor_tabs.html        |  19 -
 .../templates/duplicate_doc_modal.html          |   2 +-
 .../addons/documents/templates/view_editor.html |  15 +-
 .../app/addons/documents/tests/resourcesSpec.js | 176 +++++++-
 .../app/addons/documents/tests/viewsSpec.js     |  23 +
 src/fauxton/app/addons/documents/views.js       | 448 ++++++++++---------
 src/fauxton/app/addons/fauxton/base.js          |  53 ++-
 src/fauxton/app/addons/fauxton/components.js    |  63 +++
 src/fauxton/app/addons/fauxton/resizeColumns.js |   3 +
 .../app/addons/fauxton/templates/api_bar.html   |   6 +-
 .../app/addons/fauxton/templates/filter.html    |  22 +
 .../addons/fauxton/templates/filter_item.html   |  16 +
 .../app/addons/fauxton/templates/footer.html    |   2 +-
 .../app/addons/fauxton/templates/nav_bar.html   |  31 +-
 .../addons/fauxton/templates/notification.html  |   2 +-
 .../app/addons/fauxton/tests/baseSpec.js        |  39 +-
 .../app/addons/fauxton/tests/filterViewSpec.js  |  87 ++++
 .../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 -
 .../app/addons/logs/templates/sidebar.html      |  27 --
 src/fauxton/app/addons/logs/tests/baseSpec.js   |  38 --
 .../app/addons/logs/tests/resourcesSpec.js      |  38 --
 .../app/addons/permissions/templates/item.html  |   2 +-
 .../addons/permissions/templates/section.html   |  16 +-
 .../app/addons/permissions/tests/viewsSpec.js   |  10 +-
 src/fauxton/app/addons/pouchdb/base.js          |   2 +-
 src/fauxton/app/addons/pouchdb/pouch.collate.js |   2 +-
 .../app/addons/pouchdb/pouchdb.mapreduce.js     |  14 +-
 .../app/addons/replication/templates/form.html  |   4 +-
 src/fauxton/app/addons/stats/routes.js          |  11 +-
 src/fauxton/app/addons/stats/views.js           |   7 +-
 .../app/templates/layouts/with_sidebar.html     |  10 +-
 .../app/templates/layouts/with_tabs.html        |  11 +-
 .../templates/layouts/with_tabs_sidebar.html    |  12 +-
 .../less/bootstrap/font-awesome/variables.less  |   4 +-
 src/fauxton/assets/less/fauxton.less            | 216 +++++----
 src/fauxton/assets/less/variables.less          |   2 +-
 src/fauxton/package.json                        |   6 +-
 src/fauxton/readme.md                           |  38 +-
 src/fauxton/settings.json.default               |   1 -
 src/fauxton/settings.json.dev                   |  62 ---
 src/fauxton/tasks/couchserver.js                |  28 +-
 test/etap/232-csp.t                             |  85 ++++
 101 files changed, 1925 insertions(+), 1799 deletions(-)
----------------------------------------------------------------------



Mime
View raw message