You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/08/19 17:14:25 UTC
[1/3] git commit: updated refs/heads/master to 378853c
Updated Branches:
refs/heads/master 86455f3fc -> 378853ca0
Fauxton: Fix auth bug not showing accessible page
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/378853ca
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/378853ca
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/378853ca
Branch: refs/heads/master
Commit: 378853ca0a74e61351eb60b5277295ecd886f5d2
Parents: e74f3ba
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Aug 19 17:01:39 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Aug 19 17:03:22 2013 +0200
----------------------------------------------------------------------
src/fauxton/app/addons/auth/base.js | 3 +--
src/fauxton/app/addons/auth/routes.js | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/378853ca/src/fauxton/app/addons/auth/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/auth/base.js b/src/fauxton/app/addons/auth/base.js
index 3502edd..9f9a332 100644
--- a/src/fauxton/app/addons/auth/base.js
+++ b/src/fauxton/app/addons/auth/base.js
@@ -49,8 +49,7 @@ function(app, FauxtonAPI, Auth) {
};
var authDenied = function () {
- app.masterLayout.setView('#dashboard', new Auth.NoAccessView());
- app.masterLayout.renderView('#dashboard');
+ FauxtonAPI.navigate('/noAccess');
};
FauxtonAPI.auth.registerAuth(auth);
http://git-wip-us.apache.org/repos/asf/couchdb/blob/378853ca/src/fauxton/app/addons/auth/routes.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/auth/routes.js b/src/fauxton/app/addons/auth/routes.js
index ecd45f2..fe40a77 100644
--- a/src/fauxton/app/addons/auth/routes.js
+++ b/src/fauxton/app/addons/auth/routes.js
@@ -52,6 +52,7 @@ function(app, FauxtonAPI, Auth) {
noAccess: function () {
this.crumbs = [{name: 'Access Denied', link:"#"}];
this.setView('#dashboard-content', new Auth.NoAccessView());
+ this.apiUrl = 'noAccess';
},
});
[3/3] git commit: updated refs/heads/master to 378853c
Posted by ga...@apache.org.
Fauxton: fix watch task failing for no include pattern
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/30280d62
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/30280d62
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/30280d62
Branch: refs/heads/master
Commit: 30280d622472f5bcb641502acf3d4ae0555cdae8
Parents: 86455f3
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Aug 19 11:35:06 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Aug 19 17:03:22 2013 +0200
----------------------------------------------------------------------
src/fauxton/Gruntfile.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/30280d62/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index f25e3b8..1c58bb6 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -234,7 +234,9 @@ module.exports = function(grunt) {
tasks: ['clean:watch', 'dependencies','less', 'concat:index_css'],
},
html: {
- files: helper.watchFiles(['.html'], []),
+ // the index.html is added in as a dummy file incase there is no
+ // html dependancies this will break. So we need one include pattern
+ files: helper.watchFiles(['.html'], ['./index.html']),
tasks: ['clean:watch', 'dependencies']
},
options: {
[2/3] git commit: updated refs/heads/master to 378853c
Posted by ga...@apache.org.
Fauxton: fix pretty print issue by escaping json
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e74f3bae
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e74f3bae
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e74f3bae
Branch: refs/heads/master
Commit: e74f3bae54f82204a3a4acfc4a5b5c1f941b4943
Parents: 30280d6
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Aug 19 16:38:06 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Aug 19 17:03:22 2013 +0200
----------------------------------------------------------------------
src/fauxton/app/templates/documents/all_docs_item.html | 2 +-
src/fauxton/app/templates/documents/doc.html | 2 +-
src/fauxton/app/templates/documents/index_row_docular.html | 4 ++--
src/fauxton/app/templates/documents/index_row_tabular.html | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e74f3bae/src/fauxton/app/templates/documents/all_docs_item.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/all_docs_item.html b/src/fauxton/app/templates/documents/all_docs_item.html
index c4c0754..c0e61cf 100644
--- a/src/fauxton/app/templates/documents/all_docs_item.html
+++ b/src/fauxton/app/templates/documents/all_docs_item.html
@@ -15,7 +15,7 @@ the License.
<td class="select"><input type="checkbox" class="row-select"></td>
<td>
<div>
- <pre class="prettyprint"><%= doc.prettyJSON() %></pre>
+ <pre class="prettyprint"><%- doc.prettyJSON() %></pre>
<% if (doc.isEditable()) { %>
<div class="btn-group">
<a href="#<%= doc.url('app') %>" class="btn btn-small edits">Edit <%= doc.docType() %></a>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e74f3bae/src/fauxton/app/templates/documents/doc.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/doc.html b/src/fauxton/app/templates/documents/doc.html
index 92c29ff..81c74c4 100644
--- a/src/fauxton/app/templates/documents/doc.html
+++ b/src/fauxton/app/templates/documents/doc.html
@@ -32,7 +32,7 @@ the License.
</div>
<% } %>
- <textarea class="doc-code"><%= JSON.stringify(doc.attributes, null, " ") %></textarea>
+ <textarea class="doc-code"><%- JSON.stringify(doc.attributes, null, " ") %></textarea>
<br />
<p>
<button class="save-doc button" type="button">Save</button>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e74f3bae/src/fauxton/app/templates/documents/index_row_docular.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/index_row_docular.html b/src/fauxton/app/templates/documents/index_row_docular.html
index 26c0280..3835453 100644
--- a/src/fauxton/app/templates/documents/index_row_docular.html
+++ b/src/fauxton/app/templates/documents/index_row_docular.html
@@ -15,7 +15,7 @@ the License.
<td class="select"><input type="checkbox"></td>
<td>
<div>
- <pre class="prettyprint"><%= doc.prettyJSON() %></pre>
+ <pre class="prettyprint"><%- doc.prettyJSON() %></pre>
<% if (doc.isEditable()) { %>
<div class="btn-group">
<a href="#<%= doc.url('app') %>" class="btn btn-small edits">Edit <%= doc.docType() %></a>
@@ -23,4 +23,4 @@ the License.
</div>
<% } %>
</div>
-</td>
\ No newline at end of file
+</td>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e74f3bae/src/fauxton/app/templates/documents/index_row_tabular.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/index_row_tabular.html b/src/fauxton/app/templates/documents/index_row_tabular.html
index f52c48c..f211f9e 100644
--- a/src/fauxton/app/templates/documents/index_row_tabular.html
+++ b/src/fauxton/app/templates/documents/index_row_tabular.html
@@ -22,4 +22,4 @@ the License.
<div>
<pre class="prettyprint"><%= JSON.stringify(doc.get("value")) %></pre>
</div>
-</td>
\ No newline at end of file
+</td>