You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2013/03/20 00:24:40 UTC
[24/50] git commit: Merge remote-tracking branch 'github/pr/52' into
fauxton
Merge remote-tracking branch 'github/pr/52' into fauxton
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c2643320
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c2643320
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c2643320
Branch: refs/heads/master
Commit: c26433204577d52d1148bb9d5f9d7ca960423f68
Parents: 2e75c7a 2a0c0b2
Author: Russell Branca <ch...@gmail.com>
Authored: Fri Mar 15 09:53:26 2013 -0700
Committer: Russell Branca <ch...@gmail.com>
Committed: Fri Mar 15 09:53:26 2013 -0700
----------------------------------------------------------------------
src/fauxton/.gitignore | 11 +
src/fauxton/app/addons/contribute/base.js | 4 +
src/fauxton/app/initialize.js | 2 +-
src/fauxton/app/modules/databases/resources.js | 2 +-
src/fauxton/app/modules/documents/resources.js | 27 ++
src/fauxton/app/modules/documents/routes.js | 10 +-
src/fauxton/app/modules/documents/views.js | 106 +++++-
src/fauxton/app/modules/pouchdb/base.js | 57 +++
src/fauxton/app/modules/pouchdb/pouch.collate.js | 115 ++++++
.../app/modules/pouchdb/pouchdb.mapreduce.js | 286 +++++++++++++++
src/fauxton/app/router.js | 11 +-
src/fauxton/app/templates/databases/sidebar.html | 5 +-
.../app/templates/documents/all_docs_list.html | 177 ++++++----
src/fauxton/app/templates/documents/sidebar.html | 4 +-
src/fauxton/app/templates/documents/tabs.html | 6 +-
.../app/templates/documents/view_editor.html | 135 ++++---
src/fauxton/app/templates/fauxton/api_bar.html | 9 +-
src/fauxton/assets/index.underscore | 2 +
src/fauxton/couchapp.js | 11 +-
src/fauxton/grunt.js | 75 ++---
src/fauxton/settings.json.default | 11 +-
21 files changed, 849 insertions(+), 217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2643320/src/fauxton/grunt.js
----------------------------------------------------------------------