You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2014/07/14 10:35:37 UTC
[01/13] fauxton commit: updated refs/heads/master to 0ec46e9
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 8cb432c5f -> 0ec46e9fe
Add Experimental Content-Security-Policy-Support (CSP) for Fauxton
Like every web application, Fauxton is vulnerable against XSS and
CSP is a technology that tries to help against that.
The patch makes it possible to enable CSP for the /_utils path and
allows configuration of the sent header.
The default setting for the value of the header breaks the old
Futon, when CSP is enabled there. The old Futon has alot of
inline-JavaScript which is not allowed in the setting I have
chosen as default.
For development, the header is also sent from the Node server
which launches Fauxton in dev-mode.
People can enable the feature by setting enable = true in the
section [csp] of their configs
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7b82f198
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7b82f198
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7b82f198
Branch: refs/heads/master
Commit: 7b82f1986dee4c4cfb16b1687f62aa080ad20fe9
Parents: 8cb432c
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sat May 17 18:37:30 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Mon Jun 9 19:09:06 2014 +0200
----------------------------------------------------------------------
tasks/couchserver.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7b82f198/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/tasks/couchserver.js b/tasks/couchserver.js
index 67b0ae0..3a17ab6 100644
--- a/tasks/couchserver.js
+++ b/tasks/couchserver.js
@@ -47,6 +47,10 @@ module.exports = function (grunt) {
accept = req.headers.accept.split(','),
filePath;
+ var headerValue = "default-src 'self'; img-src 'self'; font-src 'self'; " +
+ "script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';";
+ res.setHeader('Content-Security-Policy', headerValue);
+
if (!!url.match(/^\/addons\/.*\/assets\/js/)) {
filePath = path.join(app_dir, url.replace('/_utils/fauxton/',''));
} else if (!!url.match(/assets/)) {
[04/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: Fix font awesome url to work for release
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9fe95cb3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9fe95cb3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9fe95cb3
Branch: refs/heads/master
Commit: 9fe95cb30af285274517e0e96b910c5e01cab194
Parents: 35d6f4e
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jun 10 14:51:12 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Jun 11 11:21:34 2014 +0200
----------------------------------------------------------------------
assets/less/bootstrap/font-awesome/variables.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9fe95cb3/assets/less/bootstrap/font-awesome/variables.less
----------------------------------------------------------------------
diff --git a/assets/less/bootstrap/font-awesome/variables.less b/assets/less/bootstrap/font-awesome/variables.less
index 5d93614..0715887 100644
--- a/assets/less/bootstrap/font-awesome/variables.less
+++ b/assets/less/bootstrap/font-awesome/variables.less
@@ -1,7 +1,7 @@
// Variables
// --------------------------
-@FontAwesomePath: "../../img";
+@FontAwesomePath: "../img";
//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/3.2.1/font"; // for referencing Bootstrap CDN font files directly
@FontAwesomeVersion: "3.2.1";
@borderColor: #eee;
[11/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: Remove settings.json.dev
We don't use this file and its causing confusion with new contributors.
The grunt task look for a `settings.json`, if it doesn't find that it
defaults to settings.json.default
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e4b218b5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e4b218b5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e4b218b5
Branch: refs/heads/master
Commit: e4b218b56d958708b73bc1ae440aeeca043c6369
Parents: 7d4f14e
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Jul 2 10:08:37 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Jul 2 10:08:37 2014 +0200
----------------------------------------------------------------------
settings.json.dev | 61 --------------------------------------------------
1 file changed, 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e4b218b5/settings.json.dev
----------------------------------------------------------------------
diff --git a/settings.json.dev b/settings.json.dev
deleted file mode 100644
index 62cd1e7..0000000
--- a/settings.json.dev
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- "deps": [
- { "name": "fauxton" },
- { "name": "databases" },
- { "name": "documents" },
- { "name": "pouchdb" },
- { "name": "activetasks" },
- { "name": "config" },
- { "name": "stats" },
- { "name": "replication" },
- { "name": "plugins" },
- { "name": "contribute" },
- { "name": "permissions" },
- { "name": "compaction" },
- { "name": "auth" },
- { "name": "verifyinstall" },
- { "name": "styletests" }
- ],
- "template": {
- "development": {
- "src": "assets/index.underscore",
- "dest": "dist/debug/index.html",
- "variables": {
- "requirejs": "/assets/js/libs/require.js",
- "css": "./css/index.css",
- "base": null,
- "cachebuster": ""
- },
- "app": {
- "root": "/",
- "host": "../..",
- "version": "1.0.dev"
- }
- },
- "release": {
- "src": "assets/index.underscore",
- "dest": "dist/debug/index.html",
- "variables": {
- "requirejs": "./js/require.js",
- "css": "./css/index.css",
- "base": null,
- "cachebuster": "?v1.0"
- },
- "app": {
- "root": "/_utils/fauxton/",
- "host": "../..",
- "version": "1.0"
- }
- }
- },
-
- "couch_config": {
- "fauxton": {
- "db": "http://localhost:5984/fauxton",
- "app": "./couchapp.js",
- "options": {
- "okay_if_missing": true
- }
- }
- }
-}
[07/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: Fix clone cancel button
This fixes the issue that when a user cancels a clone doc it goes back
to all docs. Now it just closes the modal.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/c8d110c3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/c8d110c3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/c8d110c3
Branch: refs/heads/master
Commit: c8d110c370f44584e535c7dde440c87491a4d889
Parents: f0824ec
Author: sebastianrothbucher <se...@googlemail.com>
Authored: Sat Jun 21 20:11:17 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Jun 23 10:00:15 2014 +0200
----------------------------------------------------------------------
app/addons/documents/templates/duplicate_doc_modal.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c8d110c3/app/addons/documents/templates/duplicate_doc_modal.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/duplicate_doc_modal.html b/app/addons/documents/templates/duplicate_doc_modal.html
index 54be01f..3038559 100644
--- a/app/addons/documents/templates/duplicate_doc_modal.html
+++ b/app/addons/documents/templates/duplicate_doc_modal.html
@@ -28,7 +28,7 @@ the License.
</div>
<div class="modal-footer">
- <button data-dismiss="modal" class="btn cancel-button"><i class="icon fonticon-circle-x"></i> Cancel</button>
+ <button data-dismiss="modal" class="btn"><i class="icon fonticon-circle-x"></i> Cancel</button>
<button id="duplicate-btn" class="btn btn-success save"><i class="fonticon-circle-check"></i> Clone</button>
</div>
</div>
[12/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: Upgrade node-http-proxy
Some modifications have to be made because the API changed when
the module reached v1.0
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5893a971
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5893a971
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5893a971
Branch: refs/heads/master
Commit: 5893a97156b24407f759094f485f54b8a25b5ef3
Parents: e4b218b
Author: Michaël Zasso <mi...@gmail.com>
Authored: Wed Jul 2 13:42:23 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Wed Jul 2 16:31:46 2014 +0200
----------------------------------------------------------------------
Gruntfile.js | 9 +--------
package.json | 2 +-
tasks/couchserver.js | 16 +++++++++-------
3 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5893a971/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index 8ffb2f8..047962e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -124,14 +124,7 @@ module.exports = function(grunt) {
dist: './dist/debug/',
port: 8000,
proxy: {
- target: {
- host: 'localhost',
- port: 5984,
- https: false
- },
- // This sets the Host header in the proxy so that you can use external
- // CouchDB instances and not have the Host set to 'localhost'
- changeOrigin: true
+ target: "http://localhost:5984/"
}
};
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5893a971/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index d84c881..a955892 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"underscore": "~1.4.2",
"url": "~0.7.9",
"urls": "~0.0.3",
- "http-proxy": "~0.10.2",
+ "http-proxy": "~1.1.4",
"send": "~0.1.1",
"grunt-mocha-phantomjs": "~0.3.0"
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5893a971/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/tasks/couchserver.js b/tasks/couchserver.js
index 8e95c5c..3e82e98 100644
--- a/tasks/couchserver.js
+++ b/tasks/couchserver.js
@@ -19,6 +19,7 @@ module.exports = function (grunt) {
http = require("http"),
httpProxy = require('http-proxy'),
send = require('send'),
+ urlLib = require('url'),
options = grunt.config('couchserver'),
_ = grunt.util._;
@@ -30,18 +31,14 @@ module.exports = function (grunt) {
// Proxy options with default localhost
var proxy_settings = options.proxy || {
- target: {
- host: 'localhost',
- port: 5984,
- https: false
- }
+ target: "http://localhost:5984/"
};
// inform grunt that this task is async
var done = this.async();
// create proxy to couch for all couch requests
- var proxy = new httpProxy.HttpProxy(proxy_settings);
+ var proxy = httpProxy.createServer(proxy_settings);
http.createServer(function (req, res) {
var url = req.url.replace('app/',''),
@@ -97,7 +94,12 @@ module.exports = function (grunt) {
.pipe(res);
}
- proxy.proxyRequest(req, res);
+ // This sets the Host header in the proxy so that one can use external
+ // CouchDB instances and not have the Host set to 'localhost'
+ var urlObj = urlLib.parse(req.url);
+ req.headers['host'] = urlObj.host;
+
+ proxy.web(req, res);
}).listen(port);
// Fail this task if any errors have been logged
[03/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: Content Security Policy optional for dev
This just makes the content security policy optional for
development.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9bc7c98e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9bc7c98e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9bc7c98e
Branch: refs/heads/master
Commit: 9bc7c98e2a6d4d942a9e7a1d4c52653c9f7a6a4a
Parents: 9fe95cb
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jun 10 15:19:32 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Jun 11 11:21:34 2014 +0200
----------------------------------------------------------------------
tasks/couchserver.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9bc7c98e/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/tasks/couchserver.js b/tasks/couchserver.js
index 3a17ab6..8e95c5c 100644
--- a/tasks/couchserver.js
+++ b/tasks/couchserver.js
@@ -25,7 +25,8 @@ module.exports = function (grunt) {
// Options
var dist_dir = options.dist || './dist/debug/',
app_dir = './app',
- port = options.port || 8000;
+ port = options.port || 8000,
+ setContentSecurityPolicy = _.isUndefined(options.contentSecurityPolicy) ? true : options.contentSecurityPolicy;
// Proxy options with default localhost
var proxy_settings = options.proxy || {
@@ -47,9 +48,11 @@ module.exports = function (grunt) {
accept = req.headers.accept.split(','),
filePath;
- var headerValue = "default-src 'self'; img-src 'self'; font-src 'self'; " +
- "script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';";
- res.setHeader('Content-Security-Policy', headerValue);
+ if (setContentSecurityPolicy) {
+ var headerValue = "default-src 'self'; img-src 'self'; font-src 'self'; " +
+ "script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';";
+ res.setHeader('Content-Security-Policy', headerValue);
+ }
if (!!url.match(/^\/addons\/.*\/assets\/js/)) {
filePath = path.join(app_dir, url.replace('/_utils/fauxton/',''));
[10/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: Add view filter
This allows a module to register an extension to filter out what views
should be displayed in the side bar.
An example of usage is to only display views that have
"language:javascript"
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7d4f14e2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7d4f14e2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7d4f14e2
Branch: refs/heads/master
Commit: 7d4f14e2623515e12526c505865991f9960bf58f
Parents: adc99a4
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jul 1 14:31:12 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Jul 2 10:06:45 2014 +0200
----------------------------------------------------------------------
app/addons/documents/resources.js | 8 ++++++++
app/addons/documents/views.js | 26 +++++++++++++++++++++++---
2 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7d4f14e2/app/addons/documents/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/resources.js b/app/addons/documents/resources.js
index 21cdfdd..dc71153 100644
--- a/app/addons/documents/resources.js
+++ b/app/addons/documents/resources.js
@@ -482,6 +482,14 @@ function(app, FauxtonAPI, PagingCollection) {
});
return PagingCollection.prototype.parse.call(this, resp);
+ },
+
+ clone: function () {
+ return new this.constructor(this.models, {
+ database: this.database,
+ params: this.params,
+ paging: this.paging
+ });
}
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7d4f14e2/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index 4e7459a..6ccb733 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -26,7 +26,7 @@ define([
// Plugins
"plugins/beautify",
"plugins/prettify",
- // this should be never global available:
+ // this should never be global available:
// https://github.com/zeroclipboard/zeroclipboard/blob/master/docs/security.md
"plugins/zeroclipboard/ZeroClipboard"
],
@@ -1710,8 +1710,19 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
this.reduceFunStr = this.model.viewHasReduce(this.viewName);
}
+ var viewFilters = FauxtonAPI.getExtensions('sidebar:viewFilters'),
+ filteredModels = this.ddocs.models,
+ designDocs = this.ddocs.clone();
+
+ if (!_.isEmpty(viewFilters)) {
+ _.each(viewFilters, function (filter) {
+ filteredModels = _.filter(filteredModels, filter);
+ });
+ designDocs.reset(filteredModels, {silent: true});
+ }
+
this.designDocSelector = this.setView('.design-doc-group', new Views.DesignDocSelector({
- collection: this.ddocs,
+ collection: designDocs,
ddocName: this.model.id,
database: this.database
}));
@@ -1874,7 +1885,16 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
extension.render();
}, this);
- this.collection.each(function(design) {
+ var viewFilters = FauxtonAPI.getExtensions('sidebar:viewFilters'),
+ collection = this.collection.models;
+
+ if (!_.isEmpty(viewFilters)) {
+ _.each(viewFilters, function (filter) {
+ collection = _.filter(collection, filter);
+ });
+ }
+
+ _.each(collection, function(design) {
if (design.has('doc')){
var ddoc = design.id.replace(/^_design\//,"");
if (design.get('doc').views){
[05/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
fix attachment view to bypass
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e95e4fbd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e95e4fbd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e95e4fbd
Branch: refs/heads/master
Commit: e95e4fbd8c361aa53b8d3da37b77e45ca1e67d34
Parents: 9bc7c98
Author: sebastianrothbucher <se...@googlemail.com>
Authored: Sat Jun 14 13:57:22 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Wed Jun 18 19:43:35 2014 +0200
----------------------------------------------------------------------
app/addons/documents/templates/code_editor.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e95e4fbd/app/addons/documents/templates/code_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/code_editor.html b/app/addons/documents/templates/code_editor.html
index e9a46cf..811e111 100644
--- a/app/addons/documents/templates/code_editor.html
+++ b/app/addons/documents/templates/code_editor.html
@@ -31,7 +31,7 @@ the License.
<ul class="dropdown-menu">
<%_.each(attachments, function (att) { %>
<li>
- <a href="<%- att.url %>" target="_blank"> <strong> <%- att.fileName %> </strong> -
+ <a href="<%- att.url %>" target="_blank" data-bypass="true"> <strong> <%- att.fileName %> </strong> -
<span> <%- att.contentType %>, <%- formatSize(att.size)%> </span>
</a>
</li>
[06/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: Create fx roles
Fauxton auth works by checking what roles a user has and then decide if
they have access to a specific route. The only problem is a regular user
might get created but not have any roles. Unlike an admin user who get
assigned all the roles on creation.
The idea behind this is that certain routes should require a user to be
logged in but not necessary have any roles eg. #changePassword route.
This allows for a standard fauxton role that all logged in users get given so that
we can check via the roles if they are logged
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/f0824ec1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/f0824ec1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/f0824ec1
Branch: refs/heads/master
Commit: f0824ec1e688460f76c4b175e9ce68aabf3e1cfc
Parents: e95e4fb
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Jun 18 15:55:03 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Jun 23 09:52:06 2014 +0200
----------------------------------------------------------------------
app/addons/auth/resources.js | 4 ++++
app/addons/auth/routes.js | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f0824ec1/app/addons/auth/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/auth/resources.js b/app/addons/auth/resources.js
index 6e191b1..ca9a33f 100644
--- a/app/addons/auth/resources.js
+++ b/app/addons/auth/resources.js
@@ -101,6 +101,10 @@ function (app, FauxtonAPI, CouchdbSession) {
var user = this.user();
if (user && user.roles) {
+ if (user.roles.indexOf('fx_loggedIn') === -1) {
+ user.roles.push('fx_loggedIn');
+ }
+
return user.roles;
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f0824ec1/app/addons/auth/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/auth/routes.js b/app/addons/auth/routes.js
index 74395e8..ede498a 100644
--- a/app/addons/auth/routes.js
+++ b/app/addons/auth/routes.js
@@ -71,7 +71,7 @@ function(app, FauxtonAPI, Auth) {
routes: {
'changePassword': {
route: 'changePassword',
- roles: ['_admin', '_reader', '_replicator']
+ roles: ['fx_loggedIn']
},
'addAdmin': {
roles: ['_admin'],
[02/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: Fix show me api link
* use data-bypass attribute to circumvent backbone routing
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/35d6f4e9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/35d6f4e9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/35d6f4e9
Branch: refs/heads/master
Commit: 35d6f4e9f2ae1cbd2603f19afadb096312a16ed0
Parents: 7b82f19
Author: Robin Drexler <dr...@gmail.com>
Authored: Sun Jun 8 20:07:58 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Mon Jun 9 19:54:27 2014 +0200
----------------------------------------------------------------------
app/addons/fauxton/templates/api_bar.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/35d6f4e9/app/addons/fauxton/templates/api_bar.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/api_bar.html b/app/addons/fauxton/templates/api_bar.html
index ecd92f1..886c06e 100644
--- a/app/addons/fauxton/templates/api_bar.html
+++ b/app/addons/fauxton/templates/api_bar.html
@@ -25,6 +25,6 @@ the License.
</a>
</span>
<input type="text" class="input-xxlarge" value="<%- endpoint %>">
- <a href="<%- endpoint %>" target="_blank" class="btn">Show me</a>
+ <a data-bypass="true" href="<%- endpoint %>" target="_blank" class="btn">Show me</a>
</div>
</div>
[09/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fix missing stale query option
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/adc99a4f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/adc99a4f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/adc99a4f
Branch: refs/heads/master
Commit: adc99a4f9825577e22a5249b6d55d1edfdfcbdf6
Parents: 7896340
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Jun 30 12:27:18 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Jun 30 12:27:18 2014 +0200
----------------------------------------------------------------------
.../documents/templates/advanced_options.html | 8 ++-----
app/addons/documents/views.js | 22 +++++++-------------
2 files changed, 9 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/adc99a4f/app/addons/documents/templates/advanced_options.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/advanced_options.html b/app/addons/documents/templates/advanced_options.html
index 439e864..c986d4e 100644
--- a/app/addons/documents/templates/advanced_options.html
+++ b/app/addons/documents/templates/advanced_options.html
@@ -101,10 +101,10 @@ the License.
</div>
</div>
<div class="row-fluid">
- <% if (showPreview) { %>
+ <% if (showStale) { %>
<div class="span6">
<div class="checkbox inline">
- <input id="check7" name="stale" type="checkbox" value="true">
+ <input id="check7" name="stale" type="checkbox" value="ok">
<label for="check7">Stale</label>
</div>
</div>
@@ -147,10 +147,6 @@ the License.
<% } %>
</div>
-
-
-
-
<div class="controls-group">
<div id="button-options" class="controls controls-row">
<button type="submit" class="btn btn-success">Query</button>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/adc99a4f/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index 97f82b4..4e7459a 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -592,7 +592,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
toggleTrash: function () {
var $bulkdDeleteButton = this.$('.js-bulk-delete');
- if (this.bulkDeleteDocsCollection.length > 0) {
+ if (this.bulkDeleteDocsCollection && this.bulkDeleteDocsCollection.length > 0) {
$bulkdDeleteButton.removeClass('disabled');
} else {
$bulkdDeleteButton.addClass('disabled');
@@ -1016,18 +1016,8 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
this.viewName = options.viewName;
this.updateViewFn = options.updateViewFn;
this.previewFn = options.previewFn;
-
- if (typeof(options.hasReduce) === 'undefined') {
- this.hasReduce = true;
- } else {
- this.hasReduce = options.hasReduce;
- }
-
- /*if (typeof(options.showPreview) === 'undefined') {
- this.showPreview = true;
- } else {
- this.showPreview = options.showPreview;
- }*/
+ this.showStale = _.isUndefined(options.showStale) ? false : options.showStale;
+ this.hasReduce = _.isUndefined(options.hasReduce) ? true : options.hasReduce;
},
events: {
@@ -1253,7 +1243,8 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
serialize: function () {
return {
hasReduce: this.hasReduce,
- showPreview: false
+ showPreview: false,
+ showStale: this.showStale
};
}
});
@@ -1735,7 +1726,8 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
viewName: this.viewName,
ddocName: this.model.id,
hasReduce: this.hasReduce(),
- eventer: this.eventer
+ eventer: this.eventer,
+ showStale: true
}));
}
[13/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: fix build
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0ec46e9f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0ec46e9f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0ec46e9f
Branch: refs/heads/master
Commit: 0ec46e9fe758190e3e4599bce1889d3879470966
Parents: 5893a97
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Wed Jul 2 16:38:14 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Wed Jul 2 16:38:14 2014 +0200
----------------------------------------------------------------------
readme.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0ec46e9f/readme.md
----------------------------------------------------------------------
diff --git a/readme.md b/readme.md
index dc36a17..4db17a0 100644
--- a/readme.md
+++ b/readme.md
@@ -21,8 +21,7 @@ A recent of [node.js](http://nodejs.org/) and npm is required.
### Dev Server
Using the dev server is the easiest way to use fauxton, specially when
-developing for it. Copy or symlink the `settings.json.default` (or the
-`settings.json.dev` file if you'd like to see the `styletests` addon).
+developing for it. Copy or symlink the `settings.json.default` file if you'd like to see the `styletests` addon).
And then...
[08/13] fauxton commit: updated refs/heads/master to 0ec46e9
Posted by kx...@apache.org.
Fauxton: updated dev dependancies
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/78963400
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/78963400
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/78963400
Branch: refs/heads/master
Commit: 78963400d91251d13f7c410a59e49721e62b332c
Parents: c8d110c
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Jun 25 15:56:34 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Jun 25 15:57:25 2014 +0200
----------------------------------------------------------------------
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/78963400/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index fd5e3d3..d84c881 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,9 @@
"grunt-contrib-clean": "~0.4.1",
"grunt-contrib-jshint": "~0.6.0",
"grunt-contrib-concat": "~0.3.0",
- "grunt-contrib-less": "~0.5.0",
+ "grunt-contrib-less": "~0.11.0",
"grunt-contrib-jst": "~0.5.0",
- "grunt-contrib-watch": "~0.4.4",
+ "grunt-contrib-watch": "~0.6.1",
"grunt-contrib-uglify": "~0.2.0",
"grunt-contrib-copy": "~0.4.1",
"grunt-couchapp": "~0.1.0",