couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject [50/50] [abbrv] couchdb commit: updated refs/heads/1.6.x to d2ac597
Date Tue, 01 Apr 2014 17:42:32 GMT
Merge changes from master for 1.6.0-rc2


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

Branch: refs/heads/1.6.x
Commit: d2ac597398df4cb5e42ff017723a983ce1994096
Parents: ce3e89d 027ffa4
Author: Dirkjan Ochtman <dirkjan@ochtman.nl>
Authored: Tue Apr 1 19:40:32 2014 +0200
Committer: Dirkjan Ochtman <dirkjan@ochtman.nl>
Committed: Tue Apr 1 19:40:32 2014 +0200

----------------------------------------------------------------------
 .gitignore                                      |     7 +
 .travis.yml                                     |     6 +-
 AUTHORS                                         |     5 +-
 LICENSE                                         |    52 +-
 NOTICE                                          |     4 +
 THANKS.in                                       |     3 -
 etc/couchdb/default.ini.tpl.in                  |     5 +
 license.skip                                    |    10 +-
 share/doc/src/api/database/common.rst           |     8 +-
 share/doc/src/api/ddoc/common.rst               |     2 +-
 share/doc/src/api/document/common.rst           |    19 +-
 share/doc/src/api/server/common.rst             |     4 +
 share/doc/src/config/intro.rst                  |    31 +-
 share/doc/src/config/misc.rst                   |    11 +
 share/doc/src/couchapp/ddocs.rst                |     2 +-
 share/doc/src/couchapp/views/collation.rst      |    17 +-
 share/doc/src/couchapp/views/pagination.rst     |    48 +-
 share/doc/src/install/freebsd.rst               |     2 +-
 share/doc/src/install/unix.rst                  |     4 +-
 share/doc/src/intro/api.rst                     |     2 +-
 share/doc/src/intro/overview.rst                |    13 +-
 share/doc/src/json-structure.rst                |    84 +-
 share/doc/src/query-server/javascript.rst       |    10 +-
 share/doc/src/replication/protocol.rst          |     2 +-
 share/doc/src/whatsnew/1.5.rst                  |     9 +
 share/www/script/couch_test_runner.js           |     4 +-
 share/www/script/futon.js                       |     4 +-
 share/www/script/jquery.couch.js                |    65 +-
 share/www/script/test/auth_cache.js             |    12 +-
 share/www/script/test/cookie_auth.js            |    11 +-
 share/www/script/test/rewrite.js                |    11 +
 share/www/script/test/users_db_security.js      |    61 +-
 share/www/script/test/uuids.js                  |     4 +
 src/Makefile.am                                 |   156 +-
 .../src/couch_dbupdates_httpd.erl               |     4 +-
 src/couch_mrview/src/couch_mrview_util.erl      |    19 +-
 .../src/couch_replicator_api_wrap.erl           |    40 +-
 src/couchdb/couch_db_updater.erl                |    17 +-
 src/couchdb/couch_httpd.erl                     |   110 +-
 src/couchdb/couch_httpd_auth.erl                |    35 +-
 src/couchdb/couch_httpd_db.erl                  |     2 +-
 src/couchdb/couch_httpd_misc_handlers.erl       |     5 +
 src/couchdb/couch_httpd_oauth.erl               |     3 +-
 src/couchdb/couch_httpd_rewrite.erl             |    54 +-
 src/fauxton/CONTRIBUTING.md                     |    22 +
 src/fauxton/Gruntfile.js                        |    67 +-
 .../activetasks/assets/less/activetasks.less    |     6 +-
 src/fauxton/app/addons/activetasks/resources.js |     2 +-
 .../app/addons/activetasks/tests/viewsSpec.js   |     3 -
 src/fauxton/app/addons/activetasks/views.js     |    23 +-
 .../app/addons/auth/assets/less/auth.less       |    28 +-
 src/fauxton/app/addons/auth/base.js             |     6 +-
 src/fauxton/app/addons/auth/resources.js        |   102 +-
 src/fauxton/app/addons/auth/routes.js           |    13 +-
 .../app/addons/auth/templates/create_admin.html |    23 +-
 .../app/addons/auth/templates/login.html        |     2 +-
 .../addons/auth/templates/nav_link_title.html   |     5 +-
 .../app/addons/auth/templates/noAccess.html     |     4 +-
 src/fauxton/app/addons/auth/test/baseSpec.js    |    34 +
 src/fauxton/app/addons/compaction/routes.js     |     2 +-
 .../app/addons/compaction/templates/layout.html |     4 +-
 src/fauxton/app/addons/compaction/views.js      |     3 +-
 .../app/addons/config/assets/less/config.less   |    52 +-
 src/fauxton/app/addons/config/base.js           |     6 +-
 src/fauxton/app/addons/config/resources.js      |   111 +-
 src/fauxton/app/addons/config/routes.js         |     8 +-
 .../app/addons/config/templates/dashboard.html  |    35 +-
 .../app/addons/config/templates/item.html       |    27 +-
 .../app/addons/config/templates/modal.html      |    33 +
 .../app/addons/config/tests/resourcesSpec.js    |    97 +
 src/fauxton/app/addons/config/views.js          |   248 +
 .../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 |   115 +
 src/fauxton/app/addons/documents/base.js        |    24 +
 src/fauxton/app/addons/documents/resources.js   |   726 +
 src/fauxton/app/addons/documents/routes.js      |   531 +
 .../documents/templates/advanced_options.html   |   131 +
 .../documents/templates/all_docs_item.html      |    26 +
 .../documents/templates/all_docs_layout.html    |    21 +
 .../documents/templates/all_docs_list.html      |    44 +
 .../documents/templates/all_docs_number.html    |    35 +
 .../app/addons/documents/templates/changes.html |    38 +
 .../addons/documents/templates/ddoc_info.html   |    28 +
 .../templates/delete_database_modal.html        |    39 +
 .../templates/design_doc_selector.html          |    35 +
 .../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          |    36 +
 .../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 +
 .../app/addons/documents/templates/tabs.html    |    18 +
 .../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       |  1999 +++
 src/fauxton/app/addons/fauxton/base.js          |   345 +
 src/fauxton/app/addons/fauxton/components.js    |   564 +
 src/fauxton/app/addons/fauxton/resizeColumns.js |    87 +
 .../app/addons/fauxton/templates/api_bar.html   |    30 +
 .../addons/fauxton/templates/breadcrumbs.html   |    24 +
 .../app/addons/fauxton/templates/footer.html    |    15 +
 .../fauxton/templates/index_pagination.html     |    24 +
 .../app/addons/fauxton/templates/nav_bar.html   |    75 +
 .../addons/fauxton/templates/notification.html  |    18 +
 .../addons/fauxton/templates/pagination.html    |    31 +
 .../app/addons/fauxton/tests/baseSpec.js        |    79 +
 .../app/addons/fauxton/tests/navbarSpec.js      |   107 +
 .../app/addons/fauxton/tests/paginateSpec.js    |    87 +
 .../app/addons/logs/assets/less/logs.less       |    24 +
 .../app/addons/logs/templates/filterItem.html   |     2 +-
 .../permissions/assets/less/permissions.less    |    39 +-
 src/fauxton/app/addons/permissions/resources.js |     2 +-
 src/fauxton/app/addons/permissions/routes.js    |     2 +-
 .../app/addons/permissions/templates/item.html  |     2 +-
 .../addons/permissions/templates/section.html   |    10 +-
 .../app/addons/permissions/tests/viewsSpec.js   |     2 +-
 src/fauxton/app/addons/permissions/views.js     |     2 +-
 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    |   342 +-
 src/fauxton/app/addons/replication/views.js     |     6 +-
 .../app/addons/stats/assets/less/stats.less     |    11 +-
 src/fauxton/app/addons/stats/resources.js       |     2 +-
 .../app/addons/stats/templates/pie_table.html   |     2 +-
 src/fauxton/app/addons/stats/views.js           |     7 +-
 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 +
 .../app/addons/verifyinstall/resources.js       |    11 +-
 src/fauxton/app/addons/verifyinstall/routes.js  |     2 +-
 src/fauxton/app/addons/verifyinstall/views.js   |     2 +-
 src/fauxton/app/api.js                          |   558 -
 src/fauxton/app/app.js                          |    83 +-
 src/fauxton/app/config.js                       |     9 +-
 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                      |     3 +-
 src/fauxton/app/main.js                         |    13 +-
 src/fauxton/app/mixins.js                       |    66 -
 src/fauxton/app/modules/databases/base.js       |    37 -
 src/fauxton/app/modules/databases/resources.js  |   193 -
 src/fauxton/app/modules/databases/routes.js     |    69 -
 src/fauxton/app/modules/databases/views.js      |   255 -
 src/fauxton/app/modules/documents/base.js       |    24 -
 src/fauxton/app/modules/documents/resources.js  |   646 -
 src/fauxton/app/modules/documents/routes.js     |   409 -
 .../modules/documents/tests/resourcesSpec.js    |    84 -
 src/fauxton/app/modules/documents/views.js      |  1855 ---
 src/fauxton/app/modules/fauxton/base.js         |   275 -
 src/fauxton/app/modules/fauxton/components.js   |   337 -
 src/fauxton/app/modules/fauxton/layout.js       |    98 -
 src/fauxton/app/modules/pouchdb/base.js         |    47 -
 .../app/modules/pouchdb/pouch.collate.js        |   115 -
 .../app/modules/pouchdb/pouchdb.mapreduce.js    |   324 -
 src/fauxton/app/resizeColumns.js                |    87 -
 src/fauxton/app/router.js                       |   175 -
 src/fauxton/app/templates/databases/item.html   |    24 -
 src/fauxton/app/templates/databases/list.html   |    35 -
 .../app/templates/databases/newdatabase.html    |    17 -
 .../templates/documents/advanced_options.html   |    98 -
 .../app/templates/documents/all_docs_item.html  |    26 -
 .../templates/documents/all_docs_layout.html    |    20 -
 .../app/templates/documents/all_docs_list.html  |    43 -
 .../templates/documents/all_docs_number.html    |    23 -
 .../app/templates/documents/changes.html        |    38 -
 .../app/templates/documents/ddoc_info.html      |    28 -
 .../documents/design_doc_selector.html          |    35 -
 src/fauxton/app/templates/documents/doc.html    |    55 -
 .../templates/documents/doc_field_editor.html   |    74 -
 .../documents/doc_field_editor_tabs.html        |    19 -
 .../documents/duplicate_doc_modal.html          |    36 -
 .../app/templates/documents/edit_tools.html     |    44 -
 .../templates/documents/index_menu_item.html    |    17 -
 .../templates/documents/index_row_docular.html  |    27 -
 .../templates/documents/index_row_tabular.html  |    25 -
 .../app/templates/documents/jumpdoc.html        |    19 -
 src/fauxton/app/templates/documents/search.html |    15 -
 .../app/templates/documents/sidebar.html        |    67 -
 src/fauxton/app/templates/documents/tabs.html   |    18 -
 .../app/templates/documents/upload_modal.html   |    42 -
 .../app/templates/documents/view_editor.html    |    87 -
 src/fauxton/app/templates/fauxton/api_bar.html  |    30 -
 .../app/templates/fauxton/breadcrumbs.html      |    24 -
 src/fauxton/app/templates/fauxton/footer.html   |    15 -
 .../app/templates/fauxton/index_pagination.html |    24 -
 src/fauxton/app/templates/fauxton/nav_bar.html  |    75 -
 .../app/templates/fauxton/notification.html     |    18 -
 .../app/templates/fauxton/pagination.html       |    31 -
 .../app/templates/layouts/one_pane_notabs.html  |    27 -
 .../templates/layouts/with_right_sidebar.html   |    26 -
 src/fauxton/assets/css/nv.d3.css                |   191 +-
 src/fauxton/assets/index.underscore             |     4 +-
 src/fauxton/assets/js/libs/d3.js                | 14721 ++++++++++-------
 src/fauxton/assets/js/libs/jquery.js            | 12586 +++++++-------
 src/fauxton/assets/js/libs/nv.d3.js             |  4539 +++--
 src/fauxton/assets/js/plugins/beautify.js       |  1630 ++
 .../assets/less/bootstrap/bootstrap.less        |     1 -
 src/fauxton/assets/less/bootstrap/modals.less   |     2 +-
 src/fauxton/assets/less/config.less             |    46 -
 src/fauxton/assets/less/database.less           |   245 -
 src/fauxton/assets/less/fauxton.less            |   670 +-
 src/fauxton/assets/less/logs.less               |    24 -
 src/fauxton/assets/less/prettyprint.less        |    21 +-
 src/fauxton/assets/less/variables.less          |     2 +
 src/fauxton/readme.md                           |    10 +-
 src/fauxton/settings.json.default               |    26 +-
 src/fauxton/settings.json.dev                   |    62 +
 src/fauxton/tasks/couchserver.js                |    24 +-
 src/fauxton/tasks/fauxton.js                    |    13 +-
 src/fauxton/test/core/layoutSpec.js             |    94 -
 src/fauxton/test/core/navbarSpec.js             |   107 -
 src/fauxton/test/core/paginateSpec.js           |   109 -
 src/fauxton/test/core/routeObjectSpec.js        |   105 -
 src/fauxton/test/mocha/chai.js                  |   804 +-
 src/fauxton/test/mocha/testUtils.js             |     3 +-
 src/fauxton/test/test.config.underscore         |     5 +
 src/my-first-couchdb-plugin/README.md           |    18 +-
 test/etap/043-find-in-binary.t                  |     1 -
 244 files changed, 31177 insertions(+), 23134 deletions(-)
----------------------------------------------------------------------



Mime
View raw message