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 2017/02/14 07:54:08 UTC
[1/5] fauxton commit: updated refs/heads/master to 61c2681
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 7e7e774e5 -> 61c268132
Override CouchDB port
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/09678c20
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/09678c20
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/09678c20
Branch: refs/heads/master
Commit: 09678c208e5637d184d6ebac444cf535d53ad1de
Parents: 7e7e774
Author: Garren Smith <ga...@gmail.com>
Authored: Sun Feb 12 14:24:07 2017 -0500
Committer: Garren Smith <ga...@gmail.com>
Committed: Sun Feb 12 14:24:07 2017 -0500
----------------------------------------------------------------------
devserver.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/09678c20/devserver.js
----------------------------------------------------------------------
diff --git a/devserver.js b/devserver.js
index 9be142a..c8d0ffc 100644
--- a/devserver.js
+++ b/devserver.js
@@ -16,7 +16,7 @@ var loadSettings = function () {
port: process.env.FAUXTON_PORT || 8000,
contentSecurityPolicy: true,
proxy: {
- target: 'http://127.0.0.1:5984',
+ target: process.env.COUCH_HOST || 'http://127.0.0.1:5984',
changeOrigin: false
}
};
[2/5] fauxton commit: updated refs/heads/master to 61c2681
Posted by ga...@apache.org.
set expose-loader to specific version
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/275fd913
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/275fd913
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/275fd913
Branch: refs/heads/master
Commit: 275fd913f94657f59f75989b1e1df6ec4247dda8
Parents: 09678c2
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Feb 14 11:47:12 2017 +0400
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Feb 14 11:47:12 2017 +0400
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/275fd913/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 70589df..49823f1 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"eslint-loader": "^1.3.0",
"eslint-plugin-react": "^6.7.1",
"exports-loader": "^0.6.2",
- "expose-loader": "^0.7.1",
+ "expose-loader": "0.7.1",
"express": "^4.14.1",
"file-loader": "^0.10.0",
"flux": "^3.1.0",
[3/5] fauxton commit: updated refs/heads/master to 61c2681
Posted by ga...@apache.org.
Fix config addon
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/1cdd4354
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/1cdd4354
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/1cdd4354
Branch: refs/heads/master
Commit: 1cdd4354b08ee02df1374a16d699ad8e79f7c188
Parents: 275fd91
Author: root <ro...@localhost.localdomain>
Authored: Fri Feb 10 20:52:47 2017 +0000
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Feb 14 11:48:46 2017 +0400
----------------------------------------------------------------------
app/addons/config/routes.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1cdd4354/app/addons/config/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/config/routes.js b/app/addons/config/routes.js
index 4b19238..40bf076 100644
--- a/app/addons/config/routes.js
+++ b/app/addons/config/routes.js
@@ -10,6 +10,7 @@
// License for the specific language governing permissions and limitations under
// the License.
+import React from 'react';
import FauxtonAPI from "../../core/api";
import Config from "./resources";
import CORSActions from "../cors/actions";
@@ -49,7 +50,7 @@ var ConfigPerNodeRouteObject = FauxtonAPI.RouteObject.extend({
'_config/:node/cors': 'configCorsForNode'
},
- initialize: function (_a, _b, options) {
+ initialize: function (_a, options) {
var node = options[0];
this.configs = new Config.ConfigModel({ node: node });
[5/5] fauxton commit: updated refs/heads/master to 61c2681
Posted by ga...@apache.org.
remove layout in routeObjects
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/61c26813
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/61c26813
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/61c26813
Branch: refs/heads/master
Commit: 61c26813204122b7a26d8ebc1a218c02e9cd14a6
Parents: 46831b8
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Feb 14 11:53:43 2017 +0400
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Feb 14 11:53:43 2017 +0400
----------------------------------------------------------------------
app/addons/auth/routes.js | 3 ---
app/addons/config/routes.js | 2 --
app/addons/databases/routes.js | 1 -
app/addons/documentation/routes.js | 1 -
app/addons/documents/routes-mango.js | 1 -
app/addons/documents/shared-routes.js | 1 -
6 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/61c26813/app/addons/auth/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/auth/routes.js b/app/addons/auth/routes.js
index 4d40f98..36e547d 100644
--- a/app/addons/auth/routes.js
+++ b/app/addons/auth/routes.js
@@ -22,8 +22,6 @@ import {AuthLayout, AdminLayout} from './layout';
const {LoginForm, CreateAdminForm} = Components;
var AuthRouteObject = FauxtonAPI.RouteObject.extend({
- layout: 'empty',
-
routes: {
'login?*extra': 'login',
'login': 'login',
@@ -63,7 +61,6 @@ var AuthRouteObject = FauxtonAPI.RouteObject.extend({
var UserRouteObject = FauxtonAPI.RouteObject.extend({
- layout: 'empty',
hideNotificationCenter: true,
hideApiBar: true,
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/61c26813/app/addons/config/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/config/routes.js b/app/addons/config/routes.js
index 40bf076..892a25b 100644
--- a/app/addons/config/routes.js
+++ b/app/addons/config/routes.js
@@ -36,8 +36,6 @@ var ConfigDisabledRouteObject = FauxtonAPI.RouteObject.extend({
var ConfigPerNodeRouteObject = FauxtonAPI.RouteObject.extend({
- layout: 'empty',
-
roles: ['_admin'],
selectedHeader: 'Config',
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/61c26813/app/addons/databases/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/routes.js b/app/addons/databases/routes.js
index 6870379..377310a 100644
--- a/app/addons/databases/routes.js
+++ b/app/addons/databases/routes.js
@@ -17,7 +17,6 @@ import Databases from "./resources";
import Layout from './layout';
const AllDbsRouteObject = FauxtonAPI.RouteObject.extend({
- layout: 'empty',
hideApiBar: true,
hideNotificationCenter: true,
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/61c26813/app/addons/documentation/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documentation/routes.js b/app/addons/documentation/routes.js
index 7c3dbca..41b6298 100644
--- a/app/addons/documentation/routes.js
+++ b/app/addons/documentation/routes.js
@@ -17,7 +17,6 @@ import {OnePaneSimpleLayout} from '../components/layouts';
var DocumentationRouteObject = FauxtonAPI.RouteObject.extend({
selectedHeader: 'Documentation',
- layout: 'empty',
hideApiBar: true,
hideNotificationCenter: true,
routes: {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/61c26813/app/addons/documents/routes-mango.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-mango.js b/app/addons/documents/routes-mango.js
index 16b8db6..3a90906 100644
--- a/app/addons/documents/routes-mango.js
+++ b/app/addons/documents/routes-mango.js
@@ -23,7 +23,6 @@ import SidebarActions from "./sidebar/actions";
import {MangoLayout} from './mangolayout';
const MangoIndexEditorAndQueryEditor = FauxtonAPI.RouteObject.extend({
- layout: 'empty',
hideApiBar: true,
hideNotificationCenter: true,
routes: {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/61c26813/app/addons/documents/shared-routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/shared-routes.js b/app/addons/documents/shared-routes.js
index 01e3500..141f11a 100644
--- a/app/addons/documents/shared-routes.js
+++ b/app/addons/documents/shared-routes.js
@@ -21,7 +21,6 @@ import QueryActions from './queryoptions/actions';
// The Documents section is built up a lot of different route object which share code. This contains
// base functionality that can be used across routes / addons
var BaseRoute = FauxtonAPI.RouteObject.extend({
- layout: 'empty',
selectedHeader: 'Databases',
createDesignDocsCollection: function () {
[4/5] fauxton commit: updated refs/heads/master to 61c2681
Posted by ga...@apache.org.
Bump grunt-contrib-copy to 1.0.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/46831b8b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/46831b8b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/46831b8b
Branch: refs/heads/master
Commit: 46831b8bd44aa84374841331eed326c96b9f4578
Parents: 1cdd435
Author: Sergii Korobkov <sk...@dinkor.net>
Authored: Fri Feb 10 21:31:13 2017 +0000
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Feb 14 11:48:46 2017 +0400
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/46831b8b/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 49823f1..5b56d0d 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
"grunt": "~1.0.1",
"grunt-cli": "~1.2.0",
"grunt-contrib-clean": "~1.0.0",
- "grunt-contrib-copy": "~0.4.1",
+ "grunt-contrib-copy": "~1.0.0",
"grunt-couchapp": "~0.2.1",
"grunt-exec": "~1.0.1",
"grunt-md5": "^0.1.11",