couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject [12/14] couchdb commit: updated refs/heads/1.6.x to 6529f77
Date Fri, 11 Apr 2014 19:15:10 GMT
Merge master into 1.6.x once more


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

Branch: refs/heads/1.6.x
Commit: cce329390f991ee0c10ae2a9a576124f17efff85
Parents: 79035f8 0b31731
Author: Dirkjan Ochtman <dirkjan@ochtman.nl>
Authored: Fri Apr 11 20:55:01 2014 +0200
Committer: Dirkjan Ochtman <dirkjan@ochtman.nl>
Committed: Fri Apr 11 20:55:01 2014 +0200

----------------------------------------------------------------------
 LICENSE                                         | 221 ++++++++++++++++--
 NOTICE                                          |   4 +-
 etc/couchdb/default.ini.tpl.in                  |   2 +
 share/doc/src/conf.py                           |   5 +-
 share/doc/src/config/auth.rst                   |  24 ++
 share/doc/templates/help.html                   |   4 +-
 share/doc/templates/tracking.html               |  15 ++
 share/www/script/test/basics.js                 |   2 +-
 src/Makefile.am                                 |   1 +
 src/couch_index/src/couch_index_updater.erl     |   2 +-
 src/couchdb/couch_httpd_auth.erl                |  17 ++
 src/couchdb/couch_passwords.erl                 |  15 +-
 src/fauxton/app/addons/databases/views.js       |   2 +-
 src/fauxton/app/addons/documents/resources.js   | 190 +++-------------
 src/fauxton/app/addons/documents/routes.js      |  81 +++----
 .../documents/templates/advanced_options.html   |   5 +-
 src/fauxton/app/addons/documents/views.js       |  14 +-
 src/fauxton/app/addons/fauxton/components.js    |  16 +-
 src/fauxton/app/config.js                       |   3 +-
 src/fauxton/app/core/utils.js                   |   6 +-
 src/fauxton/app/helpers.js                      |  17 +-
 .../js/plugins/cloudant.pagingcollection.js     | 224 +++++++++++++++++++
 22 files changed, 587 insertions(+), 283 deletions(-)
----------------------------------------------------------------------



Mime
View raw message