Updated Branches: refs/heads/api-options 57035883c -> bd721a537 (forced update)
Fix Makefile Fix include_docs checked. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d13bff47 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d13bff47 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d13bff47 Branch: refs/heads/api-options Commit: d13bff47c46d891a07e47c4f792d215a07bba9d8 Parents: e272cbe Author: suelockwood <deathb...@apache.org> Authored: Wed Jan 8 16:45:15 2014 -0500 Committer: suelockwood <deathb...@apache.org> Committed: Wed Jan 8 16:45:15 2014 -0500 ---------------------------------------------------------------------- src/Makefile.am | 1 - src/fauxton/app/modules/documents/views.js | 2 +- src/fauxton/app/templates/databases/item.html | 2 +- src/fauxton/app/templates/documents/sidebar.html | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/d13bff47/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 378f82b..12c4fe3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -133,7 +133,6 @@ FAUXTON_FILES = \ fauxton/app/templates/databases/item.html \ fauxton/app/templates/databases/list.html \ fauxton/app/templates/databases/newdatabase.html \ - fauxton/app/templates/databases/sidebar.html \ fauxton/app/templates/documents/all_docs_item.html \ fauxton/app/templates/documents/all_docs_list.html \ fauxton/app/templates/documents/changes.html \ http://git-wip-us.apache.org/repos/asf/couchdb/blob/d13bff47/src/fauxton/app/modules/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js index 0c75b81..1642f1f 100644 --- a/src/fauxton/app/modules/documents/views.js +++ b/src/fauxton/app/modules/documents/views.js @@ -1116,7 +1116,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum } break; case "include_docs": - break; + break; } }, http://git-wip-us.apache.org/repos/asf/couchdb/blob/d13bff47/src/fauxton/app/templates/databases/item.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/databases/item.html b/src/fauxton/app/templates/databases/item.html index a3712d4..e2f8071 100644 --- a/src/fauxton/app/templates/databases/item.html +++ b/src/fauxton/app/templates/databases/item.html @@ -13,7 +13,7 @@ the License. --> <td> - <a href="#/database/<%=encoded%>/_all_docs?limit=<%=docLimit%>&include_docs=false"><%= database.get("name") %></a> + <a href="#/database/<%=encoded%>/_all_docs?limit=<%=docLimit%>"><%= database.get("name") %></a> </td> <td><%= database.status.humanSize() %></td> <td><%= database.status.numDocs() %></td> http://git-wip-us.apache.org/repos/asf/couchdb/blob/d13bff47/src/fauxton/app/templates/documents/sidebar.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html index edf3f16..8a73ae9 100644 --- a/src/fauxton/app/templates/documents/sidebar.html +++ b/src/fauxton/app/templates/documents/sidebar.html @@ -55,7 +55,7 @@ the License. <nav> <ul class="nav nav-list"> - <li class="active"><a id="all-docs" href="#<%= database.url('index') %>?limit=<%= docLimit %>&include_docs=false" class="toggle-view"> All documents</a></li> + <li class="active"><a id="all-docs" href="#<%= database.url('index') %>?limit=<%= docLimit %>" class="toggle-view"> All documents</a></li> <li><a id="design-docs" href='#<%= database.url("index") %>?limit=<%= docLimit %>&startkey="_design"&endkey="_e"' class="toggle-view"> All design docs</a></li> </ul> <ul class="nav nav-list views">
