fauxton commit: updated refs/heads/master to 2e770d6

2016-12-23 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 2a3dccaf4 -> 2e770d66b


rip and replace zeroclipboard with clipboardjs

PR: #825
PR-URL: https://github.com/apache/couchdb-fauxton/pull/825
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2e770d66
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2e770d66
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2e770d66

Branch: refs/heads/master
Commit: 2e770d66b2b849a60468ad390dfed57da54561a9
Parents: 2a3dcca
Author: Ryan Millay 
Authored: Mon Dec 19 15:38:11 2016 -0500
Committer: Robert Kowalski 
Committed: Fri Dec 23 17:39:30 2016 +0100

--
 .../activetasks/assets/less/activetasks.less|  45 --
 app/addons/activetasks/components.react.jsx |  62 +
 app/addons/components/__tests__/copy.test.js|  39 ++
 app/addons/components/components/apibar.js  |  15 +-
 app/addons/components/components/copy.js| 100 ++
 .../components/react-components.react.jsx   |   4 +-
 .../tests/nightwatch/copyToClipboard.js |  92 +
 .../tests/nightwatch/deletesDatabase.js |   2 +
 .../nightwatch/deletesDatabaseSpecialChars.js   |   3 +-
 .../documents/changes/components.react.jsx  |  15 +-
 .../designdocinfo/components.react.jsx  |  11 +-
 .../index-results.components.react.jsx  |  12 +-
 app/addons/fauxton/assets/less/components.less  |   9 +-
 app/addons/fauxton/components.react.jsx | 136 +--
 .../notifications/notifications.react.jsx   |   8 +-
 .../fauxton/tests/componentsSpec.react.jsx  |  19 ---
 assets/less/notification-center.less|   5 +-
 jest-setup.js   |   1 -
 package.json|   5 +-
 19 files changed, 282 insertions(+), 301 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2e770d66/app/addons/activetasks/assets/less/activetasks.less
--
diff --git a/app/addons/activetasks/assets/less/activetasks.less 
b/app/addons/activetasks/assets/less/activetasks.less
index cad281c..9c9 100644
--- a/app/addons/activetasks/assets/less/activetasks.less
+++ b/app/addons/activetasks/assets/less/activetasks.less
@@ -141,51 +141,6 @@
   color: @brandPrimaryDark;
 }
   }
-
-  .view-source-sequence-btn { // "View" Button
-background-color: #999;
-display: inline;
-border-radius: 3px;
-padding: 2px;
-margin: 3px;
-color: #fff !important;
-white-space: nowrap;
-  }
-
-  .view-source-sequence-tray {
-padding: 16px 20px 28px;
-
-position: relative;
-min-width: 365px;
-top: 15px;
-float: right;
-
-&:before {
-  right: 110px;
-}
-input.input-xxlarge {
-  margin-bottom: 0px;
-  width: 250px;
-  .border-radius(5px 0 0 5px);
-}
-
-a.btn {
-  color: white;
-  background-color: @linkColor;
-  margin-left: 0;
-  line-height: 1.5em;
-  border: 0px;
-  padding: 10px 10px 9px;
-  font-size: 14px;
-  .border-radius(0 5px 5px 0);
-
-
-  &:hover, &.copy-button.zeroclipboard-is-hover {
-background-color: #cbcbcb;
-color: white;
-  }
-}
-  }
 }
 
 .active-tasks__polling-wrapper {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2e770d66/app/addons/activetasks/components.react.jsx
--
diff --git a/app/addons/activetasks/components.react.jsx 
b/app/addons/activetasks/components.react.jsx
index f739823..33c6c4c 100644
--- a/app/addons/activetasks/components.react.jsx
+++ b/app/addons/activetasks/components.react.jsx
@@ -365,71 +365,12 @@ var ActiveTaskTableBodyContents = React.createClass({
 {startedOnMsg}
 {updatedOnMsg}
 {rowData.pid}
-{progressMsg}
+{progressMsg}
   
 );
   }
 });
 
-var ActiveTasksViewSourceSequence = React.createClass({
-  getInitialState () {
-return {
-  contentVisible: false
-};
-  },
-
-  toggleTray (e) {
-e.preventDefault();
-this.setState({contentVisible: !this.state.contentVisible});
-  },
-
-  closeTray () {
-this.setState({contentVisible: false});
-  },
-
-  sequences (item) {
-if (_.isNumber(item) || _.isString(item)) {
-  return  
{}} textToCopy={item.toString()} uniqueKey={item.toString()}/>;
-}
-
-if (_.isArray(item)) {
-  return _.map(item, function (seq, i) {
-  return  {}} textToCopy={seq.toString()} uniqueKey={`${i + Math.random(100)}`} 
key={i}/>;
-});
-}
-
-return   {}} uniqueKey='unknownRevision'/>;
-  },
-
-  render () {
-if (!

[2/2] fauxton commit: updated refs/heads/master to 1e5e856

2016-12-14 Thread robertkowalski
don't throw if permissions addon isn't loaded

PR: #822
PR-URL: https://github.com/apache/couchdb-fauxton/pull/822
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a8292a4c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a8292a4c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a8292a4c

Branch: refs/heads/master
Commit: a8292a4cdc72f2f735fa85ab3b50f3a361e16d2f
Parents: 25630f4
Author: Robert Kowalski 
Authored: Wed Dec 14 15:15:06 2016 +0100
Committer: Robert Kowalski 
Committed: Wed Dec 14 15:43:18 2016 +0100

--
 app/main.js | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a8292a4c/app/main.js
--
diff --git a/app/main.js b/app/main.js
index 7f092da..5cf474a 100644
--- a/app/main.js
+++ b/app/main.js
@@ -57,11 +57,19 @@ $(document).on("click", "a:not([data-bypass])", function 
(evt) {
   }
 });
 
+function getReducers (r) {
 
-const reducer = FauxtonAPI.reducers.reduce((el, acc) => {
-  acc[el] = el;
-  return acc;
-}, {});
+  if (!r.length) {
+return function () {};
+  }
+
+  return FauxtonAPI.reducers.reduce((el, acc) => {
+acc[el] = el;
+return acc;
+  }, {});
+}
+
+const reducer = getReducers(FauxtonAPI.reducers);
 
 const middlewares = [thunk];
 



[1/2] fauxton commit: updated refs/heads/master to 1e5e856

2016-12-14 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 25630f4e4 -> 1e5e8567f


update redux

PR: #822
PR-URL: https://github.com/apache/couchdb-fauxton/pull/822
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/1e5e8567
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/1e5e8567
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/1e5e8567

Branch: refs/heads/master
Commit: 1e5e8567f649cccefc98b040229f1ae8fb9674f9
Parents: a8292a4
Author: Robert Kowalski 
Authored: Wed Dec 14 15:15:28 2016 +0100
Committer: Robert Kowalski 
Committed: Wed Dec 14 15:43:18 2016 +0100

--
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1e5e8567/package.json
--
diff --git a/package.json b/package.json
index bcd4fcb..8656fc7 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
 "react-addons-css-transition-group": "~15.4.1",
 "react-bootstrap": "^0.30.7",
 "react-dom": "~15.4.1",
-"react-redux": "^4.4.5",
+"react-redux": "^5.0.0",
 "react-select": "1.0.0-rc.2",
 "redux": "^3.6.0",
 "redux-thunk": "^2.1.0",



fauxton commit: updated refs/heads/master to 25630f4

2016-12-13 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 258ec71fb -> 25630f4e4


Redux: Permissions - Use Redux for Flux flow

Integrates Redux into CouchDB Fauxton to softmigrate our stores
to Redux. Removes the Backbone models and introduces testing with
Jest.

Additional Highlights:

 - Bluebird for Promises (bye jQuery deferreds)
 - uses the WHATWG fetch API
 - 1 file per component


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/25630f4e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/25630f4e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/25630f4e

Branch: refs/heads/master
Commit: 25630f4e48a55e983ea6aff095b034cc2a728251
Parents: 258ec71
Author: Robert Kowalski 
Authored: Thu Nov 3 15:09:51 2016 +0100
Committer: Robert Kowalski 
Committed: Mon Dec 12 17:56:52 2016 +0100

--
 .eslintrc   |   3 +-
 __mocks__/fileMock.js   |   1 +
 __mocks__/styleMock.js  |   1 +
 .../permissions/__tests__/actions-test.js   | 112 +
 .../permissions/__tests__/container-test.js |  57 +
 .../permissions/__tests__/helpers-test.js   |  84 +++
 .../__tests__/permissionsScreen-test.js |  97 
 app/addons/permissions/actions.js   | 132 +++
 app/addons/permissions/actiontypes.js   |   8 +-
 app/addons/permissions/base.js  |   3 +
 app/addons/permissions/components.react.jsx | 234 ---
 .../permissions/components/Permissions.js   |  48 
 .../permissions/components/PermissionsItem.js   |  36 +++
 .../permissions/components/PermissionsScreen.js |  85 +++
 .../components/PermissionsSection.js| 163 +
 .../container/PermissionsContainer.js   |  40 
 app/addons/permissions/helpers.js   |  39 
 app/addons/permissions/layout.js|   4 +-
 app/addons/permissions/reducers.js  |  67 ++
 app/addons/permissions/resources.js |  83 ---
 app/addons/permissions/routes.js|  34 +--
 app/addons/permissions/stores.js| 104 -
 app/addons/permissions/tests/actionsSpec.js | 122 --
 .../permissions/tests/componentsSpec.react.jsx  | 135 ---
 .../permissions/tests/nightwatch/permissions.js |  40 
 app/addons/permissions/tests/resourceSpec.js|  69 --
 app/core/base.js|   2 +
 app/helpers.js  |   1 +
 app/main.js |  23 +-
 jest-config.json|  12 +-
 jest-setup.js   |  18 ++
 package.json|  10 +-
 32 files changed, 1042 insertions(+), 825 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/25630f4e/.eslintrc
--
diff --git a/.eslintrc b/.eslintrc
index 0b5439d..c642ec6 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -73,7 +73,8 @@
 "after": true,
 "define": true,
 "expect": true,
-"prettyPrint": true
+"prettyPrint": true,
+"jest": true
   }
 
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/25630f4e/__mocks__/fileMock.js
--
diff --git a/__mocks__/fileMock.js b/__mocks__/fileMock.js
new file mode 100644
index 000..86059f3
--- /dev/null
+++ b/__mocks__/fileMock.js
@@ -0,0 +1 @@
+module.exports = 'test-file-stub';

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/25630f4e/__mocks__/styleMock.js
--
diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js
new file mode 100644
index 000..f053ebf
--- /dev/null
+++ b/__mocks__/styleMock.js
@@ -0,0 +1 @@
+module.exports = {};

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/25630f4e/app/addons/permissions/__tests__/actions-test.js
--
diff --git a/app/addons/permissions/__tests__/actions-test.js 
b/app/addons/permissions/__tests__/actions-test.js
new file mode 100644
index 000..5f74223
--- /dev/null
+++ b/app/addons/permissions/__tests__/actions-test.js
@@ -0,0 +1,112 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on 

[1/2] fauxton commit: updated refs/heads/master to a231a4e

2016-12-08 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 2cec2e4d9 -> a231a4e4a


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a231a4e4/app/addons/styletests/styletests.react.jsx
--
diff --git a/app/addons/styletests/styletests.react.jsx 
b/app/addons/styletests/styletests.react.jsx
deleted file mode 100644
index bbb3049..000
--- a/app/addons/styletests/styletests.react.jsx
+++ /dev/null
@@ -1,525 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy 
of
-// the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations 
under
-// the License.
-
-
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy 
of
-// the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations 
under
-// the License.
-
-import app from "app";
-import FauxtonAPI from "api";
-import React from "react";
-
-
-var StyleTests = React.createClass({
-
-  render: function () {
-return (
-  
-
-
-  Fauxton Style Guide mostly made of Bootstrap 
2.x
-  (Mostly) Standard Bootstrap styles customized for Fauxton.
-
-
-
-  Typography
-
-h1. Heading 1
-h2. Heading 2
-h3. Heading 3
-h4. Heading 4
-h5. Heading 5
-h6. Heading 6
-
-
-  Buttons
-
-
-Bootstrap Standard Button className names
-.btn.btn-large.btn-*
-  Default
-  Primary
-  Success
-  Info
-  Warning
-  Danger
-  Link
-
-.btn.btn-*
-  Default
-  Primary
-  Success
-  Info
-  Warning
-  Danger
-  Link
-
-.btn.btn-small.btn-*
-  Default
-  Primary
-  Success
-  Info
-  Warning
-  Danger
-  Link
-
-.btn.btn-mini.btn-*
-  Default
-  Primary
-  Success
-  Info
-  Warning
-  Danger
-  Link
-
-
-with Icons
-.btn.btn-large.btn-*
-   Default
-   Primary
-   Success
-   Info
-   Warning
-   Danger
-   Link
-
-
-.btn.btn-*
-   Default
-   Primary
-   Success
-   Info
-   Warning
-   Danger
-   Link
-
-.btn.btn-small.btn-*
-   Default
-   Primary
-   Success
-   Info
-   Warning
-   Danger
-   Link
-
-.btn.btn-mini.btn-*
-   Default
-   Primary
-   Success
-   Info
-   Warning
-   Danger
-   Link
-
-
-just Icons
-.btn.btn-large.btn-*
-  
-  
-  
-  
-  
-  
-  
-
-
-.btn.btn-*
-  
-  
-  
-  
-  
-  
-  
-
-.btn.btn-small.btn-*
-  
-  
-  
-  
-  
-  
-  
-
-.btn.btn-mini.btn-*
-  
-  
-  
-  
-  
-  
-  
-
-.btn-group
-  
-Edit design doc
-
-  
-
-
-disabled
-.btn.btn-*
-   Default
-   Primary
-   Success
-   Info
-   Warning
-   Danger
-   Link
-
-.btn.btn-*
-  Default
-  Primary
-  Success
-  Info
-  Warning
-  Danger
-  Link
-
-
-
-  Forms
-
-
-
-  
-
-
-  
-
-
-
-  
-
- Search
-  
-
-
-
-  
-
-Search
-  
-
-
-
-  
-Legend
-Label name
-
-Example block-level help text 
here.
-
-   Check me out
-

[2/2] fauxton commit: updated refs/heads/master to a231a4e

2016-12-08 Thread robertkowalski
Move to all React

This removes the last parts of backbone.layout manager. We now have a
single React entry point.

PR: #820
PR-URL: https://github.com/apache/couchdb-fauxton/pull/820
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a231a4e4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a231a4e4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a231a4e4

Branch: refs/heads/master
Commit: a231a4e4a0b6f55daf49c45753ae1c59de24a4a2
Parents: 2cec2e4
Author: Garren Smith 
Authored: Mon Dec 5 11:57:08 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Dec 8 11:16:01 2016 +0100

--
 .eslintrc   |   3 +-
 .travis.yml |   1 +
 Gruntfile.js|  58 +-
 app/addons/activetasks/routes.js|   5 +-
 app/addons/auth/routes.js   |  32 +-
 app/addons/cluster/routes.js|  18 +-
 app/addons/components/__tests__/polling.test.js | 107 
 app/addons/components/tests/pollingSpec.js  | 108 
 app/addons/config/routes.js |  29 +-
 app/addons/databases/routes.js  |   2 +-
 app/addons/documentation/routes.js  |  10 +-
 app/addons/documents/doc-editor/actions.js  |   2 +-
 .../documents/doc-editor/components.react.jsx   |   5 +-
 .../documents/index-editor/tests/actionsSpec.js |   1 -
 app/addons/documents/index-results/actions.js   |   8 +-
 .../index-results.components.react.jsx  |   6 +-
 .../tests/index-results.actionsSpec.js  |  24 +-
 app/addons/documents/layouts.js |   4 +-
 app/addons/documents/mangolayout.js |   8 +-
 app/addons/documents/resources.js   |   4 -
 app/addons/documents/routes-doc-editor.js   |  38 +-
 app/addons/documents/routes-documents.js|  63 +--
 app/addons/documents/routes-index-editor.js |  57 +-
 app/addons/documents/routes-mango.js|  46 +-
 app/addons/documents/sidebar/actions.js |   9 +-
 app/addons/documents/sidebar/actiontypes.js |   1 -
 app/addons/documents/sidebar/stores.react.jsx   |   4 +-
 .../documents/tests/nightwatch/cloneDoc.js  |   2 +-
 app/addons/fauxton/appwrapper.js|  71 +++
 app/addons/fauxton/base.js  |  14 -
 .../fauxton/navigation/components.react.jsx |   5 +-
 .../navigation/tests/componentsSpec.react.jsx   |  24 +-
 .../notifications/notifications.react.jsx   |  16 +-
 app/addons/permissions/routes.js|  18 +-
 .../replication/__tests__/helpers-tests.js  |  34 --
 .../replication/__tests__/helpers.tests.js  |  34 ++
 app/addons/replication/route.js |  33 +-
 app/addons/setup/route.js   |  60 +--
 app/addons/styletests/assets/img/ripley.jpeg| Bin 26384 -> 0 bytes
 app/addons/styletests/base.js   |  29 -
 app/addons/styletests/routes.js |  36 --
 app/addons/styletests/styletests.react.jsx  | 525 ---
 app/addons/verifyinstall/routes.js  |  15 +-
 app/app.js  |  39 --
 app/core/api.js |   8 +-
 app/core/auth.js|   1 +
 app/core/base.js|   2 +-
 app/core/couchdbSession.js  |   2 +
 app/core/layout.js  |  93 
 app/core/routeObject.js | 291 +-
 app/core/router.js  |  40 +-
 app/core/store.js   |   1 +
 app/core/tests/layoutSpec.js| 126 -
 app/core/tests/routeObjectSpec.js   | 244 -
 app/main.js |   6 +
 app/templates/layouts/empty.html|  15 -
 assets/index.underscore |  14 +-
 assets/less/templates.less  |   2 +-
 package.json|   3 +-
 tasks/addon/rename.json |   6 -
 tasks/addon/root/base.js.underscore |  27 -
 .../addon/root/components.react.jsx.underscore  |  36 --
 tasks/addon/root/resources.js.underscore|  21 -
 tasks/addon/root/routes.js.underscore   |  45 --
 tasks/addon/template.js |  68 ---
 test/dev.js |   2 +-
 test/runner.html|   1 -
 writing_addons.md   | 114 
 68 files changed, 523 insertions(+), 2253 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a231a4e4/.

documentation commit: updated refs/heads/master to fec0893

2016-11-30 Thread robertkowalski
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master c58e360bb -> fec089351


Document stable and update query parameters

CouchDB-3063 adds 2 new query parameters when querying views.
This commit adds API documentation for these and a note in the
performance guide around when to use them.

PR: #81
PR-URL: https://github.com/apache/couchdb-documentation/pull/81
Reviewed-By: Robert Newson 
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/fec08935
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/fec08935
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/fec08935

Branch: refs/heads/master
Commit: fec0893511dad132834835587e2ee8d5b89ab6a0
Parents: c58e360
Author: Will Holley 
Authored: Tue Oct 11 09:48:54 2016 +0100
Committer: Robert Kowalski 
Committed: Thu Dec 1 03:15:57 2016 +0100

--
 src/api/ddoc/views.rst  | 15 +--
 src/maintenance/performance.rst |  8 
 2 files changed, 21 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/fec08935/src/api/ddoc/views.rst
--
diff --git a/src/api/ddoc/views.rst b/src/api/ddoc/views.rst
index 2eace71..bd217b8 100644
--- a/src/api/ddoc/views.rst
+++ b/src/api/ddoc/views.rst
@@ -67,8 +67,14 @@
  `). Setting this to ``false`` offers a performance
  boost. The `total_rows` and `offset` fields are not available when this
  is set to ``false``. Default is ``true``
+:query boolean stable: Whether or not the view results should be returned
+ from a stable set of shards. Default is ``false``. *Optional*
 :query string stale: Allow the results from a stale view to be used.
-  Supported values: ``ok`` and ``update_after``. *Optional*
+  Supported values: ``ok``, ``update_after`` and ``false``.
+  ``ok`` is equivalent to ``stable=true&update=false``.
+  ``update_after`` is equivalent to ``stable=true&update=lazy``.
+  ``false`` is equivalent to ``stable=false&update=true``.
+  *Optional*
 :query json startkey: Return records starting with the specified key.
   *Optional*
 :query json start_key: Alias for `startkey` param
@@ -76,9 +82,13 @@
   document ID. Requires ``startkey`` to be specified for this to have any
   effect. *Optional*
 :query string start_key_doc_id: Alias for `startkey_docid` param
+:query string update: Whether or not the view in question should be updated
+ prior to responding to the user.
+ Supported values: ``true``, ``false``, ``lazy``.
+ Default is ``true``. *Optional*
 :query boolean update_seq: Response includes an ``update_seq`` value
   indicating which sequence id of the database the view reflects.
-  Default is ``false``
+  Default is ``false``.
 
 :>header Content-Type: - :mimetype:`application/json`
- :mimetype:`text/plain; charset=utf-8`
@@ -142,6 +152,7 @@
 .. versionchanged:: 1.6.0 added ``attachments`` and ``att_encoding_info``
 parameters
 .. versionchanged:: 2.0.0 added ``sorted`` parameter
+.. versionchanged:: 2.1.0 added ``stable`` and ``update`` parameters
 
 .. warning::
 Using the ``attachments`` parameter to include attachments in view results

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/fec08935/src/maintenance/performance.rst
--
diff --git a/src/maintenance/performance.rst b/src/maintenance/performance.rst
index 4e0eec3..ac2f08f 100644
--- a/src/maintenance/performance.rst
+++ b/src/maintenance/performance.rst
@@ -230,6 +230,14 @@ that will occur giving you a quick response and when views 
will be updated
 which will take a long time. (A 10 million document database took about 10
 minutes to load into CouchDB but about 4 hours to do view generation).
 
+In a cluster, "stale" requests are serviced by a fixed set of shards in order
+to present users with consistent results between requests. This comes with an
+availability trade-off - the fixed set of shards might not be the most
+responsive / available within the cluster. If you don't need this kind of
+consistency (e.g. your indexes are relatively static), you can tell CouchDB to
+use any available replica by specifying ``stable=false&update=false`` instead 
of
+``stale=ok``, or ``stable=false&update=lazy`` instead of 
``stale=update_after``.
+
 View information isn't replicated - it is rebuilt on each database so you
 can't do the view generation on a separate sever.
 



documentation commit: updated refs/heads/master to c58e360

2016-11-30 Thread robertkowalski
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 77b5d1d63 -> c58e360bb


Fixing type error

PR: #84
PR-URL: https://github.com/apache/couchdb-documentation/pull/84
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c58e360b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c58e360b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c58e360b

Branch: refs/heads/master
Commit: c58e360bb7bdf7e3f691aaf26bb7aa6029aba530
Parents: 77b5d1d
Author: Victor Palomo de Castro 
Authored: Thu Oct 20 18:06:48 2016 -0200
Committer: Robert Kowalski 
Committed: Thu Dec 1 03:14:44 2016 +0100

--
 src/whatsnew/2.0.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c58e360b/src/whatsnew/2.0.rst
--
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index 0ceaf5e..6640c7c 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -35,7 +35,7 @@ Version 2.0.0
   URL remains the same.
 * The new Mango Query Server provides a simple JSON-based way to perform 
CouchDB
   queries without JavaScript or MapReduce. Mango Queries have a similar 
indexing
-  speed advantage over JavaScript Quries than the Erlang Queries have (2x-10x
+  speed advantage over JavaScript Queries than the Erlang Queries have (2x-10x
   faster indexing depending on doc size and system configuration). We recommend
   all new apps start using Mango as a default. Further details are available
   in the :ref:`_find, _index and _explain API `.



documentation commit: updated refs/heads/master to 77b5d1d

2016-11-30 Thread robertkowalski
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 4810d1c63 -> 77b5d1d63


Tiny 127 address fix

Just removed a 0 to make the address more "normal"

PR: #85
PR-URL: https://github.com/apache/couchdb-documentation/pull/85
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/77b5d1d6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/77b5d1d6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/77b5d1d6

Branch: refs/heads/master
Commit: 77b5d1d6372c74515950f18e45930e9a7304db76
Parents: 4810d1c
Author: James Seigel 
Authored: Sat Oct 22 18:37:12 2016 -0600
Committer: Robert Kowalski 
Committed: Thu Dec 1 03:13:40 2016 +0100

--
 src/cluster/setup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/77b5d1d6/src/cluster/setup.rst
--
diff --git a/src/cluster/setup.rst b/src/cluster/setup.rst
index 0d97927..a956bd1 100644
--- a/src/cluster/setup.rst
+++ b/src/cluster/setup.rst
@@ -155,7 +155,7 @@ task. Luckily, CouchDB 2.0 comes with a convenient Cluster 
Setup Wizard
 as part of the Fauxton web administration interface.
 
 After installation and initial startup, visit Fauxton at
-``http://127.0.0.01:5984/_utils#setup``. You will be asked to set up
+``http://127.0.0.1:5984/_utils#setup``. You will be asked to set up
 CouchDB as a single-node instance or set up a cluster.
 
 When you click "setup cluster" on the other hand, you are asked for



documentation commit: updated refs/heads/master to 4810d1c

2016-11-30 Thread robertkowalski
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 74da74bda -> 4810d1c63


More command cleanup

PR: #86
PR-URL: https://github.com/apache/couchdb-documentation/pull/86
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/4810d1c6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/4810d1c6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/4810d1c6

Branch: refs/heads/master
Commit: 4810d1c631728b0cf8fecedf7fa289ba9bc78304
Parents: 74da74b
Author: James Seigel 
Authored: Sat Oct 22 20:35:47 2016 -0600
Committer: Robert Kowalski 
Committed: Thu Dec 1 03:12:35 2016 +0100

--
 src/cluster/setup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/4810d1c6/src/cluster/setup.rst
--
diff --git a/src/cluster/setup.rst b/src/cluster/setup.rst
index 6bea63a..0d97927 100644
--- a/src/cluster/setup.rst
+++ b/src/cluster/setup.rst
@@ -215,7 +215,7 @@ To add a node run these two commands:
 .. code-block:: bash
 
 curl -X POST -H "Content-Type: application/json" 
http://admin:password@127.0.0.1:5984/_cluster_setup -d '{"action": 
"enable_cluster", "bind_address":"0.0.0.0", "username": "admin", 
"password":"password", "port": 15984, "remote_node": "", 
"remote_current_user": "", "remote_current_password": 
"" }'
-curl -X POST -H "Content-Type: application/json" 
http://admin:password@127.0.0.1:5984/_cluster_setup -d '{"action": "add_node", 
"host":"", "port": "", "username": "garren", 
"password":"password"}' -H "Content-Type: application/json"
+curl -X POST -H "Content-Type: application/json" 
http://admin:password@127.0.0.1:5984/_cluster_setup -d '{"action": "add_node", 
"host":"", "port": "", "username": "admin", 
"password":"password"}'
 
 This will join the two nodes together.
 Keep running the above commands for each



documentation commit: updated refs/heads/master to 74da74b

2016-11-30 Thread robertkowalski
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 2993ccb86 -> 74da74bda


Fixed the transposition of the version or erlang

PR: #87
PR-URL: https://github.com/apache/couchdb-documentation/pull/87
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/74da74bd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/74da74bd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/74da74bd

Branch: refs/heads/master
Commit: 74da74bda7b4187f105cacaa848c7daaad19a179
Parents: 2993ccb
Author: James Seigel 
Authored: Sat Oct 22 21:46:52 2016 -0600
Committer: Robert Kowalski 
Committed: Thu Dec 1 03:10:46 2016 +0100

--
 src/install/unix.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/74da74bd/src/install/unix.rst
--
diff --git a/src/install/unix.rst b/src/install/unix.rst
index a1fc031..7da47ae 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -30,7 +30,7 @@ Dependencies
 
 You should have the following installed:
 
-* `Erlang OTP (>=R61B03, =<19.x) `_
+* `Erlang OTP (>=R16B03, =<19.x) `_
 * `ICU  `_
 * `OpenSSL  `_
 * `Mozilla SpiderMonkey (1.8.5) `_



[2/2] fauxton commit: updated refs/heads/master to ae5070b

2016-11-30 Thread robertkowalski
tests: add jest for testing

Adds Jest for testing. Right now it runs in parallel to our
old test setup.

The idea is that we can use the faster, simpler testing for all
new stuff and all refactored elements.

To run jest, simply run:

`npm run jest`

PR: #815
PR-URL: https://github.com/apache/couchdb-fauxton/pull/815
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/de6f4341
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/de6f4341
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/de6f4341

Branch: refs/heads/master
Commit: de6f43413b6db9e62ffd8746ca9a7333ceddd2f2
Parents: 14224ea
Author: Robert Kowalski 
Authored: Tue Nov 29 18:30:01 2016 +0100
Committer: Robert Kowalski 
Committed: Wed Nov 30 18:31:37 2016 +0100

--
 jest-config.json | 3 +++
 package.json | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/de6f4341/jest-config.json
--
diff --git a/jest-config.json b/jest-config.json
new file mode 100644
index 000..3321768
--- /dev/null
+++ b/jest-config.json
@@ -0,0 +1,3 @@
+{
+  "testPathDirs": ["app"]
+}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/de6f4341/package.json
--
diff --git a/package.json b/package.json
index 8f05189..09ed104 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
   "devDependencies": {
 "enzyme": "^2.4.1",
 "es5-shim": "4.5.4",
+"jest": "^17.0.3",
 "mocha": "~3.1.2",
 "mocha-loader": "^1.0.0",
 "mocha-phantomjs": 
"git+https://github.com/garrensmith/mocha-phantomjs.git";,
@@ -103,7 +104,8 @@
 "webpack:dev": "webpack --debug --progress --colors --config 
./webpack.config.dev.js",
 "webpack:test": "webpack --debug --progress --colors --config 
./webpack.config.test.js",
 "webpack:release": "webpack --debug --progress --colors --config 
./webpack.config.release.js",
-"test": "grunt test",
+"jest": "jest --config ./jest-config.json",
+"test": "npm run jest && grunt test",
 "phantomjs": "./node_modules/.bin/mocha-phantomjs --debug=false 
--ssl-protocol=sslv2 --web-security=false --ignore-ssl-errors=true 
./test/runner.html",
 "couchdebug": "grunt couchdebug",
 "couchdb": "grunt couchdb",



[1/2] fauxton commit: updated refs/heads/master to ae5070b

2016-11-30 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 14224ea7e -> ae5070b43


tests: port helperSpec to jest

our first jest based tests :)

PR: #815
PR-URL: https://github.com/apache/couchdb-fauxton/pull/815
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ae5070b4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ae5070b4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ae5070b4

Branch: refs/heads/master
Commit: ae5070b4338d05d15e30688f7b6bbc94bab20327
Parents: de6f434
Author: Robert Kowalski 
Authored: Tue Nov 29 18:31:05 2016 +0100
Committer: Robert Kowalski 
Committed: Wed Nov 30 18:31:37 2016 +0100

--
 .../replication/__tests__/helpers-tests.js  | 34 
 app/addons/replication/tests/helpersSpec.js | 41 
 2 files changed, 34 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ae5070b4/app/addons/replication/__tests__/helpers-tests.js
--
diff --git a/app/addons/replication/__tests__/helpers-tests.js 
b/app/addons/replication/__tests__/helpers-tests.js
new file mode 100644
index 000..0703f39
--- /dev/null
+++ b/app/addons/replication/__tests__/helpers-tests.js
@@ -0,0 +1,34 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations 
under
+// the License.
+
+import helpers from '../helpers';
+
+describe('Replication Helpers - getDatabaseLabel', () => {
+
+  it('returns database name for string', () => {
+const db = 'http://tester:testerpass@127.0.0.1/fancy/db/name';
+
+const res = helpers.getDatabaseLabel(db);
+
+expect(res).toBe('fancy/db/name');
+  });
+
+  it('returns database name for object', () => {
+const db = {
+  url: 'http://tester:testerpass@127.0.0.1/fancy'
+};
+
+const res = helpers.getDatabaseLabel(db);
+expect(res).toBe('fancy');
+  });
+
+});

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ae5070b4/app/addons/replication/tests/helpersSpec.js
--
diff --git a/app/addons/replication/tests/helpersSpec.js 
b/app/addons/replication/tests/helpersSpec.js
deleted file mode 100644
index 5e2b1c3..000
--- a/app/addons/replication/tests/helpersSpec.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy 
of
-// the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations 
under
-// the License.
-
-import utils from "../../../../test/mocha/testUtils";
-import helpers from '../helpers';
-const assert = utils.assert;
-
-describe('Replication Helpers', () => {
-
-  describe('getDatabaseLabel', () => {
-
-it('returns database name for string', () => {
-  const db = 'http://tester:testerpass@127.0.0.1/fancy/db/name';
-
-  const dbName = helpers.getDatabaseLabel(db);
-  assert.deepEqual('fancy/db/name', dbName);
-
-});
-
-it('returns database name for object', () => {
-  const db = {
-url: 'http://tester:testerpass@127.0.0.1/fancy'
-  };
-
-  const dbName = helpers.getDatabaseLabel(db);
-  assert.deepEqual('fancy', dbName);
-
-});
-
-  });
-
-});



[1/2] fauxton commit: updated refs/heads/master to e53deb5

2016-11-29 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master dd5eb4978 -> e53deb5d9


increase window size and login in wait time

this seems to make the test more stable

PR: #813
PR-URL: https://github.com/apache/couchdb-fauxton/pull/813
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e53deb5d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e53deb5d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e53deb5d

Branch: refs/heads/master
Commit: e53deb5d90fa7d6751bb753415dda5274a2b2cb5
Parents: 1aa4ca6
Author: Tim Pinington 
Authored: Sun Nov 27 21:56:36 2016 +
Committer: Robert Kowalski 
Committed: Tue Nov 29 15:27:33 2016 +0100

--
 test/nightwatch_tests/custom-commands/auth/loginToGUI.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e53deb5d/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
--
diff --git a/test/nightwatch_tests/custom-commands/auth/loginToGUI.js 
b/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
index 2eb1594..905b76f 100644
--- a/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
+++ b/test/nightwatch_tests/custom-commands/auth/loginToGUI.js
@@ -22,8 +22,9 @@ function LoginToGui (user, pw) {
   const password = pw || client.globals.test_settings.password;
 
   client
+.resizeWindow(1200, 1200)
 .url(baseUrl + '/#/login')
-.waitForElementPresent('a[href="#/login"]', waitTime, false)
+.waitForElementPresent('a[href="#/login"]', 5, false)
 .click('a[href="#/login"]')
 .waitForElementVisible('.couch-login-wrapper', waitTime, false)
 .waitForElementVisible('#username', waitTime, false)



[2/2] fauxton commit: updated refs/heads/master to e53deb5

2016-11-29 Thread robertkowalski
encodeding url path for database name with special characters

PR: #813
PR-URL: https://github.com/apache/couchdb-fauxton/pull/813
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/1aa4ca6f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/1aa4ca6f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/1aa4ca6f

Branch: refs/heads/master
Commit: 1aa4ca6f34a718c294a06a1301f39fe05f157a1c
Parents: dd5eb49
Author: Tim Pinington 
Authored: Thu Nov 24 00:16:46 2016 +
Committer: Robert Kowalski 
Committed: Tue Nov 29 15:27:33 2016 +0100

--
 app/addons/auth/base.js  |  8 
 app/addons/components/components/apibar.js   |  6 +++---
 app/addons/components/header-breadcrumbs.jsx |  2 +-
 app/addons/config/base.js|  2 +-
 .../databases/tests/nightwatch/specialCharListLinks.js   | 11 +--
 app/addons/documentation/base.js |  2 +-
 .../documentation/tests/nightwatch/checksDocsPage.js |  2 +-
 app/addons/documents/components/header-docs-left.jsx |  2 +-
 app/addons/documents/doc-editor/actions.js   |  4 ++--
 app/addons/documents/doc-editor/components.react.jsx |  4 ++--
 app/addons/documents/helpers.js  |  4 ++--
 app/addons/documents/mango/mango.components.react.jsx|  2 +-
 app/addons/documents/routes-doc-editor.js|  4 ++--
 app/addons/documents/sidebar/sidebar.react.jsx   | 10 +-
 .../documents/tests/nightwatch/navigateFromNewDoc.js |  8 
 .../fauxton/tests/nightwatch/notificationCenter.js   |  4 ++--
 .../replication/tests/nightwatch/replicationactivity.js  |  4 ++--
 app/addons/setup/base.js |  2 +-
 app/addons/verifyinstall/base.js |  2 +-
 app/core/api.js  | 11 +++
 app/core/utils.js|  6 ++
 test/nightwatch_tests/custom-commands/auth/loginToGUI.js |  6 +++---
 22 files changed, 57 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1aa4ca6f/app/addons/auth/base.js
--
diff --git a/app/addons/auth/base.js b/app/addons/auth/base.js
index 5956401..237a450 100644
--- a/app/addons/auth/base.js
+++ b/app/addons/auth/base.js
@@ -24,7 +24,7 @@ Auth.initialize = function () {
   FauxtonAPI.addHeaderLink({
 id: 'auth',
 title: 'Login',
-href: '#login',
+href: '#/login',
 icon: 'fonticon-user',
 bottomNav: true
   });
@@ -37,7 +37,7 @@ Auth.initialize = function () {
   link = {
 id: 'auth',
 title: 'Admin Party!',
-href: '#createAdmin',
+href: '#/createAdmin',
 icon: 'fonticon-user',
 bottomNav: true
   };
@@ -45,7 +45,7 @@ Auth.initialize = function () {
   link = {
 id: 'auth',
 title: session.user().name,
-href: '#changePassword',
+href: '#/changePassword',
 icon: 'fonticon-user',
 bottomNav: true
   };
@@ -64,7 +64,7 @@ Auth.initialize = function () {
   link = {
 id: 'auth',
 title: 'Login',
-href: '#login',
+href: '#/login',
 icon: 'fonticon-user',
 bottomNav: true
   };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1aa4ca6f/app/addons/components/components/apibar.js
--
diff --git a/app/addons/components/components/apibar.js 
b/app/addons/components/components/apibar.js
index c853cc8..6967852 100644
--- a/app/addons/components/components/apibar.js
+++ b/app/addons/components/components/apibar.js
@@ -56,7 +56,7 @@ export const APIBar = React.createClass({
 if (!this.props.contentVisible) {
   return null;
 }
-
+let endpoint = FauxtonAPI.url.decode(this.props.endpoint);
 return (
   
 
@@ -68,14 +68,14 @@ export const APIBar = React.createClass({
   
 
   
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1aa4ca6f/app/addons/components/header-breadcrumbs.jsx
--
diff --git a/app/addons/components/header-breadcrumbs.jsx 
b/app/addons/components/header-breadcrumbs.jsx
index 8c3cdef..40ffaaf 100644
--- a/app/addons/components/header-breadcrumbs.jsx
+++ b/app/addons/components/header-breadcrumbs.jsx
@@ -48,7 +48,7 @@ function getChildren (crumbs) {
 if (c.link) {
   res = [
 
-  {c.name}
+  {c.name}
 
   ];
 }


fauxton commit: updated refs/heads/master to 4924a1e

2016-11-21 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 5ffee6255 -> 4924a1e0f


Handle trailing question marks when building URLs for views

PR: #808
PR-URL: https://github.com/apache/couchdb-fauxton/pull/808
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/4924a1e0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/4924a1e0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/4924a1e0

Branch: refs/heads/master
Commit: 4924a1e0ff8636bc4ff10f7f3782bb89229fc9f9
Parents: 5ffee62
Author: Ryan Millay 
Authored: Wed Nov 16 15:49:15 2016 -0500
Committer: Robert Kowalski 
Committed: Mon Nov 21 17:26:50 2016 +0100

--
 app/addons/documents/resources.js   |  6 ++---
 app/addons/documents/tests/resourcesSpec.js | 33 
 2 files changed, 36 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/4924a1e0/app/addons/documents/resources.js
--
diff --git a/app/addons/documents/resources.js 
b/app/addons/documents/resources.js
index 270ee88..4c182cd 100644
--- a/app/addons/documents/resources.js
+++ b/app/addons/documents/resources.js
@@ -488,13 +488,13 @@ Documents.IndexCollection = PagingCollection.extend({
 
 if (params) {
   if (!_.isEmpty(params)) {
-query = "?" + $.param(params);
+query = $.param(params);
   } else {
 query = '';
   }
 } else if (this.params) {
   var parsedParam = Documents.QueryParams.stringify(this.params);
-  query = "?" + $.param(parsedParam);
+  query = $.param(parsedParam);
 }
 
 if (!context) {
@@ -506,7 +506,7 @@ Documents.IndexCollection = PagingCollection.extend({
 view = app.utils.safeURLName(this.view),
 url = FauxtonAPI.urls('view', context, database, design, view);
 
-return url + query;
+return (url.indexOf("?") > -1) ? `${url}&${query}` : `${url}?${query}`;
   },
 
   url: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/4924a1e0/app/addons/documents/tests/resourcesSpec.js
--
diff --git a/app/addons/documents/tests/resourcesSpec.js 
b/app/addons/documents/tests/resourcesSpec.js
index 661209b..524a760 100644
--- a/app/addons/documents/tests/resourcesSpec.js
+++ b/app/addons/documents/tests/resourcesSpec.js
@@ -9,6 +9,7 @@
 // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 // License for the specific language governing permissions and limitations 
under
 // the License.
+import app from "../../../app";
 import FauxtonAPI from "../../../core/api";
 import Models from "../resources";
 import testUtils from "../../../../test/mocha/testUtils";
@@ -460,5 +461,37 @@ describe('Bulk Delete', function () {
 
   });
 
+});
+
+// this should stay at the bottom due to manipulating the 'view' urls.  
otherwise, update this to restore them.
+describe('IndexCollection', function () {
+  var collection;
+
+  beforeEach(function () {
+FauxtonAPI.registerUrls('view', {
+  testWithTrailingQuestion: function (database, designDoc, viewName) {
+return app.host + '/' + database + '/_design/' + designDoc + '/_view/' 
+ viewName + "?bogusParam=foo";
+  }
+});
+collection = new Models.IndexCollection([{
+  id:'myId1',
+  doc: 'num1'
+},
+{
+  id:'myId2',
+  doc: 'num2'
+}], {
+  database: {id: 'databaseId', safeID: function () { return this.id; }},
+  design: '_design/myDoc'
+});
+  });
+
+  it('creates the right url with correct params when trailing question mark', 
() => {
+
assert.ok(/\?bogusParam=foo&limit=20&reduce=false/.test(collection.urlRef('testWithTrailingQuestion')));
+  });
+
+  it('creates the right url with correct params without trailing question 
mark', () => {
+assert.ok(/\?limit=20&reduce=false/.test(collection.urlRef()));
+  });
 
 });



documentation commit: updated refs/heads/master to 2993ccb

2016-11-17 Thread robertkowalski
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 52a2879fa -> 2993ccb86


Spelling error fix: fauxuton to fauxton

PR: #89
PR-URL: https://github.com/apache/couchdb-documentation/pull/89
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/2993ccb8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/2993ccb8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/2993ccb8

Branch: refs/heads/master
Commit: 2993ccb86f9ec685a183807a54f044d42fb18592
Parents: 52a2879
Author: bebo_sudo 
Authored: Thu Nov 17 16:16:27 2016 +0100
Committer: Robert Kowalski 
Committed: Thu Nov 17 16:29:53 2016 +0100

--
 src/intro/tour.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/2993ccb8/src/intro/tour.rst
--
diff --git a/src/intro/tour.rst b/src/intro/tour.rst
index 293512f..c7de430 100644
--- a/src/intro/tour.rst
+++ b/src/intro/tour.rst
@@ -158,13 +158,13 @@ Welcome to Fauxton
 ==
 
 After having seen CouchDB's raw API, let's get our feet wet by playing with
-Fauxuton, the built-in administration interface. Fauxuton provides full access
+Fauxton, the built-in administration interface. Fauxton provides full access
 to all of CouchDB's features and makes it easy to work with some of the more
 complex ideas involved. With Fauxton we can create and destroy databases; view
 and edit documents; compose and run MapReduce views; and trigger replication
 between databases.
 
-To load Fauxuton in your browser, visit::
+To load Fauxton in your browser, visit::
 
 http://127.0.0.1:5984/_utils/
 



fauxton commit: updated refs/heads/master to 757b44b

2016-11-17 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master ff25441bc -> 757b44b0c


travis: its node_js, not node


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/757b44b0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/757b44b0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/757b44b0

Branch: refs/heads/master
Commit: 757b44b0c1dba88f55b228345c593cf9f2d07331
Parents: ff25441
Author: Robert Kowalski 
Authored: Thu Nov 17 15:55:03 2016 +0100
Committer: Robert Kowalski 
Committed: Thu Nov 17 15:55:03 2016 +0100

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/757b44b0/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index e9677d3..3330164 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-language: node
+language: node_js
 node_js:
- 6
 sudo: required



fauxton commit: updated refs/heads/master to b245c6d

2016-11-15 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 89f57a453 -> b245c6d20


db-list: expose elements to make them reusable

PR: #806
PR-URL: https://github.com/apache/couchdb-fauxton/pull/806
Reviewed-By: Ryan Millay


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b245c6d2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b245c6d2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b245c6d2

Branch: refs/heads/master
Commit: b245c6d20376fd29159004b792dcea42639bcf00
Parents: 89f57a4
Author: Robert Kowalski 
Authored: Fri Nov 11 16:57:42 2016 +0100
Committer: Robert Kowalski 
Committed: Tue Nov 15 15:00:19 2016 +0100

--
 app/addons/databases/components.react.jsx | 16 +++-
 app/addons/databases/stores.js|  7 ---
 2 files changed, 15 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b245c6d2/app/addons/databases/components.react.jsx
--
diff --git a/app/addons/databases/components.react.jsx 
b/app/addons/databases/components.react.jsx
index 5e58681..849f284 100644
--- a/app/addons/databases/components.react.jsx
+++ b/app/addons/databases/components.react.jsx
@@ -296,14 +296,17 @@ var DatabasePagination = React.createClass({
 
   getDefaultProps: function () {
 return {
-  linkPath: '_all_dbs'
+  linkPath: '_all_dbs',
+  store: databasesStore
 };
   },
 
   getStoreState: function () {
+const {store} = this.props;
+
 return {
-  totalAmountOfDatabases: databasesStore.getTotalAmountOfDatabases(),
-  page: databasesStore.getPage()
+  totalAmountOfDatabases: store.getTotalAmountOfDatabases(),
+  page: store.getPage()
 };
   },
 
@@ -312,11 +315,14 @@ var DatabasePagination = React.createClass({
   },
 
   componentDidMount: function () {
-databasesStore.on('change', this.onChange, this);
+const {store} = this.props;
+
+store.on('change', this.onChange, this);
   },
 
   componentWillUnmount: function () {
-databasesStore.off('change', this.onChange, this);
+const {store} = this.props;
+store.off('change', this.onChange, this);
   },
 
   onChange: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b245c6d2/app/addons/databases/stores.js
--
diff --git a/app/addons/databases/stores.js b/app/addons/databases/stores.js
index e0145a2..ff75d01 100644
--- a/app/addons/databases/stores.js
+++ b/app/addons/databases/stores.js
@@ -18,7 +18,7 @@ import Helpers from "../../helpers";
 
 const Database = Resources.Model;
 
-var DatabasesStore = FauxtonAPI.Store.extend({
+const DatabasesStoreConstructor = FauxtonAPI.Store.extend({
 
   initialize: function () {
 this.reset();
@@ -134,9 +134,10 @@ var DatabasesStore = FauxtonAPI.Store.extend({
   }
 });
 
-const databasesStore = new DatabasesStore();
+const databasesStore = new DatabasesStoreConstructor();
 databasesStore.dispatchToken = 
FauxtonAPI.dispatcher.register(databasesStore.dispatch.bind(databasesStore));
 
 export default {
-  databasesStore: databasesStore
+  databasesStore: databasesStore,
+  DatabasesStoreConstructor: DatabasesStoreConstructor
 };



fauxton commit: updated refs/heads/master to 6cb7eaa

2016-11-03 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master a5e962ec5 -> 6cb7eaa22


Revert "fix flaky nw test"

This reverts commit e118d93b285fb9a17a2a4623142ded7088ed31ee.

had to revert as other cascading issues appeared in the sidebar.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6cb7eaa2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6cb7eaa2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6cb7eaa2

Branch: refs/heads/master
Commit: 6cb7eaa2245085d35ccc023bc70b43152400f340
Parents: a5e962e
Author: Robert Kowalski 
Authored: Thu Nov 3 20:15:00 2016 +0100
Committer: Robert Kowalski 
Committed: Thu Nov 3 20:15:00 2016 +0100

--
 app/addons/documents/assets/less/sidenav.less| 8 
 .../documents/tests/nightwatch/editDocumentsFromView.js  | 1 -
 2 files changed, 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6cb7eaa2/app/addons/documents/assets/less/sidenav.less
--
diff --git a/app/addons/documents/assets/less/sidenav.less 
b/app/addons/documents/assets/less/sidenav.less
index 82b6a63..fb46c22 100644
--- a/app/addons/documents/assets/less/sidenav.less
+++ b/app/addons/documents/assets/less/sidenav.less
@@ -24,10 +24,6 @@
 text-decoration: none;
   }
 
-  .nav-list {
-padding-right: 0px;
-  }
-
   // selected nav item row styles
   .nav-list .active > a {
 text-shadow: none;
@@ -38,10 +34,6 @@
 }
   }
 
-  .dropdown {
-margin-right: 15px;
-  }
-
   .dropdown-toggle:hover {
 color: @linkColor;
   }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6cb7eaa2/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
--
diff --git a/app/addons/documents/tests/nightwatch/editDocumentsFromView.js 
b/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
index ae320c1..06fa981 100644
--- a/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
+++ b/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
@@ -30,7 +30,6 @@ module.exports = {
 client
   .createDocument(newDocumentName, newDatabaseName, ddocContents)
   .populateDatabase(newDatabaseName)
-  .checkForDocumentCreated(newDocumentName)
 
   .loginToGUI()
 



fauxton commit: updated refs/heads/master to a5e962e

2016-11-03 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 0db3f7bdb -> a5e962ec5


redux: delete unused store

i was just about to convert our first module to redux, turns out
it doesn't need a store right now. so i deleted the store.

PR: #799
PR-URL: https://github.com/apache/couchdb-fauxton/pull/799
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a5e962ec
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a5e962ec
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a5e962ec

Branch: refs/heads/master
Commit: a5e962ec5179636a639183706dd6e6f75e78a0c4
Parents: 0db3f7b
Author: Robert Kowalski 
Authored: Wed Nov 2 16:11:35 2016 +0100
Committer: Robert Kowalski 
Committed: Thu Nov 3 18:54:02 2016 +0100

--
 app/addons/documentation/components.react.jsx | 100 +++--
 app/addons/documentation/resources.js |  13 ---
 app/addons/documentation/routes.js|   2 +-
 app/addons/documentation/stores.js|  83 -
 4 files changed, 73 insertions(+), 125 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a5e962ec/app/addons/documentation/components.react.jsx
--
diff --git a/app/addons/documentation/components.react.jsx 
b/app/addons/documentation/components.react.jsx
index 01b0ddf..b082b91 100644
--- a/app/addons/documentation/components.react.jsx
+++ b/app/addons/documentation/components.react.jsx
@@ -13,23 +13,69 @@
 import app from "../../app";
 import FauxtonAPI from "../../core/api";
 import React from "react";
-import Stores from "./stores";
 
-var documentationStore = Stores.documentationStore;
-
-var DocumentationController = React.createClass({
-  getStoreState: function () {
-return {
-  links: documentationStore.getLinks()
-};
+const docLinks = [
+  {
+title: 'CouchDB Official Documentation — Online',
+link: 'http://docs.couchdb.org/en/latest/',
+iconClassName: 'couchdb-icon'
   },
-
-  getInitialState: function () {
-return this.getStoreState();
+  {
+title: 'CouchDB Official Documentation — Offline',
+link: '/_utils/docs/contents.html',
+iconClassName: 'couchdb-icon'
+  },
+  {
+title: 'CouchDB Weekly News',
+link: 'http://blog.couchdb.org/',
+iconClassName: 'couchdb-icon'
+  },
+  {
+title: 'CouchDB Homepage',
+link: 'https://couchdb.apache.org/',
+iconClassName: 'couchdb-icon'
+  },
+  {
+title: 'CouchDB on GitHub',
+link: 'https://github.com/apache/couchdb',
+iconClassName: 'github-icon'
+  },
+  {
+title: 'Fauxton on GitHub',
+link: 'https://github.com/apache/couchdb-fauxton',
+iconClassName: 'github-icon'
+  },
+  {
+title: 'Fauxton Visual Guide',
+link: 'https://couchdb.apache.org/fauxton-visual-guide/index.html',
+iconClassName: 'couchdb-icon'
+  },
+  {
+title: 'The Apache Software Foundation',
+link: 'http://www.apache.org/',
+iconClassName: 'asf-feather-icon'
   },
+  {
+title: 'Follow CouchDB on Twitter',
+link: 'https://twitter.com/couchdb',
+iconClassName: 'twitter-icon'
+  },
+  {
+title: 'Follow CouchDB on Google Plus',
+link: 'https://plus.google.com/+CouchDB',
+iconClassName: 'google-plus-icon'
+  },
+  {
+title: 'Follow CouchDB on LinkedIn',
+link: 'https://www.linkedin.com/company/apache-couchdb',
+iconClassName: 'linkedin-icon'
+  }
+];
+
+const DocumentationPage = ({links = docLinks}) => {
 
-  createLinkRows: function () {
-return this.state.links.map(function (linkObject) {
+  function createLinkRows (linkList) {
+return linkList.map(function (linkObject) {
   return (
 
   
@@ -41,23 +87,21 @@ var DocumentationController = React.createClass({
 
   );
 });
-  },
+  }
 
-  render: function () {
-return (
-  
-
-  
-
-{this.createLinkRows()}
-
-  
-
+  return (
+
+  
+
+  
+{createLinkRows(links)}
+  
+
   
-);
-  }
-});
+
+  );
+};
 
 export default {
-  DocumentationController: DocumentationController
+  DocumentationPage: DocumentationPage
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a5e962ec/app/addons/documentation/resources.js
--
diff --git a/app/addons/documentation/resources.js 
b/app/addons/documentation/resources.js
deleted file mode 100644
index 845d5fb..000
--- a/app/addons/documentation/resources.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use t

fauxton commit: updated refs/heads/master to bb920c6

2016-11-01 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master e118d93b2 -> bb920c60f


add script to create/delete a lot dbs

this is useful to create a lot of dbs for testing and later to
get rid of them

PR: #791
PR-URL: https://github.com/apache/couchdb-fauxton/pull/791
Reviewed-By: garren smith 
Reviewed-By: Ryan Millay


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/bb920c60
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/bb920c60
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/bb920c60

Branch: refs/heads/master
Commit: bb920c60fdbd49d6dcdd44bcb6cb198a709d648b
Parents: e118d93
Author: Robert Kowalski 
Authored: Fri Oct 21 15:02:33 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Nov 1 19:21:19 2016 +0100

--
 bin/create-n-dbs | 131 ++
 1 file changed, 131 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bb920c60/bin/create-n-dbs
--
diff --git a/bin/create-n-dbs b/bin/create-n-dbs
new file mode 100755
index 000..2874e9e
--- /dev/null
+++ b/bin/create-n-dbs
@@ -0,0 +1,131 @@
+#!/usr/bin/env node
+
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations 
under
+// the License.
+
+const optimist = require('optimist');
+const nano = require('nano');
+
+const {parallelLimit} = require('async');
+
+
+const NAMESPACE = 'test-db-';
+const PARALLEL_LIMIT = 50;
+const URL = 'http://localhost:5984';
+
+optimist
+  .usage('Create a certain amount of dbs \nUsage: $0')
+
+  .options('help', {
+alias: 'h',
+describe: 'Show this message'
+  })
+  .options('number', {
+alias: 'n',
+describe: 'The amount of databases to create'
+  })
+  .options('delete', {
+alias: 'd',
+default: false,
+describe: 'Delete databases'
+  });
+
+const argv = optimist.argv;
+
+if (argv.help || argv.h) {
+  return optimist.showHelp(console.log);
+}
+
+const isDelete = (argv.d || argv.delete);
+const isCreate = (argv.n || argv.number);
+
+if (!isDelete && !isCreate) {
+  console.error('[ERROR] Please provide -d or -n to delete or create 
test-databases \n');
+  optimist.showHelp(console.log);
+  process.exit(1);
+}
+
+const nClient = nano(URL)
+
+if (isCreate) {
+  return createNdbs(argv.n || argv.number);
+}
+
+if (isDelete) {
+  return deleteDbs();
+}
+
+function getExistingDbs (cb) {
+  nClient.db.list((err, body) => {
+if (err) {
+  throw err;
+}
+
+const list = body.filter(db => {
+  return new RegExp(NAMESPACE).test(db);
+});
+
+cb(null, list);
+  });
+}
+
+function createNdbs (number) {
+  getExistingDbs((err, dbs) => {
+const offset = dbs.length;
+
+const newDbs = [];
+for (let i = offset; i < offset + number; i++) {
+  newDbs.push(NAMESPACE + i);
+}
+
+const tasks = newDbs.map((db) => {
+  return function task (cb) {
+nClient.db.create(db, (err, body) => {
+  if (err) {
+console.error(err);
+  }
+
+  cb(null);
+});
+  }
+});
+
+parallelLimit(tasks, PARALLEL_LIMIT, (err) => {
+  if (err) {
+console.error(err);
+  }
+});
+  });
+}
+
+function deleteDbs () {
+  getExistingDbs((err, dbs) => {
+const list = dbs.map(db => {
+  return (cb) => {
+nClient.db.destroy(db, (err, resp) => {
+  if (err) {
+cb(err);
+return;
+  }
+
+  cb(null);
+});
+  };
+});
+
+parallelLimit(list, PARALLEL_LIMIT, (err) => {
+  if (err) {
+console.error(err);
+  }
+});
+  });
+}



[3/3] fauxton commit: updated refs/heads/master to 8b7e186

2016-10-31 Thread robertkowalski
Fix database-list for dbs with slash in name

This fix for encoded database names also includes a big refactor
of the database page, pulling logic out of the views and gets rid
of backbone models.

 - no backbone models for the db list any more
 - replaces the jquery tooltips on the db list with react tooltips
 - avoiding safeURLName which is broken by design
 - no method calls on passed data in views any more
   (e.g. `{this.props.db.get('name')}` - focus on plain JSON data
   from flux stores

COUCHDB-3187

PR: #782
PR-URL: https://github.com/apache/couchdb-fauxton/pull/782
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/8b7e186b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/8b7e186b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/8b7e186b

Branch: refs/heads/master
Commit: 8b7e186bf7c7aed6f14d1afb3dc52c011ba844b2
Parents: c1bb043
Author: Robert Kowalski 
Authored: Fri Sep 30 16:31:47 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Oct 31 15:04:35 2016 +0100

--
 app/addons/databases/actions.js | 117 +
 app/addons/databases/actiontypes.js |   5 +-
 app/addons/databases/base.js|  11 +-
 app/addons/databases/components.react.jsx   | 110 ++---
 app/addons/databases/resources.js   |  83 +-
 app/addons/databases/routes.js  |  15 +-
 app/addons/databases/stores.js  |  84 ++
 .../databases/tests/componentsSpec.react.jsx| 165 +++
 .../tests/nightwatch/checkDatabaseTooltip.js|   8 +-
 .../tests/nightwatch/deletesDatabase.js |   6 +-
 .../nightwatch/deletesDatabaseSpecialChars.js   |   6 +-
 .../tests/nightwatch/permissionsDbTable.js  |  40 +
 .../tests/nightwatch/specialCharListLinks.js|  51 ++
 app/addons/databases/tests/resourcesSpec.js |  50 --
 app/addons/databases/tests/storesSpec.js|  65 
 app/addons/documents/base.js|  20 +++
 app/addons/documents/routes-documents.js|   4 +-
 app/addons/documents/routes-index-editor.js |   4 +-
 app/addons/documents/shared-routes.js   |   4 -
 .../tests/nightwatch/createsDocument.js |  18 +-
 .../tests/nightwatch/deletesDocuments.js|   4 +-
 .../tests/nightwatch/editDocumentsFromView.js   |   5 +-
 app/addons/permissions/routes.js|   4 +-
 .../custom-commands/auth/loginToGUI.js  |  15 +-
 .../custom-commands/createDocument.js   |   1 +
 25 files changed, 453 insertions(+), 442 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8b7e186b/app/addons/databases/actions.js
--
diff --git a/app/addons/databases/actions.js b/app/addons/databases/actions.js
index 95062b3..9f38663 100644
--- a/app/addons/databases/actions.js
+++ b/app/addons/databases/actions.js
@@ -15,48 +15,99 @@ import Stores from "./stores";
 import ActionTypes from "./actiontypes";
 import Resources from "./resources";
 
+function getDatabaseDetails (dbList, fullDbList, cb) {
+  const databaseDetails = [];
+  const failedDbs = [];
+  let seen = 0;
+
+  dbList.forEach((db) => {
+const url = FauxtonAPI.urls('databaseBaseURL', 'server', db);
+
+fetch(url)
+  .then((res) => {
+databaseDetails.push(res);
+  })
+  .fail((xhr) => {
+failedDbs.push(db);
+  })
+  .always(() => {
+seen++;
+
+if (seen !== dbList.length) {
+  return;
+}
+
+updateDatabases({
+  dbList: dbList,
+  databaseDetails: databaseDetails,
+  failedDbs: failedDbs,
+  fullDbList: fullDbList
+});
+  });
+  });
+}
+
+function fetch (url) {
+  return $.ajax({
+cache: false,
+url: url,
+dataType: 'json'
+  }).then((res) => {
+return res;
+  });
+}
+
+function getDatabaseList (limit, page) {
+  const url = FauxtonAPI.urls('allDBs', 'server');
+
+  return fetch(url);
+}
+
+function paginate (list, page, perPage) {
+  const start = (page - 1) * perPage;
+  const end = page * perPage;
+  return list.slice(start, end);
+}
+
+function updateDatabases (options) {
+  FauxtonAPI.dispatch({
+type: ActionTypes.DATABASES_UPDATE,
+options: options
+  });
+}
+
 export default {
+  getDatabaseList: getDatabaseList,
+  paginate: paginate,
+  getDatabaseDetails: getDatabaseDetails,
+  fetch: fetch,
 
-  init: function (databases) {
-var params = app.getParams();
-var page = params.page ? parseInt(params.page, 10) : 1;
-var perPage = FauxtonAPI.constants.MISC.DEFAULT_PAGE_SIZE;
+  init: function () {
+const params = app.getParams();
+ 

[1/3] fauxton commit: updated refs/heads/master to 8b7e186

2016-10-31 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 7166e4cd1 -> 8b7e186bf


remove leagcy data-size property handling

CouchDB 2 data size is always available in CouchDB 2

PR: #782
PR-URL: https://github.com/apache/couchdb-fauxton/pull/782
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/c1bb043a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/c1bb043a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/c1bb043a

Branch: refs/heads/master
Commit: c1bb043a7945aa036cb082e0b9ac08c0a7d3077a
Parents: a12add3
Author: Robert Kowalski 
Authored: Mon Sep 26 16:50:54 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Oct 31 15:04:34 2016 +0100

--
 app/addons/databases/resources.js   | 16 +---
 app/addons/databases/tests/resourcesSpec.js | 12 
 2 files changed, 1 insertion(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c1bb043a/app/addons/databases/resources.js
--
diff --git a/app/addons/databases/resources.js 
b/app/addons/databases/resources.js
index 7b8876b..4ee31cf 100644
--- a/app/addons/databases/resources.js
+++ b/app/addons/databases/resources.js
@@ -132,26 +132,12 @@ Databases.Status = FauxtonAPI.Model.extend({
   },
 
   dataSize: function () {
-if (this.get("other")) {
-  return this.get("other").data_size;
-} else if (this.get('data_size')) {
-  return this.get('data_size');
-} else if (this.get('disk_size')) {
-  return this.get('disk_size');
-} else {
-  return 0;
-}
+return this.get('other').data_size;
   },
 
   parse: function (resp) {
 this.loadSuccess = true;
 return resp;
-  },
-
-  // a sure-fire way to know when the DB size info is actually available; 
dataSize() may return 0 before or after
-  // the data has been loaded
-  hasDataSize: function () {
-return this.get('other') || this.get('data_size') || this.get('disk_size');
   }
 });
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c1bb043a/app/addons/databases/tests/resourcesSpec.js
--
diff --git a/app/addons/databases/tests/resourcesSpec.js 
b/app/addons/databases/tests/resourcesSpec.js
index 0005fbc..a199f05 100644
--- a/app/addons/databases/tests/resourcesSpec.js
+++ b/app/addons/databases/tests/resourcesSpec.js
@@ -31,18 +31,6 @@ describe("Databases: List", function () {
   assert.ok(!modelWithoutGraveYard.isGraveYard());
 });
 
-it("can tell whether the data size showing is accurate or not", function 
() {
-  var modelWithDataSize = new Resources.Status({
-other: 6,
-data_size: 5,
-disk_size: 2
-  });
-  assert.ok(modelWithDataSize.hasDataSize());
-
-  var empty_probably_fetching_model = new Resources.Status({});
-  assert.notOk(empty_probably_fetching_model.hasDataSize());
-});
-
   });
 
   describe('List of Databases', function () {



[2/3] fauxton commit: updated refs/heads/master to 8b7e186

2016-10-31 Thread robertkowalski
add failing test

This reverts commit ceccc8e46be797304ba89a2fd1e2275531a2a08e.

PR: #782
PR-URL: https://github.com/apache/couchdb-fauxton/pull/782
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a12add39
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a12add39
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a12add39

Branch: refs/heads/master
Commit: a12add397b5ead66b6db92623102f0672ecd9be5
Parents: 7166e4c
Author: Robert Kowalski 
Authored: Fri Sep 30 13:49:24 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Oct 31 15:04:34 2016 +0100

--
 .../nightwatch/deletesDatabaseSpecialChars.js   | 23 +++-
 1 file changed, 22 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a12add39/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
--
diff --git 
a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js 
b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
index ff884d9..c68899d 100644
--- a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
+++ b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
@@ -10,11 +10,11 @@
 // License for the specific language governing permissions and limitations 
under
 // the License.
 
+const newDatabaseName = 'one/two-three/_four';
 
 module.exports = {
   'Deletes a database with special chars': function (client) {
 const waitTime = client.globals.maxWaitTime;
-const newDatabaseName = 'one/two-three/_four'; // add any other chars here 
you want to test
 const baseUrl = client.globals.test_settings.launch_url;
 
 client
@@ -30,5 +30,26 @@ module.exports = {
   .checkForDatabaseDeleted(newDatabaseName, waitTime)
 
 .end();
+  },
+
+  'Deletes a database from the list with special chars': function (client) {
+const waitTime = client.globals.maxWaitTime;
+const baseUrl = client.globals.test_settings.launch_url;
+
+client
+  .createDatabase(newDatabaseName)
+  .loginToGUI()
+  .url(baseUrl + '/#/_all_dbs/')
+
+  .waitForElementPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]', waitTime, false)
+  .assert.elementPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]')
+  .clickWhenVisible('[title="Delete ' + newDatabaseName + '"]', waitTime, 
false)
+  .setValue('.delete-db-modal input[type="text"]', [newDatabaseName, 
client.Keys.ENTER])
+  .waitForElementNotPresent('.global-notification .fonticon-cancel', 
waitTime, false)
+  .waitForElementPresent('.fauxton-table-list', waitTime, false)
+  .checkForDatabaseDeleted(newDatabaseName, waitTime)
+  .assert.elementNotPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]')
+
+.end();
   }
 };



fauxton commit: updated refs/heads/master to 13a26d9

2016-10-20 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master b25361925 -> 13a26d986


Tweaked CSS for more hover consistency and UX

PR: #790
PR-URL: https://github.com/apache/couchdb-fauxton/pull/790
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/13a26d98
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/13a26d98
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/13a26d98

Branch: refs/heads/master
Commit: 13a26d986197fe490f75270fe395bdfe32c3a646
Parents: b253619
Author: Ryan Millay 
Authored: Wed Oct 19 16:35:42 2016 -0400
Committer: Robert Kowalski 
Committed: Thu Oct 20 16:10:38 2016 +0200

--
 app/addons/components/assets/less/docs.less| 2 +-
 app/addons/components/assets/less/tab-element.less | 4 
 app/addons/documents/assets/less/changes.less  | 4 
 app/addons/documents/assets/less/header-docs-left.less | 1 +
 assets/less/fauxton.less   | 4 
 5 files changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/13a26d98/app/addons/components/assets/less/docs.less
--
diff --git a/app/addons/components/assets/less/docs.less 
b/app/addons/components/assets/less/docs.less
index d5020c6..6bd9bd9 100644
--- a/app/addons/components/assets/less/docs.less
+++ b/app/addons/components/assets/less/docs.less
@@ -54,7 +54,7 @@
   font-size: 20px;
 }
 .fonticon-pencil:hover {
-  color: @docHeaderDocId;
+  color: @hoverRed;
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/13a26d98/app/addons/components/assets/less/tab-element.less
--
diff --git a/app/addons/components/assets/less/tab-element.less 
b/app/addons/components/assets/less/tab-element.less
index 6ef1d98..df1b3c0 100644
--- a/app/addons/components/assets/less/tab-element.less
+++ b/app/addons/components/assets/less/tab-element.less
@@ -68,6 +68,10 @@
 
   &.tab-element-checked {
 background-color: #fff;
+label {
+  cursor: default;
+  pointer-events: none;
+}
   }
 
   &.tab-element-checked .tab-element-content {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/13a26d98/app/addons/documents/assets/less/changes.less
--
diff --git a/app/addons/documents/assets/less/changes.less 
b/app/addons/documents/assets/less/changes.less
index ffafd7d..242b68f 100644
--- a/app/addons/documents/assets/less/changes.less
+++ b/app/addons/documents/assets/less/changes.less
@@ -11,6 +11,7 @@
 // the License.
 
 @import "../../../../../assets/less/animations.less";
+@import "../../../../../assets/less/variables.less";
 
 // used in changes.html
 .change-box {
@@ -58,6 +59,9 @@
 
 .btn-info {
   padding: 12px;
+  &:hover {
+background-color: @hoverRed;
+  }
 }
   }
   .fonticon-filter {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/13a26d98/app/addons/documents/assets/less/header-docs-left.less
--
diff --git a/app/addons/documents/assets/less/header-docs-left.less 
b/app/addons/documents/assets/less/header-docs-left.less
index 018099b..0c37c3e 100644
--- a/app/addons/documents/assets/less/header-docs-left.less
+++ b/app/addons/documents/assets/less/header-docs-left.less
@@ -68,6 +68,7 @@ button.faux-header__doc-header-dropdown-toggle:focus {
 
 .faux-header__doc-header-backlink:hover {
   text-decoration: none;
+  color: @hoverRed;
 }
 
 // override bootstrap styles

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/13a26d98/assets/less/fauxton.less
--
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 466add6..9ef3bad 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -665,6 +665,10 @@ body .control-toggle-include-docs span {
 .border-radius(6px);
 text-decoration: none;
 font-size: 19px;
+&:hover {
+  background-color: @hoverRed;
+  color: white;
+}
   }
   td {
 vertical-align: middle;



[2/2] fauxton commit: updated refs/heads/master to b253619

2016-10-18 Thread robertkowalski
making the full database name visible on hover

PR: #788
PR-URL: https://github.com/apache/couchdb-fauxton/pull/788
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b2536192
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b2536192
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b2536192

Branch: refs/heads/master
Commit: b253619255e09bc2e4332b8a75049d2503334697
Parents: 0926024
Author: Ryan Millay 
Authored: Tue Oct 18 10:40:36 2016 -0400
Committer: Robert Kowalski 
Committed: Tue Oct 18 17:12:40 2016 +0200

--
 app/addons/documents/components/header-docs-left.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2536192/app/addons/documents/components/header-docs-left.jsx
--
diff --git a/app/addons/documents/components/header-docs-left.jsx 
b/app/addons/documents/components/header-docs-left.jsx
index 0db2009..d715a1e 100644
--- a/app/addons/documents/components/header-docs-left.jsx
+++ b/app/addons/documents/components/header-docs-left.jsx
@@ -74,7 +74,7 @@ const HeaderDocsLeft = ({dbName}) => {
{ FauxtonAPI.navigate('#_all_dbs'); }}>
 
   
-  
+  
 {dbName}
   
   



[1/2] fauxton commit: updated refs/heads/master to b253619

2016-10-18 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 76636829e -> b25361925


updating overflow behavior for db name

This closes 3189

PR: #788
PR-URL: https://github.com/apache/couchdb-fauxton/pull/788
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/09260240
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/09260240
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/09260240

Branch: refs/heads/master
Commit: 09260240fde42aaa89d140d7d5a4337831a8b47b
Parents: 7663682
Author: Ryan Millay 
Authored: Tue Oct 18 10:23:09 2016 -0400
Committer: Robert Kowalski 
Committed: Tue Oct 18 17:12:17 2016 +0200

--
 app/addons/documents/assets/less/header-docs-left.less | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/09260240/app/addons/documents/assets/less/header-docs-left.less
--
diff --git a/app/addons/documents/assets/less/header-docs-left.less 
b/app/addons/documents/assets/less/header-docs-left.less
index 2dccdc7..018099b 100644
--- a/app/addons/documents/assets/less/header-docs-left.less
+++ b/app/addons/documents/assets/less/header-docs-left.less
@@ -19,6 +19,9 @@
   line-height: 24px;
   padding: 22px 10px;
   border-right: 1px solid #ccc;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 button.faux-header__doc-header-dropdown-toggle {



[2/4] fauxton commit: updated refs/heads/master to d683706

2016-10-14 Thread robertkowalski
table-view: don't cut off long property fields in dropdown


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/65be07d9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/65be07d9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/65be07d9

Branch: refs/heads/master
Commit: 65be07d9603e7fa574d6f1476374544d3bf37ebc
Parents: 54c24f6
Author: Robert Kowalski 
Authored: Thu Oct 13 20:54:58 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Oct 13 20:54:58 2016 +0200

--
 assets/less/fauxton.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/65be07d9/assets/less/fauxton.less
--
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index d368d2f..5e19344 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -382,10 +382,10 @@ table.databases {
   }
 }
 
-/* this allows the jump-to-doc results expand as much as need be when the 
component is used in the header */
-#right-header .faux-header__searchboxcontainer .Select-menu-outer {
+// this allows the results expand as much as need be when the component is 
used in the header
+.Select-menu-outer {
   &>div>div {
-padding-right: 25px; /* prevents overlapping of auto-generated scrollbar */
+padding-right: 25px; // prevents overlapping of auto-generated scrollbar
   }
   min-width: 210px;
   max-width: 450px;



[1/4] fauxton commit: updated refs/heads/master to d683706

2016-10-14 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 5a8a3fb43 -> d6837062a


chore: remove broken transition

the transition wasn't working. actually transitions are bad as
many couchdb users access fauxton using a remote desktop, which
then starts to lag / stutter.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/54c24f60
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/54c24f60
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/54c24f60

Branch: refs/heads/master
Commit: 54c24f600f3a86abc599e7d5b2841be32c7872f2
Parents: a06c648
Author: Robert Kowalski 
Authored: Thu Oct 13 20:29:38 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Oct 13 20:29:38 2016 +0200

--
 .../documents/index-results/index-results.components.react.jsx| 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/54c24f60/app/addons/documents/index-results/index-results.components.react.jsx
--
diff --git 
a/app/addons/documents/index-results/index-results.components.react.jsx 
b/app/addons/documents/index-results/index-results.components.react.jsx
index 5d70c93..a40f3dc 100644
--- a/app/addons/documents/index-results/index-results.components.react.jsx
+++ b/app/addons/documents/index-results/index-results.components.react.jsx
@@ -20,7 +20,6 @@ import Documents from "../resources";
 import FauxtonComponents from "../..//fauxton/components.react";
 import { SplitButton, MenuItem } from "react-bootstrap";
 import ReactSelect from "react-select";
-import ReactCSSTransitionGroup from "react-addons-css-transition-group";
 import "../../../../assets/js/plugins/prettify";
 
 const {LoadLines, BulkActionComponent} = Components;
@@ -382,9 +381,7 @@ var ResultsScreen = React.createClass({
 disabled={this.props.isLoading}
 title="Select all docs that can be..." /> : null}
 
-  
 {this.getDocumentList()}
-  
 
   
 );



[3/4] fauxton commit: updated refs/heads/master to d683706

2016-10-14 Thread robertkowalski
dropdowns: fix color for selected item

the item already selected was rendering black, which is not a
good idea on a black background :)


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/eeaa6c61
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/eeaa6c61
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/eeaa6c61

Branch: refs/heads/master
Commit: eeaa6c61b25cab2f45ff22b307492f2a9c5f9fa3
Parents: 65be07d
Author: Robert Kowalski 
Authored: Thu Oct 13 20:55:32 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Oct 13 20:55:32 2016 +0200

--
 assets/less/fauxton.less | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eeaa6c61/assets/less/fauxton.less
--
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 5e19344..466add6 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -424,6 +424,10 @@ table.databases {
   box-shadow: transparent;
 }
 
+.Select-option.is-selected {
+  color: #fff;
+}
+
 .Select .Select-menu {
   max-height: 291px;
   background-color: #33;



[4/4] fauxton commit: updated refs/heads/master to d683706

2016-10-14 Thread robertkowalski
Merge branch 'width-table-dropdown'


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/d6837062
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/d6837062
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/d6837062

Branch: refs/heads/master
Commit: d6837062a8d5fb0d936ae180919545e125139955
Parents: 5a8a3fb eeaa6c6
Author: Robert Kowalski 
Authored: Fri Oct 14 09:06:32 2016 +0200
Committer: Robert Kowalski 
Committed: Fri Oct 14 09:06:32 2016 +0200

--
 .../index-results/index-results.components.react.jsx  |  3 ---
 assets/less/fauxton.less  | 10 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)
--




fauxton commit: updated refs/heads/master to 5a8a3fb

2016-10-14 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master a06c64884 -> 5a8a3fb43


react-select: disable cache

react-select caches the results which leads to database names
appearing in the list of document names after you opened the
dropdown on the _all_dbs page.

PR: #785
PR-URL: https://github.com/apache/couchdb-fauxton/pull/785
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5a8a3fb4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5a8a3fb4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5a8a3fb4

Branch: refs/heads/master
Commit: 5a8a3fb43f8eff9a4d22afd1530169bbdda3621a
Parents: a06c648
Author: Robert Kowalski 
Authored: Thu Oct 13 20:14:53 2016 +0200
Committer: Robert Kowalski 
Committed: Fri Oct 14 09:03:20 2016 +0200

--
 app/addons/databases/components.react.jsx | 4 +---
 app/addons/documents/components/actions.js| 2 +-
 app/addons/documents/components/header-docs-right.jsx | 2 +-
 app/addons/documents/components/jumptodoc.react.jsx   | 1 +
 package.json  | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5a8a3fb4/app/addons/databases/components.react.jsx
--
diff --git a/app/addons/databases/components.react.jsx 
b/app/addons/databases/components.react.jsx
index d37a5aa..2540b6d 100644
--- a/app/addons/databases/components.react.jsx
+++ b/app/addons/databases/components.react.jsx
@@ -222,9 +222,7 @@ var GraveyardInfo = React.createClass({
 const RightDatabasesHeader = () => {
   return (
 
-  
+  
   
 
   );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5a8a3fb4/app/addons/documents/components/actions.js
--
diff --git a/app/addons/documents/components/actions.js 
b/app/addons/documents/components/actions.js
index c6d7135..fe79504 100644
--- a/app/addons/documents/components/actions.js
+++ b/app/addons/documents/components/actions.js
@@ -14,7 +14,7 @@ import FauxtonAPI from "../../../core/api";
 
 export default {
   fetchAllDocsWithKey: (database) => {
-  return (id, callback) => {
+return (id, callback) => {
   const query = '?' + $.param({
 startkey: JSON.stringify(id),
 endkey: JSON.stringify(id + "\u"),

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5a8a3fb4/app/addons/documents/components/header-docs-right.jsx
--
diff --git a/app/addons/documents/components/header-docs-right.jsx 
b/app/addons/documents/components/header-docs-right.jsx
index 7ca1900..c06df07 100644
--- a/app/addons/documents/components/header-docs-right.jsx
+++ b/app/addons/documents/components/header-docs-right.jsx
@@ -31,7 +31,7 @@ const RightAllDocsHeader = ({database}) =>
 
 
   
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5a8a3fb4/app/addons/documents/components/jumptodoc.react.jsx
--
diff --git a/app/addons/documents/components/jumptodoc.react.jsx 
b/app/addons/documents/components/jumptodoc.react.jsx
index 99347f9..5a5f79b 100644
--- a/app/addons/documents/components/jumptodoc.react.jsx
+++ b/app/addons/documents/components/jumptodoc.react.jsx
@@ -26,6 +26,7 @@ const JumpToDoc = ({database, loadOptions}) => {
 loadOptions={loadOptions}
 clearable={false}
 ignoreCase={false}
+cache={false}
 onChange={({value: docId}) => {
   const url = FauxtonAPI.urls('document', 'app', 
app.utils.safeURLName(database.id), app.utils.safeURLName(docId));
   // We navigating away from the page. So we need to take that 
navigation out of the loop otherwise

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5a8a3fb4/package.json
--
diff --git a/package.json b/package.json
index 8ac5093..94e5800 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
 "react-addons-css-transition-group": "~15.0.1",
 "react-bootstrap": "^0.28.5",
 "react-dom": "~15.0.1",
-"react-select": "^1.0.0-beta12",
+"react-select": "1.0.0-rc.2",
 "request": "^2.54.0",
 "semver": "^5.1.0",
 "send": "^0.13.1",



[1/2] fauxton commit: updated refs/heads/master to a06c648

2016-10-13 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master fd758c015 -> a06c64884


add tests for encoding issue


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a06c6488
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a06c6488
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a06c6488

Branch: refs/heads/master
Commit: a06c64884b4f86e00f774e0e810018c4513269fe
Parents: ef1ecc8
Author: Robert Kowalski 
Authored: Thu Oct 13 16:33:09 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Oct 13 16:34:52 2016 +0200

--
 app/core/tests/utilsSpec.js | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a06c6488/app/core/tests/utilsSpec.js
--
diff --git a/app/core/tests/utilsSpec.js b/app/core/tests/utilsSpec.js
index c5632f5..326e8ab 100644
--- a/app/core/tests/utilsSpec.js
+++ b/app/core/tests/utilsSpec.js
@@ -47,6 +47,18 @@ describe('Utils', function () {
 });
   });
 
+  describe('safeURLName', function () {
+
+it('is idempotent', function () {
+  assert.equal('foo-bar%2Fbaz', 
utils.safeURLName(utils.safeURLName('foo-bar/baz')));
+  assert.equal('foo-bar%2Bbaz', 
utils.safeURLName(utils.safeURLName('foo-bar+baz')));
+});
+
+it('encodes special chars', function () {
+  assert.equal('foo-bar%2Fbaz', utils.safeURLName('foo-bar/baz'));
+});
+  });
+
   describe('isSystemDatabase', function () {
 
 it('detects system databases', function () {



[2/2] fauxton commit: updated refs/heads/master to a06c648

2016-10-13 Thread robertkowalski
Fix database id escaping (make safeURLName idempotent)

PR: #784
PR-URL: https://github.com/apache/couchdb-fauxton/pull/784
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ef1ecc8b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ef1ecc8b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ef1ecc8b

Branch: refs/heads/master
Commit: ef1ecc8b16c8e7e20228138a6384af21800bbe4f
Parents: fd758c0
Author: Pierre Guilleminot 
Authored: Wed Oct 12 19:48:42 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Oct 13 16:34:52 2016 +0200

--
 app/core/utils.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ef1ecc8b/app/core/utils.js
--
diff --git a/app/core/utils.js b/app/core/utils.js
index 35ce2db..c159eb1 100644
--- a/app/core/utils.js
+++ b/app/core/utils.js
@@ -68,7 +68,9 @@ var utils = {
 
   safeURLName: function (name) {
 var testName = name || "";
-var checkforBad = testName.match(/[\$\-/,+-]/g);
+// These special caracters are allowed by couch: _, $, (, ), +, -, and /
+// From them only $ + and / are to be escaped in a URI component.
+var checkforBad = testName.match(/[$+/]/g);
 return (checkforBad !== null) ? encodeURIComponent(name) : name;
   },
 



fauxton commit: updated refs/heads/master to fd758c0

2016-10-05 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master a16edae68 -> fd758c015


devserver: readd/fix csp header

The CSP headers were not set, as directly interacting with express
in `webpack-dev-server` to set the headers does not work.

PR: #783
PR-URL: https://github.com/apache/couchdb-fauxton/pull/783
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/fd758c01
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/fd758c01
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/fd758c01

Branch: refs/heads/master
Commit: fd758c015f28b1304944806d71b10978c7fa
Parents: a16edae
Author: Robert Kowalski 
Authored: Thu Oct 6 08:19:49 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Oct 6 08:55:38 2016 +0200

--
 devserver.js | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/fd758c01/devserver.js
--
diff --git a/devserver.js b/devserver.js
index 3bef0a8..96f3ebd 100644
--- a/devserver.js
+++ b/devserver.js
@@ -51,16 +51,18 @@ var devSetup = function (cb) {
   });
 };
 
-var defaultHeaderValue = "default-src 'self'; img-src 'self' data:; font-src 
'self'; " +
+const defaultHeaderValue = "default-src 'self'; img-src 'self' data:; font-src 
'self'; " +
   "script-src 'self' 'unsafe-eval'; style-src 'self' 
'unsafe-inline';";
-var setCSP = function (res) {
+function getCspHeaders () {
   if (!settings.contentSecurityPolicy) {
 return;
   }
 
-  var headerValue = settings.contentSecurityPolicyHeader || defaultHeaderValue;
+  const cspHeader = settings.contentSecurityPolicyHeader || defaultHeaderValue;
 
-  res.set('Content-Security-Policy', headerValue);
+  return {
+'Content-Security-Policy': cspHeader
+  };
 };
 
 var runWebpackServer = function () {
@@ -81,7 +83,8 @@ var runWebpackServer = function () {
 historyApiFallback: true,
 stats: {
   colors: true,
-}
+},
+headers: getCspHeaders(),
   };
 
   var compiler = webpack(config);
@@ -104,7 +107,6 @@ var runWebpackServer = function () {
   });
 
   server.app.all('*', function (req, res, next) {
-setCSP(res);
 proxy.web(req, res);
   });
 



fauxton commit: updated refs/heads/master to a16edae

2016-10-05 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master b404b07c8 -> a16edae68


pin velocity react to 1.1.6

Array.prototype.includes breaks our phantom tests


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a16edae6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a16edae6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a16edae6

Branch: refs/heads/master
Commit: a16edae686adb630fa294989de1bdb25330229fd
Parents: b404b07
Author: Robert Kowalski 
Authored: Wed Oct 5 14:48:06 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Oct 5 14:48:12 2016 +0200

--
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a16edae6/package.json
--
diff --git a/package.json b/package.json
index 0e38b94..8ac5093 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
 "url-loader": "^0.5.7",
 "urls": "~0.0.3",
 "velocity-animate": "^1.2.3",
-"velocity-react": "^1.1.4",
+"velocity-react": "1.1.6",
 "visualizeRevTree": 
"git+https://github.com/neojski/visualizeRevTree.git#gh-pages";,
 "webpack": "^1.12.12",
 "webpack-dev-server": "^1.14.1",



fauxton commit: updated refs/heads/master to b404b07

2016-09-30 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 6fbf911a0 -> b404b07c8


breadcrumbs: readd css fix

readd missing commit


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b404b07c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b404b07c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b404b07c

Branch: refs/heads/master
Commit: b404b07c8f008fddd93c3225c19e2101244f710b
Parents: 6fbf911
Author: Robert Kowalski 
Authored: Fri Sep 30 13:04:48 2016 +0200
Committer: Robert Kowalski 
Committed: Fri Sep 30 13:04:52 2016 +0200

--
 app/addons/documents/assets/less/header-docs-left.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b404b07c/app/addons/documents/assets/less/header-docs-left.less
--
diff --git a/app/addons/documents/assets/less/header-docs-left.less 
b/app/addons/documents/assets/less/header-docs-left.less
index fc456b1..2dccdc7 100644
--- a/app/addons/documents/assets/less/header-docs-left.less
+++ b/app/addons/documents/assets/less/header-docs-left.less
@@ -21,7 +21,7 @@
   border-right: 1px solid #ccc;
 }
 
-.faux-header__doc-header-dropdown-toggle {
+button.faux-header__doc-header-dropdown-toggle {
   border: none;
   height: @collapsedNavWidth;
   right: 0;



fauxton commit: updated refs/heads/master to 6fbf911

2016-09-30 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 73a90d213 -> 6fbf911a0


react: breadcrumbs

reactify former "breadcrumb"-area.

PR: #765
PR-URL: https://github.com/apache/couchdb-fauxton/pull/765
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6fbf911a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6fbf911a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6fbf911a

Branch: refs/heads/master
Commit: 6fbf911a0932dd6f8c266ab2bf163267839070d6
Parents: 73a90d2
Author: Robert Kowalski 
Authored: Thu Aug 18 13:36:04 2016 +0200
Committer: Robert Kowalski 
Committed: Fri Sep 30 10:47:37 2016 +0200

--
 app/addons/components/actions.js|   2 +-
 .../components/assets/less/components.less  |   1 -
 .../assets/less/header-breadcrumbs.less |   3 +
 .../components/assets/less/left-header.less |  26 -
 .../components/react-components.react.jsx   |  18 ++--
 app/addons/databases/base.js|   2 +-
 .../tests/nightwatch/deletesDatabase.js |   6 +-
 .../nightwatch/deletesDatabaseSpecialChars.js   |  13 +--
 .../documents/assets/less/doc-editor.less   |   4 -
 app/addons/documents/assets/less/documents.less |   7 +-
 .../documents/assets/less/header-docs-left.less |  78 ++
 .../documents/components/header-docs-left.jsx   |  92 
 .../documents/components/header-docs-right.jsx  |  45 
 .../components/rightalldocsheader.react.jsx |  45 
 app/addons/documents/helpers.js |   8 +-
 app/addons/documents/routes-documents.js|   7 +-
 app/addons/documents/routes-index-editor.js |   2 +-
 app/addons/documents/routes-mango.js|   2 +-
 app/addons/documents/shared-routes.js   |  17 ++-
 .../tests/nightwatch/deleteDatabaseModal.js |  14 +--
 .../tests/nightwatch/doubleEmitResults.js   |   1 -
 .../documents/tests/nightwatch/viewCreate.js|  18 ++--
 .../tests/nightwatch/viewCreateBadView.js   |   8 +-
 .../documents/tests/nightwatch/viewEdit.js  |  49 -
 app/addons/fauxton/base.js  |   3 -
 app/addons/fauxton/components.js| 105 ---
 app/addons/fauxton/templates/breadcrumbs.html   |  34 --
 app/addons/fauxton/templates/header_left.html   |  18 
 app/addons/fauxton/tests/breadcrumbsViewSpec.js | 100 --
 app/addons/fauxton/tests/componentsSpec.js  |  35 ---
 app/addons/permissions/routes.js|   3 -
 app/templates/layouts/with_tabs_sidebar.html|   2 +-
 assets/less/fauxton.less|  96 -
 assets/less/layouts.less|  17 ---
 assets/less/templates.less  |   9 --
 35 files changed, 296 insertions(+), 594 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6fbf911a/app/addons/components/actions.js
--
diff --git a/app/addons/components/actions.js b/app/addons/components/actions.js
index 53ccd15..8fb6593 100644
--- a/app/addons/components/actions.js
+++ b/app/addons/components/actions.js
@@ -43,7 +43,7 @@ function showDeleteDatabaseModal (options) {
 }
 
 function deleteDatabase (dbId) {
-  var url = FauxtonAPI.urls('databaseBaseURL', 'server', dbId, '');
+  const url = FauxtonAPI.urls('databaseBaseURL', 'server', dbId, '');
 
   $.ajax({
 url: url,

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6fbf911a/app/addons/components/assets/less/components.less
--
diff --git a/app/addons/components/assets/less/components.less 
b/app/addons/components/assets/less/components.less
index ac57783..6df33c8 100644
--- a/app/addons/components/assets/less/components.less
+++ b/app/addons/components/assets/less/components.less
@@ -21,5 +21,4 @@
 @import "badges.less";
 @import "modals.less";
 @import "tab-element.less";
-@import "left-header.less";
 @import "header-breadcrumbs.less";

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6fbf911a/app/addons/components/assets/less/header-breadcrumbs.less
--
diff --git a/app/addons/components/assets/less/header-breadcrumbs.less 
b/app/addons/components/assets/less/header-breadcrumbs.less
index 37f5bd2..c59fd9a 100644
--- a/app/addons/components/assets/less/header-breadcrumbs.less
+++ b/app/addons/components/assets/less/header-breadcrumbs.less
@@ -10,8 +10,11 @@
 // License for the specific language governing permissions and limitations 
under
 // the License.
 
+@import "../../../../../assets/less/

fauxton commit: updated refs/heads/master to ceccc8e

2016-09-28 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master ad3a0d751 -> ceccc8e46


Revert "add failing test"

This reverts commit 73d574e10ed5dfb0ee7a9efcef86df5b4e54b762.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ceccc8e4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ceccc8e4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ceccc8e4

Branch: refs/heads/master
Commit: ceccc8e46be797304ba89a2fd1e2275531a2a08e
Parents: ad3a0d7
Author: Robert Kowalski 
Authored: Wed Sep 28 14:55:12 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 28 14:55:12 2016 +0200

--
 .../nightwatch/deletesDatabaseSpecialChars.js   | 28 +++-
 1 file changed, 4 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ceccc8e4/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
--
diff --git 
a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js 
b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
index b2e31bc..b2ca4c8 100644
--- a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
+++ b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
@@ -10,12 +10,13 @@
 // License for the specific language governing permissions and limitations 
under
 // the License.
 
-const newDatabaseName = 'one/two-three/_four';
+
 
 module.exports = {
   'Deletes a database with special chars': function (client) {
-const waitTime = client.globals.maxWaitTime;
-const baseUrl = client.globals.test_settings.launch_url;
+var waitTime = client.globals.maxWaitTime,
+newDatabaseName = 'one/two-three/_four', // add any other chars here 
you want to test
+baseUrl = client.globals.test_settings.launch_url;
 
 client
   .createDatabase(newDatabaseName)
@@ -32,26 +33,5 @@ module.exports = {
   .checkForDatabaseDeleted(newDatabaseName, waitTime)
 
 .end();
-  },
-
-  'Deletes a database from the list with special chars': function (client) {
-const waitTime = client.globals.maxWaitTime;
-const baseUrl = client.globals.test_settings.launch_url;
-
-client
-  .createDatabase(newDatabaseName)
-  .loginToGUI()
-  .url(baseUrl + '/#/_all_dbs/')
-
-  .waitForElementPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]', waitTime, false)
-  .assert.elementPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]')
-  .clickWhenVisible('[title="Delete ' + newDatabaseName + '"]', waitTime, 
false)
-  .setValue('.delete-db-modal input[type="text"]', [newDatabaseName, 
client.Keys.ENTER])
-  .waitForElementNotPresent('.global-notification .fonticon-cancel', 
waitTime, false)
-  .waitForElementPresent('.fauxton-table-list', waitTime, false)
-  .checkForDatabaseDeleted(newDatabaseName, waitTime)
-  .assert.elementNotPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]')
-
-.end();
   }
 };



[1/2] fauxton commit: updated refs/heads/master to ad3a0d7

2016-09-28 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 9c69f1cb2 -> ad3a0d751


add failing test


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/73d574e1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/73d574e1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/73d574e1

Branch: refs/heads/master
Commit: 73d574e10ed5dfb0ee7a9efcef86df5b4e54b762
Parents: 9c69f1c
Author: Robert Kowalski 
Authored: Wed Sep 28 14:07:12 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 28 14:42:16 2016 +0200

--
 .../nightwatch/deletesDatabaseSpecialChars.js   | 28 +---
 1 file changed, 24 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/73d574e1/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
--
diff --git 
a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js 
b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
index b2ca4c8..b2e31bc 100644
--- a/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
+++ b/app/addons/databases/tests/nightwatch/deletesDatabaseSpecialChars.js
@@ -10,13 +10,12 @@
 // License for the specific language governing permissions and limitations 
under
 // the License.
 
-
+const newDatabaseName = 'one/two-three/_four';
 
 module.exports = {
   'Deletes a database with special chars': function (client) {
-var waitTime = client.globals.maxWaitTime,
-newDatabaseName = 'one/two-three/_four', // add any other chars here 
you want to test
-baseUrl = client.globals.test_settings.launch_url;
+const waitTime = client.globals.maxWaitTime;
+const baseUrl = client.globals.test_settings.launch_url;
 
 client
   .createDatabase(newDatabaseName)
@@ -33,5 +32,26 @@ module.exports = {
   .checkForDatabaseDeleted(newDatabaseName, waitTime)
 
 .end();
+  },
+
+  'Deletes a database from the list with special chars': function (client) {
+const waitTime = client.globals.maxWaitTime;
+const baseUrl = client.globals.test_settings.launch_url;
+
+client
+  .createDatabase(newDatabaseName)
+  .loginToGUI()
+  .url(baseUrl + '/#/_all_dbs/')
+
+  .waitForElementPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]', waitTime, false)
+  .assert.elementPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]')
+  .clickWhenVisible('[title="Delete ' + newDatabaseName + '"]', waitTime, 
false)
+  .setValue('.delete-db-modal input[type="text"]', [newDatabaseName, 
client.Keys.ENTER])
+  .waitForElementNotPresent('.global-notification .fonticon-cancel', 
waitTime, false)
+  .waitForElementPresent('.fauxton-table-list', waitTime, false)
+  .checkForDatabaseDeleted(newDatabaseName, waitTime)
+  .assert.elementNotPresent('a[href="#/database/' + newDatabaseName + 
'/_all_docs"]')
+
+.end();
   }
 };



[2/2] fauxton commit: updated refs/heads/master to ad3a0d7

2016-09-28 Thread robertkowalski
add build status badge


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ad3a0d75
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ad3a0d75
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ad3a0d75

Branch: refs/heads/master
Commit: ad3a0d751105cb9793da9f7775a39e84229d0f4c
Parents: 73d574e
Author: Robert Kowalski 
Authored: Wed Sep 28 14:48:44 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 28 14:48:44 2016 +0200

--
 readme.md | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ad3a0d75/readme.md
--
diff --git a/readme.md b/readme.md
index 072f66b..55bde12 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,5 @@
+[![Build 
Status](https://travis-ci.org/apache/couchdb-fauxton.svg?branch=master)](https://travis-ci.org/apache/couchdb-fauxton)
+
 # Fauxton
 
 



[2/2] fauxton commit: updated refs/heads/master to 9c69f1c

2016-09-28 Thread robertkowalski
add failing test

PR: #778
PR-URL: https://github.com/apache/couchdb-fauxton/pull/778
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7e7a601f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7e7a601f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7e7a601f

Branch: refs/heads/master
Commit: 7e7a601f555164745ee5ad638099489bd9a5598b
Parents: 1755469
Author: Robert Kowalski 
Authored: Tue Sep 27 14:47:52 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 28 12:55:46 2016 +0200

--
 .../tests/nightwatch/designConflicts.js | 28 
 test/create-animal-db.js| 21 -
 .../custom-commands/createAnimalDb.js   | 13 +-
 .../custom-commands/populateDatabase.js | 46 ++--
 4 files changed, 92 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7e7a601f/app/addons/documents/tests/nightwatch/designConflicts.js
--
diff --git a/app/addons/documents/tests/nightwatch/designConflicts.js 
b/app/addons/documents/tests/nightwatch/designConflicts.js
new file mode 100644
index 000..bbeee91
--- /dev/null
+++ b/app/addons/documents/tests/nightwatch/designConflicts.js
@@ -0,0 +1,28 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations 
under
+// the License.
+
+
+module.exports = {
+
+  'Shows the editor for conflicting docs': function (client) {
+
+const waitTime = client.globals.maxWaitTime;
+const baseUrl = client.globals.test_settings.launch_url;
+
+client
+  .createAnimalDb()
+  .loginToGUI()
+  .url(baseUrl + '/#/database/animaldb/_design/conflicts')
+  .waitForElementPresent('#editor-container', waitTime, false)
+  .end();
+  },
+};

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7e7a601f/test/create-animal-db.js
--
diff --git a/test/create-animal-db.js b/test/create-animal-db.js
index 65baf1a..c128c42 100644
--- a/test/create-animal-db.js
+++ b/test/create-animal-db.js
@@ -79,6 +79,26 @@ function createAnimalDb (url, cb) {
 (cb) => {
   deleteDatabase('animaldb-copy-2', cb);
 },
+(cb) => {
+
+  request({
+uri: `${url}/animaldb/${encodeURIComponent('_design/conflicts')}`,
+method: 'PUT',
+json: true,
+body: {
+  _id: "_design/conflicts",
+  language: "javascript",
+  "views":{"new-view":{"map":"function (doc) {\n  emit(doc._id, 
1);\n}"}}
+}
+  }, (err, res, body) => {
+if (err) {
+  throw err;
+}
+
+cb();
+  });
+
+}
   ], (err, result) => {
 cb();
   });
@@ -130,7 +150,6 @@ function createAnimalDb (url, cb) {
   method: 'PUT',
   body: data
 }, (err, res, body) => {
-  console.log(body);
   cb(null);
 });
   }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7e7a601f/test/nightwatch_tests/custom-commands/createAnimalDb.js
--
diff --git a/test/nightwatch_tests/custom-commands/createAnimalDb.js 
b/test/nightwatch_tests/custom-commands/createAnimalDb.js
index d21c255..e897272 100644
--- a/test/nightwatch_tests/custom-commands/createAnimalDb.js
+++ b/test/nightwatch_tests/custom-commands/createAnimalDb.js
@@ -14,6 +14,9 @@ const util = require('util');
 const events = require('events');
 const helpers = require('../helpers/helpers.js');
 
+const commandHelper = require('./helper.js');
+const checkForDatabaseCreated = commandHelper.checkForDatabaseCreated;
+
 const createAnimalDbHelper = require('../../create-animal-db.js');
 function CreateAnimalDb () {
   events.EventEmitter.call(this);
@@ -24,8 +27,14 @@ util.inherits(CreateAnimalDb, events.EventEmitter);
 
 CreateAnimalDb.prototype.command = function (databaseName) {
 
-  createAnimalDbHelper(this.client.options.db_url, () => {
-this.emit('complete');
+  const couchUrl = this.client.options.db_url;
+
+  createAnimalDbHelper(couchUrl, () => {
+
+checkForDatabaseCreate

[1/2] fauxton commit: updated refs/heads/master to 9c69f1c

2016-09-28 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 175546946 -> 9c69f1cb2


doc editor: fix ambiguous routing

given you created a design doc called `_design/conflicts` it
would match with the route for the conflict browser and not with
the document editor.

PR: #778
PR-URL: https://github.com/apache/couchdb-fauxton/pull/778
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9c69f1cb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9c69f1cb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9c69f1cb

Branch: refs/heads/master
Commit: 9c69f1cb2de794d40d2e3e1bb2cc7e62776bebae
Parents: 7e7a601
Author: Robert Kowalski 
Authored: Tue Sep 27 17:45:29 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 28 12:55:46 2016 +0200

--
 app/addons/documents/routes-doc-editor.js | 57 --
 app/addons/documents/routes.js|  1 -
 2 files changed, 16 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c69f1cb/app/addons/documents/routes-doc-editor.js
--
diff --git a/app/addons/documents/routes-doc-editor.js 
b/app/addons/documents/routes-doc-editor.js
index 718fd9a..196c642 100644
--- a/app/addons/documents/routes-doc-editor.js
+++ b/app/addons/documents/routes-doc-editor.js
@@ -21,45 +21,6 @@ import RevBrowserActions from 
"./rev-browser/rev-browser.actions";
 import RevBrowserComponents from "./rev-browser/rev-browser.components.react";
 
 
-const RevBrowserRouteObject = FauxtonAPI.RouteObject.extend({
-  layout: 'doc_editor',
-  selectedHeader: 'Databases',
-  roles: ['fx_loggedIn'],
-
-  routes: {
-'database/:database/:doc/conflicts': 'revisionBrowser'
-  },
-
-  initialize: function (route, masterLayout, options) {
-const databaseName = options[0];
-
-this.docId = options[1];
-this.database = this.database || new Databases.Model({ id: databaseName });
-this.doc = new Documents.Doc({ _id: this.docId }, { database: 
this.database });
-  },
-
-  crumbs: function () {
-const backLink = FauxtonAPI.urls('allDocs', 'app', this.database.safeID());
-const docUrl = FauxtonAPI.urls('document', 'app', this.database.safeID(), 
this.docId);
-
-return [
-  { name: this.database.safeID(), link: backLink },
-  { name: this.docId + ' > Conflicts' }
-];
-  },
-
-  apiUrl: function () {
-return [this.doc.url('apiurl'), this.doc.documentation()];
-  },
-
-  revisionBrowser: function (databaseName, docId) {
-RevBrowserActions.showConfirmModal(false, null);
-RevBrowserActions.initDiffEditor(databaseName, docId);
-this.setComponent('#dashboard-content', 
RevBrowserComponents.DiffyController);
-  }
-
-});
-
 const DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
   layout: 'doc_editor',
   selectedHeader: 'Databases',
@@ -74,6 +35,7 @@ const DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
   },
 
   routes: {
+'database/:database/:doc/conflicts': 'revisionBrowser',
 'database/:database/:doc/code_editor': 'codeEditor',
 'database/:database/_design/:ddoc': 'showDesignDoc',
 'database/:database/:doc': 'codeEditor',
@@ -82,6 +44,20 @@ const DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
 
   crumbs: function () {},
 
+  revisionBrowser: function (databaseName, docId) {
+const backLink = FauxtonAPI.urls('allDocs', 'app', this.database.safeID());
+const docUrl = FauxtonAPI.urls('document', 'app', this.database.safeID(), 
this.docId);
+
+this.crumbs = [
+  { name: this.database.safeID(), link: backLink },
+  { name: this.docId + ' > Conflicts' }
+];
+
+RevBrowserActions.showConfirmModal(false, null);
+RevBrowserActions.initDiffEditor(databaseName, docId);
+this.setComponent('#dashboard-content', 
RevBrowserComponents.DiffyController);
+  },
+
   codeEditor: function (databaseName, docId) {
 const backLink = FauxtonAPI.urls('allDocs', 'app', databaseName);
 
@@ -114,6 +90,5 @@ const DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
 
 
 export default {
-  DocEditorRouteObject: DocEditorRouteObject,
-  RevBrowserRouteObject: RevBrowserRouteObject
+  DocEditorRouteObject: DocEditorRouteObject
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c69f1cb/app/addons/documents/routes.js
--
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index c08a347..201659a 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -18,7 +18,6 @@ import Mango from "./routes-mango";
 
 Documents.RouteObjects = [
   docEditor.DocEditorRouteObject,
-  docEdit

fauxton commit: updated refs/heads/master to 1755469

2016-09-28 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 717512f5f -> 175546946


views: remove fauxton side check for js warnings / errors

these should be checked in one single place, the database.

this way we don't have to maintain two separate whitelists for
errors.

PR: #780
PR-URL: https://github.com/apache/couchdb-fauxton/pull/780
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/17554694
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/17554694
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/17554694

Branch: refs/heads/master
Commit: 1755469468af811033d79a2e003b3e90221ffd34
Parents: 717512f
Author: Robert Kowalski 
Authored: Tue Sep 27 18:52:09 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 28 12:54:20 2016 +0200

--
 app/addons/documents/index-editor/actions.js|  6 +
 .../documents/index-editor/components.react.jsx | 15 
 .../tests/viewIndex.componentsSpec.react.jsx| 18 ---
 .../documents/tests/nightwatch/viewCreate.js| 24 
 4 files changed, 30 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/17554694/app/addons/documents/index-editor/actions.js
--
diff --git a/app/addons/documents/index-editor/actions.js 
b/app/addons/documents/index-editor/actions.js
index 48d1c21..6de2928 100644
--- a/app/addons/documents/index-editor/actions.js
+++ b/app/addons/documents/index-editor/actions.js
@@ -90,6 +90,12 @@ function saveView (viewInfo) {
 FauxtonAPI.dispatch({ type: ActionTypes.VIEW_SAVED });
 var fragment = FauxtonAPI.urls('view', 'showView', 
viewInfo.database.safeID(), designDoc.safeID(), 
app.utils.safeURLName(viewInfo.viewName));
 FauxtonAPI.navigate(fragment, { trigger: true });
+  }, (xhr) => {
+FauxtonAPI.addNotification({
+  msg: `${xhr.responseJSON.reason}`,
+  type: 'error',
+  clear: true
+});
   });
 }
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/17554694/app/addons/documents/index-editor/components.react.jsx
--
diff --git a/app/addons/documents/index-editor/components.react.jsx 
b/app/addons/documents/index-editor/components.react.jsx
index ff01e3a..4b461e0 100644
--- a/app/addons/documents/index-editor/components.react.jsx
+++ b/app/addons/documents/index-editor/components.react.jsx
@@ -271,12 +271,6 @@ var EditorController = React.createClass({
 }
   },
 
-  hasErrors: function () {
-var mapEditorErrors = this.refs.mapEditor.getEditor().hasErrors();
-var customReduceErrors = (store.hasCustomReduce()) ? 
this.refs.reduceEditor.getEditor().hasErrors() : false;
-return mapEditorErrors || customReduceErrors;
-  },
-
   saveView: function (e) {
 e.preventDefault();
 
@@ -284,15 +278,6 @@ var EditorController = React.createClass({
   return;
 }
 
-if (this.hasErrors()) {
-  FauxtonAPI.addNotification({
-msg: 'Please fix the Javascript errors and try again.',
-type: 'error',
-clear: true
-  });
-  return;
-}
-
 Actions.saveView({
   database: this.state.database,
   newView: this.state.isNewView,

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/17554694/app/addons/documents/index-editor/tests/viewIndex.componentsSpec.react.jsx
--
diff --git 
a/app/addons/documents/index-editor/tests/viewIndex.componentsSpec.react.jsx 
b/app/addons/documents/index-editor/tests/viewIndex.componentsSpec.react.jsx
index a12409c..d36ee3a 100644
--- a/app/addons/documents/index-editor/tests/viewIndex.componentsSpec.react.jsx
+++ b/app/addons/documents/index-editor/tests/viewIndex.componentsSpec.react.jsx
@@ -259,24 +259,6 @@ describe('Editor', function () {
 sandbox.restore();
   });
 
-  it('returns false on invalid map editor code', function () {
-var stub = sandbox.stub(editorEl.refs.mapEditor.getEditor(), 'hasErrors');
-stub.returns(false);
-assert.notOk(editorEl.hasErrors());
-  });
-
-  it('returns true on valid map editor code', function () {
-var stub = sandbox.stub(editorEl.refs.mapEditor.getEditor(), 'hasErrors');
-stub.returns(true);
-assert.ok(editorEl.hasErrors());
-  });
-
-  it('returns false on non-custom reduce', function () {
-var stub = sandbox.stub(Stores.indexEditorStore, 'hasCustomReduce');
-stub.returns(false);
-assert.notOk(editorEl.hasErrors());
-  });
-
   it('calls changeViewName on view name change', function () {
 var viewName = 'new-name';
 var spy = sandbox.spy(Actions, 'changeViewName')

fauxton commit: updated refs/heads/master to 0a13f5d

2016-09-27 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 809c46a88 -> 0a13f5dca


remove update sequence from db list

right now the update sequence display is broken. they also make
no sense in a clustered setup.

this patch removes them test-wise. we can readd them if there is
a lot demand for seeing them, but as we got no bug reports in
almost 2 years it seems it is a dead feature.

PR: #776
PR-URL: https://github.com/apache/couchdb-fauxton/pull/776
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0a13f5dc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0a13f5dc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0a13f5dc

Branch: refs/heads/master
Commit: 0a13f5dca592204b0b466c86a1afa77e6055c49e
Parents: 809c46a
Author: Robert Kowalski 
Authored: Mon Sep 26 17:56:22 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 27 16:01:53 2016 +0200

--
 app/addons/databases/components.react.jsx|  2 --
 app/addons/databases/resources.js| 11 ---
 .../databases/tests/componentsSpec.react.jsx | 19 +--
 app/addons/documents/index-results/stores.js |  6 --
 4 files changed, 5 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0a13f5dc/app/addons/databases/components.react.jsx
--
diff --git a/app/addons/databases/components.react.jsx 
b/app/addons/databases/components.react.jsx
index e2c1ea4..d96a8e6 100644
--- a/app/addons/databases/components.react.jsx
+++ b/app/addons/databases/components.react.jsx
@@ -119,7 +119,6 @@ var DatabaseTable = React.createClass({
   Name
   Size
   # of Docs
-  Update Seq
   {this.getExtensionColumns()}
   Actions
 
@@ -186,7 +185,6 @@ var DatabaseRow = React.createClass({
 
 {size}
 {row.status.numDocs()} {this.renderGraveyard(row)}
-{row.status.updateSeq()}
 {this.getExtensionColumns(row)}
 
   http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0a13f5dc/app/addons/databases/resources.js
--
diff --git a/app/addons/databases/resources.js 
b/app/addons/databases/resources.js
index 73c76d7..7b8876b 100644
--- a/app/addons/databases/resources.js
+++ b/app/addons/databases/resources.js
@@ -131,17 +131,6 @@ Databases.Status = FauxtonAPI.Model.extend({
 return this.numDeletedDocs() > this.numDocs();
   },
 
-  updateSeq: function (full) {
-var updateSeq = this.get("update_seq");
-if (full || (typeof(updateSeq) === 'number')) {
-  return updateSeq;
-} else if (updateSeq) {
-  return updateSeq[0];
-} else {
-  return 0;
-}
-  },
-
   dataSize: function () {
 if (this.get("other")) {
   return this.get("other").data_size;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0a13f5dc/app/addons/databases/tests/componentsSpec.react.jsx
--
diff --git a/app/addons/databases/tests/componentsSpec.react.jsx 
b/app/addons/databases/tests/componentsSpec.react.jsx
index a20f62e..38b1de8 100644
--- a/app/addons/databases/tests/componentsSpec.react.jsx
+++ b/app/addons/databases/tests/componentsSpec.react.jsx
@@ -19,6 +19,7 @@ import React from "react";
 import ReactDOM from "react-dom";
 import TestUtils from "react-addons-test-utils";
 import sinon from "sinon";
+import { mount } from 'enzyme';
 
 var assert = utils.assert;
 
@@ -49,9 +50,6 @@ describe('DatabasesController', function () {
 },
 "isGraveYard": function () {
   return false;
-},
-"updateSeq": function () {
-  return 99;
 }
   }
 },
@@ -76,9 +74,6 @@ describe('DatabasesController', function () {
 },
 "isGraveYard": function () {
   return true;
-},
-"updateSeq": function () {
-  return 399;
 }
   }
 }
@@ -102,7 +97,6 @@ describe('DatabasesController', function () {
 assert.equal("2.0 MB", 
el.getElementsByTagName('tr')[1].getElementsByTagName('td')[1].innerText.trim());
 assert.equal("88", 
el.getElementsByTagName('tr')[1].getElementsByTagName('td')[2].innerText.trim());
 assert.equal(0, 
el.getElementsByTagName('tr')[1].getElementsByTagName('td')[2].getElementsByTagName("i").length);
-assert.equal(3, 
el.getElementsByTagName('tr')[1].getElementsByTagName('td')[4].getElementsByTagName("a").length);
 assert.equal("db2", 
el.getEleme

couchdb commit: updated refs/heads/rebar3 to 57637d4

2016-09-27 Thread robertkowalski
Repository: couchdb
Updated Branches:
  refs/heads/rebar3 [created] 57637d473


wip


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/57637d47
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/57637d47
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/57637d47

Branch: refs/heads/rebar3
Commit: 57637d4736d9857356069e1480449b45e71972ef
Parents: 9add02f
Author: Robert Kowalski 
Authored: Tue Sep 27 14:57:45 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 27 14:57:45 2016 +0200

--
 Makefile|  2 +-
 configure   | 18 --
 rebar.config.script | 64 
 3 files changed, 43 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/57637d47/Makefile
--
diff --git a/Makefile b/Makefile
index 018c845..23c7031 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 
 include version.mk
 
-REBAR?=$(shell echo `pwd`/bin/rebar)
+REBAR?=$(shell echo `pwd`/bin/rebar3)
 IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
 COUCHDB_VERSION_SUFFIX = $(shell if [ -d .git ]; then echo '-`git rev-parse 
--short --verify HEAD`'; fi)
 COUCHDB_VERSION = 
$(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX)

http://git-wip-us.apache.org/repos/asf/couchdb/blob/57637d47/configure
--
diff --git a/configure b/configure
index 5a39e0a..274c906 100755
--- a/configure
+++ b/configure
@@ -82,9 +82,9 @@ parse_opts() {
 
 --rebar)
 if [ -x "$2" ]; then
-version=`$2 --version 2> /dev/null | grep -o 
"2\.[6-9]\.[0-9]"`
+version=`$2 --version 2> /dev/null | grep -o 
"3\.[6-9]\.[0-9]"`
 if [ $? -ne 0 ]; then
-printf 'Rebar >=2.6.0 and <3.0.0 required' >&2
+printf 'Rebar >3.0.0 required' >&2
 exit 1
 fi
 eval REBAR=$2
@@ -187,23 +187,25 @@ EOF
 
 
 install_local_rebar() {
-if [ ! -x "${rootdir}/bin/rebar" ]; then
+if [ ! -x "${rootdir}/bin/rebar3" ]; then
 if [ ! -d "${rootdir}/src/rebar" ]; then
-git clone --depth 1 --branch 2.6.0 
https://git-wip-us.apache.org/repos/asf/couchdb-rebar.git ${rootdir}/src/rebar
+git clone --depth 1 --branch 3.3.1 
https://github.com/erlang/rebar3.git ${rootdir}/src/rebar
 fi
-make -C ${rootdir}/src/rebar
-mv ${rootdir}/src/rebar/rebar ${rootdir}/bin/rebar
-make -C ${rootdir}/src/rebar clean
+cd ${rootdir}/src/rebar && ./bootstrap
+${rootdir}/src/rebar/rebar3 clean
+mv ${rootdir}/src/rebar/rebar3 ${rootdir}/bin/rebar3
+
 fi
 }
 
 
 if [ -z "${REBAR}" ]; then
 install_local_rebar
-REBAR=${rootdir}/bin/rebar
+REBAR=${rootdir}/bin/rebar3
 fi
 
 
+### mehhh
 # only update dependencies, when we are not in a release tarball
 if [ -d .git  -a $SKIP_DEPS -ne 1 ]; then
 echo "==> updating dependencies"

http://git-wip-us.apache.org/repos/asf/couchdb/blob/57637d47/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 1639d01..1c8ebb9 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,39 +23,39 @@ os:putenv("COUCHDB_APPS_CONFIG_DIR", 
filename:join([COUCHDB_ROOT, "rel/apps"])).
 
 DepDescs = [
 %% must be compiled first as it has a custom behavior
-{couch_epi,"couch-epi",
"f6ad55d804ac741b59fe37dd092787113847661c"},
-{config,   "config",   
"a83b75ef4d3dc80071ae8ae412fb0c724726d12c"},
+{couch_epi,"couch-epi",{ref, 
"f6ad55d804ac741b59fe37dd092787113847661c"}},
+{config,   "config",   {ref, 
"a83b75ef4d3dc80071ae8ae412fb0c724726d12c"}},
 %% keep these sorted
-{b64url,   "b64url",   
"6895652d80f95cdf04efb14625abed868998f174"},
-{couch_log,"couch-log",
"ad803f66dbd1900b67543259142875a6d03503ce"},
-{chttpd,   "chttpd",   
"2c1f3a3167b4b667ec8cbc5a5079911a17630753"},
-{couch,"couch",
"a468b0db6f1a9795b32e26c34b340df4d51f31b0"},
-{couch_index,  "couch-index",  
"53555fd909d5dd3d4a610c3fd6795950a8f7d022"},
-{couch_mrview, "couch-mrview", 
"a0b0392afe66ece9ef3bb4fdd5a4f159c97c47eb"},
-{couch_replicator, "couch-replicator", 
"b9232c8d410d529d65030896e075c4b4327631b0"},
-{couch_plugins,"couch-plugins",
"3e73b723cb126cfc471b560d17c24a8b5c540085"},
-{couch_event,  "couch-event",  
"7e382132219d708239306aa3591740694943d367"},
-{couch_stats,  "couch-stats",  

couchdb commit: updated refs/heads/master to 0929b3d

2016-09-27 Thread robertkowalski
Repository: couchdb
Updated Branches:
  refs/heads/master 9add02fa8 -> 0929b3dd6


license: remove spin.js


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0929b3dd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0929b3dd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0929b3dd

Branch: refs/heads/master
Commit: 0929b3dd62864a41ed18a2cf879fb3dac0207d19
Parents: 9add02f
Author: Robert Kowalski 
Authored: Tue Sep 27 14:41:16 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 27 14:41:16 2016 +0200

--
 LICENSE | 27 ---
 1 file changed, 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/0929b3dd/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 19cc6e7..086b2dd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -759,33 +759,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
SUCH DAMAGE.
 
 
 
-
-for src/fauxton/assets/js/libs/spin.min.js
-for share/www/js/require*
-
-  The MIT License
-
-  Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-
 for src/fauxton/assets/js/libs/bootstrap.js
 for share/www/js/require*
 



[3/3] fauxton commit: updated refs/heads/master to 809c46a

2016-09-27 Thread robertkowalski
remove spinner

all views except replication are react based now

PR: #772
PR-URL: https://github.com/apache/couchdb-fauxton/pull/772
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/78f6c080
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/78f6c080
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/78f6c080

Branch: refs/heads/master
Commit: 78f6c080157f20145ff9e70436a318632620d791
Parents: 1dba30e
Author: Robert Kowalski 
Authored: Wed Sep 14 11:34:59 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 27 14:39:54 2016 +0200

--
 app/addons/activetasks/routes.js|  1 -
 app/addons/auth/routes.js   |  1 -
 app/addons/databases/routes.js  |  1 -
 app/addons/documentation/routes.js  |  1 -
 app/addons/documents/routes-doc-editor.js   |  2 -
 app/addons/documents/routes-mango.js|  2 -
 .../documents/tests/nightwatch/viewEdit.js  |  7 --
 app/addons/fauxton/components.js| 84 
 app/core/base.js|  1 -
 app/core/routeObject.js |  1 -
 assets/less/fauxton.less|  6 --
 11 files changed, 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/78f6c080/app/addons/activetasks/routes.js
--
diff --git a/app/addons/activetasks/routes.js b/app/addons/activetasks/routes.js
index cee53e3..e81dab2 100644
--- a/app/addons/activetasks/routes.js
+++ b/app/addons/activetasks/routes.js
@@ -19,7 +19,6 @@ import Actions from "./actions";
 var ActiveTasksRouteObject = FauxtonAPI.RouteObject.extend({
   selectedHeader: 'Active Tasks',
   layout: 'one_pane',
-  disableLoader: true,
   routes: {
 'activetasks/:id': 'showActiveTasks',
 'activetasks': 'showActiveTasks'

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/78f6c080/app/addons/auth/routes.js
--
diff --git a/app/addons/auth/routes.js b/app/addons/auth/routes.js
index 2e42f4b..b0e41d5 100644
--- a/app/addons/auth/routes.js
+++ b/app/addons/auth/routes.js
@@ -27,7 +27,6 @@ var AuthRouteObject = FauxtonAPI.RouteObject.extend({
 'createAdmin': 'checkNodes',
 'createAdmin/:node': 'createAdminForNode'
   },
-  disableLoader: true,
   hideNotificationCenter: true,
 
   checkNodes: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/78f6c080/app/addons/databases/routes.js
--
diff --git a/app/addons/databases/routes.js b/app/addons/databases/routes.js
index 00e8b28..6fa5722 100644
--- a/app/addons/databases/routes.js
+++ b/app/addons/databases/routes.js
@@ -32,7 +32,6 @@ var AllDbsRouteObject = FauxtonAPI.RouteObject.extend({
   roles: ['fx_loggedIn'],
 
   selectedHeader: "Databases",
-  disableLoader: true,
 
   initialize: function () {
 this.databases = new Databases.List();

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/78f6c080/app/addons/documentation/routes.js
--
diff --git a/app/addons/documentation/routes.js 
b/app/addons/documentation/routes.js
index c253645..5205164 100644
--- a/app/addons/documentation/routes.js
+++ b/app/addons/documentation/routes.js
@@ -17,7 +17,6 @@ import DocumentationComponents from "./components.react";
 var DocumentationRouteObject = FauxtonAPI.RouteObject.extend({
   selectedHeader: 'Documentation',
   layout: 'one_pane',
-  disableLoader: false,
   routes: {
 'documentation': 'documentation'
   },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/78f6c080/app/addons/documents/routes-doc-editor.js
--
diff --git a/app/addons/documents/routes-doc-editor.js 
b/app/addons/documents/routes-doc-editor.js
index 828ec63..718fd9a 100644
--- a/app/addons/documents/routes-doc-editor.js
+++ b/app/addons/documents/routes-doc-editor.js
@@ -23,7 +23,6 @@ import RevBrowserComponents from 
"./rev-browser/rev-browser.components.react";
 
 const RevBrowserRouteObject = FauxtonAPI.RouteObject.extend({
   layout: 'doc_editor',
-  disableLoader: true,
   selectedHeader: 'Databases',
   roles: ['fx_loggedIn'],
 
@@ -63,7 +62,6 @@ const RevBrowserRouteObject = FauxtonAPI.RouteObject.extend({
 
 const DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
   layout: 'doc_editor',
-  disableLoader: true,
   selectedHeader: 'Databases',
 
   roles: ['fx_loggedIn'],

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/78f6c080/app/addons/docume

[1/3] fauxton commit: updated refs/heads/master to 809c46a

2016-09-27 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 1dba30e81 -> 809c46a88


try to harden test

PR: #772
PR-URL: https://github.com/apache/couchdb-fauxton/pull/772
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/809c46a8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/809c46a8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/809c46a8

Branch: refs/heads/master
Commit: 809c46a884b5b9da609e0a9bd47a507a1516f50b
Parents: 1347b9a
Author: Robert Kowalski 
Authored: Thu Sep 15 14:59:53 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 27 14:39:54 2016 +0200

--
 app/addons/fauxton/tests/nightwatch/notificationCenter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/809c46a8/app/addons/fauxton/tests/nightwatch/notificationCenter.js
--
diff --git a/app/addons/fauxton/tests/nightwatch/notificationCenter.js 
b/app/addons/fauxton/tests/nightwatch/notificationCenter.js
index ef7d96f..b1bac4c 100644
--- a/app/addons/fauxton/tests/nightwatch/notificationCenter.js
+++ b/app/addons/fauxton/tests/nightwatch/notificationCenter.js
@@ -27,7 +27,7 @@ module.exports = {
   .loginToGUI()
   .waitForElementPresent('#notification-center-btn', waitTime, false)
   .assert.cssClassNotPresent('.notification-center-panel', 'visible')
-  .clickWhenVisible('#notification-center-btn .fonticon-bell', waitTime, 
false)
+  .clickWhenVisible('#notification-center-btn', waitTime, false)
   .waitForElementPresent('.notification-center-panel.visible', waitTime, 
false)
 
   .getText('.notification-center-panel', function (result) {



[2/3] fauxton commit: updated refs/heads/master to 809c46a

2016-09-27 Thread robertkowalski
remove spin.js lib

PR: #772
PR-URL: https://github.com/apache/couchdb-fauxton/pull/772
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/1347b9ab
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/1347b9ab
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/1347b9ab

Branch: refs/heads/master
Commit: 1347b9ab6c377717308fa233858194918240db87
Parents: 78f6c08
Author: Robert Kowalski 
Authored: Wed Sep 14 11:35:12 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 27 14:39:54 2016 +0200

--
 assets/js/libs/spin.min.js | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/1347b9ab/assets/js/libs/spin.min.js
--
diff --git a/assets/js/libs/spin.min.js b/assets/js/libs/spin.min.js
deleted file mode 100644
index 9e61502..000
--- a/assets/js/libs/spin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a,b,c){function 
O(a){H(arguments,function(b,d){a[b]===c&&(a[b]=d)});return a}function 
N(a){H(arguments,function(b,c){a[m][M(a,b)||b]=c});return a}function M(a,b){var 
d=a[m],f,g;if(d[b]!==c){return 
b}b=b.charAt(0).toUpperCase()+b.slice(1);for(g=0;g

fauxton commit: updated refs/heads/master to 26adff3

2016-09-14 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master a3605ee84 -> 26adff3b0


backbone: delete dead code

PR: #773
PR-URL: https://github.com/apache/couchdb-fauxton/pull/773
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/26adff3b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/26adff3b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/26adff3b

Branch: refs/heads/master
Commit: 26adff3b033513177121918a25747699bc694e3c
Parents: a3605ee
Author: Robert Kowalski 
Authored: Wed Sep 14 11:47:19 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 14 17:12:07 2016 +0200

--
 app/addons/fauxton/components.js | 49 ---
 app/constants.js |  3 +--
 2 files changed, 1 insertion(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/26adff3b/app/addons/fauxton/components.js
--
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 540f508..37845cb 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -228,55 +228,6 @@ Components.Tray = FauxtonAPI.View.extend({
 });
 
 
-Components.ModalView = FauxtonAPI.View.extend({
-  disableLoader: true,
-
-  initialize: function (options) {
-_.bindAll(this);
-  },
-
-  afterRender: function () {
-var that = this;
-this.$('.modal').on('shown', function () {
-  that.$('input:text:visible:first').focus();
-});
-  },
-
-  showModal: function () {
-if (this._showModal) { this._showModal();}
-this.clear_error_msg();
-this.$('.modal').modal();
-
-// hack to get modal visible
-$('.modal-backdrop').css('z-index', 
FauxtonAPI.constants.MISC.MODAL_BACKDROP_Z_INDEX);
-  },
-
-  hideModal: function () {
-this.$('.modal').modal('hide');
-  },
-
-  set_error_msg: function (msg) {
-var text;
-if (typeof(msg) == 'string') {
-  text = msg;
-} else {
-  text = JSON.parse(msg.responseText).reason;
-}
-this.$('#modal-error').text(text).removeClass('hide');
-  },
-
-  clear_error_msg: function () {
-this.$('#modal-error').text(' ').addClass('hide');
-  },
-
-  serialize: function () {
-if (this.model) {
-  return this.model.toJSON();
-}
-return {};
-  }
-});
-
 Components.Typeahead = FauxtonAPI.View.extend({
 
   initialize: function (options) {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/26adff3b/app/constants.js
--
diff --git a/app/constants.js b/app/constants.js
index cbda246..a967db4 100644
--- a/app/constants.js
+++ b/app/constants.js
@@ -14,8 +14,7 @@ export default {
 
   MISC: {
 TRAY_TOGGLE_SPEED: 250,
-DEFAULT_PAGE_SIZE: 20,
-MODAL_BACKDROP_Z_INDEX: 1025
+DEFAULT_PAGE_SIZE: 20
   },
 
   DATABASES: {



[1/2] fauxton commit: updated refs/heads/dead-backbone to ec1139d

2016-09-14 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/dead-backbone [created] ec1139d36


remove spinner

all views except replication are react based now


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b9b89827
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b9b89827
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b9b89827

Branch: refs/heads/dead-backbone
Commit: b9b8982780e2011779f0e36f1e3f887f2157a8b4
Parents: ed9aa3c
Author: Robert Kowalski 
Authored: Wed Sep 14 11:34:59 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 14 11:34:59 2016 +0200

--
 app/addons/activetasks/routes.js|  1 -
 app/addons/auth/routes.js   |  1 -
 app/addons/databases/routes.js  |  1 -
 app/addons/documentation/routes.js  |  1 -
 app/addons/documents/routes-doc-editor.js   |  2 -
 app/addons/documents/routes-mango.js|  2 -
 .../documents/tests/nightwatch/viewEdit.js  |  7 --
 app/addons/fauxton/components.js| 83 
 app/core/base.js|  1 -
 app/core/routeObject.js |  1 -
 assets/less/fauxton.less|  6 --
 11 files changed, 106 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9b89827/app/addons/activetasks/routes.js
--
diff --git a/app/addons/activetasks/routes.js b/app/addons/activetasks/routes.js
index cee53e3..e81dab2 100644
--- a/app/addons/activetasks/routes.js
+++ b/app/addons/activetasks/routes.js
@@ -19,7 +19,6 @@ import Actions from "./actions";
 var ActiveTasksRouteObject = FauxtonAPI.RouteObject.extend({
   selectedHeader: 'Active Tasks',
   layout: 'one_pane',
-  disableLoader: true,
   routes: {
 'activetasks/:id': 'showActiveTasks',
 'activetasks': 'showActiveTasks'

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9b89827/app/addons/auth/routes.js
--
diff --git a/app/addons/auth/routes.js b/app/addons/auth/routes.js
index 2e42f4b..b0e41d5 100644
--- a/app/addons/auth/routes.js
+++ b/app/addons/auth/routes.js
@@ -27,7 +27,6 @@ var AuthRouteObject = FauxtonAPI.RouteObject.extend({
 'createAdmin': 'checkNodes',
 'createAdmin/:node': 'createAdminForNode'
   },
-  disableLoader: true,
   hideNotificationCenter: true,
 
   checkNodes: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9b89827/app/addons/databases/routes.js
--
diff --git a/app/addons/databases/routes.js b/app/addons/databases/routes.js
index 00e8b28..6fa5722 100644
--- a/app/addons/databases/routes.js
+++ b/app/addons/databases/routes.js
@@ -32,7 +32,6 @@ var AllDbsRouteObject = FauxtonAPI.RouteObject.extend({
   roles: ['fx_loggedIn'],
 
   selectedHeader: "Databases",
-  disableLoader: true,
 
   initialize: function () {
 this.databases = new Databases.List();

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9b89827/app/addons/documentation/routes.js
--
diff --git a/app/addons/documentation/routes.js 
b/app/addons/documentation/routes.js
index c253645..5205164 100644
--- a/app/addons/documentation/routes.js
+++ b/app/addons/documentation/routes.js
@@ -17,7 +17,6 @@ import DocumentationComponents from "./components.react";
 var DocumentationRouteObject = FauxtonAPI.RouteObject.extend({
   selectedHeader: 'Documentation',
   layout: 'one_pane',
-  disableLoader: false,
   routes: {
 'documentation': 'documentation'
   },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9b89827/app/addons/documents/routes-doc-editor.js
--
diff --git a/app/addons/documents/routes-doc-editor.js 
b/app/addons/documents/routes-doc-editor.js
index 828ec63..718fd9a 100644
--- a/app/addons/documents/routes-doc-editor.js
+++ b/app/addons/documents/routes-doc-editor.js
@@ -23,7 +23,6 @@ import RevBrowserComponents from 
"./rev-browser/rev-browser.components.react";
 
 const RevBrowserRouteObject = FauxtonAPI.RouteObject.extend({
   layout: 'doc_editor',
-  disableLoader: true,
   selectedHeader: 'Databases',
   roles: ['fx_loggedIn'],
 
@@ -63,7 +62,6 @@ const RevBrowserRouteObject = FauxtonAPI.RouteObject.extend({
 
 const DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
   layout: 'doc_editor',
-  disableLoader: true,
   selectedHeader: 'Databases',
 
   roles: ['fx_loggedIn'],

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9b89827/app/addons/

[2/2] fauxton commit: updated refs/heads/dead-backbone to ec1139d

2016-09-14 Thread robertkowalski
remove spin.js lib


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ec1139d3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ec1139d3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ec1139d3

Branch: refs/heads/dead-backbone
Commit: ec1139d36efa80c525012748e6407873d2de7904
Parents: b9b8982
Author: Robert Kowalski 
Authored: Wed Sep 14 11:35:12 2016 +0200
Committer: Robert Kowalski 
Committed: Wed Sep 14 11:35:12 2016 +0200

--
 assets/js/libs/spin.min.js | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ec1139d3/assets/js/libs/spin.min.js
--
diff --git a/assets/js/libs/spin.min.js b/assets/js/libs/spin.min.js
deleted file mode 100644
index 9e61502..000
--- a/assets/js/libs/spin.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a,b,c){function 
O(a){H(arguments,function(b,d){a[b]===c&&(a[b]=d)});return a}function 
N(a){H(arguments,function(b,c){a[m][M(a,b)||b]=c});return a}function M(a,b){var 
d=a[m],f,g;if(d[b]!==c){return 
b}b=b.charAt(0).toUpperCase()+b.slice(1);for(g=0;g

fauxton commit: updated refs/heads/master to ed9aa3c

2016-09-13 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 4f633e508 -> ed9aa3ced


Update readme

 - Update outdated parts on grunt
 - fix uppercase written npm to lowercase
 - don't encourage dangerous sudo usage

PR: #770
PR-URL: https://github.com/apache/couchdb-fauxton/pull/770
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ed9aa3ce
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ed9aa3ce
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ed9aa3ce

Branch: refs/heads/master
Commit: ed9aa3ced5260c5d44f0af29cea897d3db5a9070
Parents: 4f633e5
Author: Robert Kowalski 
Authored: Tue Sep 13 04:52:21 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 13 14:43:54 2016 +0200

--
 readme.md | 28 ++--
 1 file changed, 10 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ed9aa3ce/readme.md
--
diff --git a/readme.md b/readme.md
index 8b82874..072f66b 100644
--- a/readme.md
+++ b/readme.md
@@ -3,7 +3,7 @@
 
 Fauxton is the new Web UI for CouchDB. To get it running in development on 
your machine. Follow the steps below.
 
-## Install via NPM
+## Install as standalone server via npm
 
 You can use the latest release of Fauxton via npm:
 
@@ -19,20 +19,9 @@ Please note that a recent installation of 
[node.js](http://nodejs.org/) and npm
 
 1. make sure you have CouchDB installed. Instructions on how to install it can 
be  
 [found here](http://couchdb.readthedocs.org/en/latest/install/index.html)
-2. fork this repo: `https://github.com/apache/couchdb-fauxton.git` and make 
sure you have a cloned local copy
-3. add upstream to the main git repo: `git remote add git-repo 
https://github.com/apache/couchdb-fauxton.git`
-4. add upstream to the private apache repo: `git remote add upstream 
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton.git`
-5. go to your cloned copy of the repo (usually `couchdb-fauxton`) and type 
`npm install` to download all dependencies
-7. install the `grunt-cli` (grunt command line interface) 
-
-In case you don't have the Grunt command line interface installed, run the 
following command:
-
-npm install -g grunt-cli
-
-If you run into a permissions problem, run that last command as an 
administrator:
-
-sudo npm install -g grunt-cli
-
+1. fork this repo: `git clone https://github.com/apache/couchdb-fauxton.git`
+1. add upstream to the private apache repo: `git remote add upstream 
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton.git`
+1. go to your cloned copy of the repo (usually `couchdb-fauxton`) and type 
`npm install` to download all dependencies
 
 ## Running Fauxton
 
@@ -44,7 +33,9 @@ If you run into a permissions problem, run that last command 
as an administrator
 Using the dev server is the easiest way to use Fauxton, especially when 
developing for it. In the cloned repo folder,
 type:
 
-grunt dev
+```
+npm run dev
+```
 
 Wait until you see the "Fauxton" ascii art on your command line, then you 
should be able to access Fauxton at
 `http://localhost:8000`
@@ -55,8 +46,9 @@ Wait until you see the "Fauxton" ascii art on your command 
line, then you should
 Follow the "Setting up Fauxton" section above, then edit the `settings.json` 
variable root where the document will live, 
 e.g. `/_utils/`. Then type:
 
-grunt couchdb
-
+```
+npm run couchdb
+```
 This will install the latest version of Fauxton into `/share/www/`
 
 



[2/2] fauxton commit: updated refs/heads/master to 4f633e5

2016-09-13 Thread robertkowalski
react config: fix small issues


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/4f633e50
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/4f633e50
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/4f633e50

Branch: refs/heads/master
Commit: 4f633e508bd9cb24cdb1a858c00d624d01732de1
Parents: ee1a92b
Author: Robert Kowalski 
Authored: Tue Sep 13 14:31:00 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 13 14:31:00 2016 +0200

--
 app/addons/config/assets/less/config.less | 15 ---
 app/addons/config/components.react.jsx|  2 +-
 devserver.js  |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/4f633e50/app/addons/config/assets/less/config.less
--
diff --git a/app/addons/config/assets/less/config.less 
b/app/addons/config/assets/less/config.less
index f74b2ec..a9d7d7c 100644
--- a/app/addons/config/assets/less/config.less
+++ b/app/addons/config/assets/less/config.less
@@ -45,13 +45,13 @@
   background-color: #e0e0e0;
 }
 
-.table-striped tbody > tr.config-item:nth-child(odd) > td,
-.table-striped tbody > tr.config-item:nth-child(odd) > th {
+.config.table-striped tbody > tr.config-item:nth-child(odd) > td,
+.config.table-striped tbody > tr.config-item:nth-child(odd) > th {
   transition: background-color 100ms;
 }
 
-.table-striped tbody > tr.config-item:nth-child(odd):hover > td,
-.table-striped tbody > tr.config-item:nth-child(odd):hover > th {
+.config.table-striped tbody > tr.config-item:nth-child(odd):hover > td,
+.config.table-striped tbody > tr.config-item:nth-child(odd):hover > th {
   background-color: #e7e7e7;
 }
 
@@ -185,10 +185,11 @@ table.config {
   color: white;
 }
   }
-}
 
-.popover.bottom .arrow, .popover.bottom .arrow::after {
-  border-bottom-color: #333 !important;
+  .arrow, .arrow::after {
+border-bottom-color: #333 !important;
+  }
+
 }
 
 #add-option-popover::before {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/4f633e50/app/addons/config/components.react.jsx
--
diff --git a/app/addons/config/components.react.jsx 
b/app/addons/config/components.react.jsx
index a825282..4432753 100644
--- a/app/addons/config/components.react.jsx
+++ b/app/addons/config/components.react.jsx
@@ -37,7 +37,7 @@ var ConfigTableController = React.createClass({
   },
 
   componentWillUnmount () {
-configStore.off('change', this.onChange, this);
+configStore.off('change', this.onChange);
   },
 
   onChange () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/4f633e50/devserver.js
--
diff --git a/devserver.js b/devserver.js
index be2c9d6..3bef0a8 100644
--- a/devserver.js
+++ b/devserver.js
@@ -1,4 +1,4 @@
-var spawn = require('cross-spawn').spawn;
+var spawn = require('child_process').spawn;
 var path = require("path");
 var fs = require("fs");
 var _ = require('lodash');
@@ -18,7 +18,7 @@ var loadSettings = function () {
 port: process.env.FAUXTON_PORT || 8000,
 contentSecurityPolicy: true,
 proxy: {
-  target: 'http://couch:5984',
+  target: 'http://127.0.0.1:5984',
   changeOrigin: false
 }
   };



[1/2] fauxton commit: updated refs/heads/master to 4f633e5

2016-09-13 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master e51775b8a -> 4f633e508


react: port config section to react

PR: #750
PR-URL: https://github.com/apache/couchdb-fauxton/pull/750
Reviewed-By: Robert Kowalski 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ee1a92b0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ee1a92b0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ee1a92b0

Branch: refs/heads/master
Commit: ee1a92b02e68d92dd86e5979d5d8f2d100fb24e7
Parents: e51775b
Author: samk 
Authored: Sun Jul 24 21:55:11 2016 +1000
Committer: Robert Kowalski 
Committed: Tue Sep 13 14:22:41 2016 +0200

--
 app/addons/config/actions.js| 121 ++
 app/addons/config/actiontypes.js|  27 ++
 app/addons/config/assets/less/config.less   | 107 -
 app/addons/config/components.react.jsx  | 398 +++
 app/addons/config/resources.js  |  67 +---
 app/addons/config/routes.js |  16 +-
 app/addons/config/stores.js | 149 +++
 .../config/templates/add_config_option.html |  26 --
 app/addons/config/templates/dashboard.html  |  24 --
 app/addons/config/templates/header.html |  15 -
 app/addons/config/templates/item.html   |  40 --
 app/addons/config/tests/actionsSpec.js  | 193 +
 .../config/tests/componentsSpec.react.jsx   | 306 ++
 app/addons/config/tests/configSpec.js   | 162 
 app/addons/config/tests/storesSpec.js   |  94 +
 app/addons/config/views.js  | 229 ---
 devserver.js|   4 +-
 tasks/helper.js |   2 +-
 webpack.config.dev.js   |   4 +-
 19 files changed, 1411 insertions(+), 573 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ee1a92b0/app/addons/config/actions.js
--
diff --git a/app/addons/config/actions.js b/app/addons/config/actions.js
new file mode 100644
index 000..00cfc23
--- /dev/null
+++ b/app/addons/config/actions.js
@@ -0,0 +1,121 @@
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License. You may obtain a copy 
of
+//  the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+//  License for the specific language governing permissions and limitations 
under
+//  the License.
+
+import ActionTypes from './actiontypes';
+import FauxtonAPI from '../../core/api';
+import Resources from './resources';
+
+export default {
+  fetchAndEditConfig (node) {
+FauxtonAPI.dispatch({ type: ActionTypes.LOADING_CONFIG });
+
+var configModel = new Resources.ConfigModel({ node });
+
+configModel.fetch().then(() => this.editSections({ sections: 
configModel.get('sections'), node }));
+  },
+
+  editSections (options) {
+FauxtonAPI.dispatch({ type: ActionTypes.EDIT_CONFIG, options });
+  },
+
+  editOption (options) {
+FauxtonAPI.dispatch({ type: ActionTypes.EDIT_OPTION, options });
+  },
+
+  cancelEdit (options) {
+FauxtonAPI.dispatch({ type: ActionTypes.CANCEL_EDIT, options });
+  },
+
+  saveOption (node, options) {
+FauxtonAPI.dispatch({ type: ActionTypes.SAVING_OPTION, options });
+
+var modelAttrs = options;
+modelAttrs.node = node;
+var optionModel = new Resources.OptionModel(modelAttrs);
+
+optionModel.save()
+  .then(() => this.optionSaveSuccess(options))
+  .fail(xhr => this.optionSaveFailure(options, 
JSON.parse(xhr.responseText).reason));
+  },
+
+  optionSaveSuccess (options) {
+FauxtonAPI.dispatch({ type: ActionTypes.OPTION_SAVE_SUCCESS, options });
+FauxtonAPI.addNotification({
+  msg: `Option ${options.optionName} saved`,
+  type: 'success'
+});
+  },
+
+  optionSaveFailure (options, error) {
+FauxtonAPI.dispatch({ type: ActionTypes.OPTION_SAVE_FAILURE, options });
+FauxtonAPI.addNotification({
+  msg: `Option save failed: ${error}`,
+  type: 'error'
+});
+  },
+
+  addOption (node, options) {
+FauxtonAPI.dispatch({ type: ActionTypes.ADDING_OPTION });
+
+var modelAttrs = options;
+modelAttrs.node = node;
+var optionModel = new Resources.OptionModel(modelAttrs);
+
+optionModel.save()
+  .then(() => this.optionAddSuccess(options))
+  .fail(xhr => this.optionAddFailure(options, 
JSON

[3/4] fauxton commit: updated refs/heads/master to eb48fdb

2016-09-06 Thread robertkowalski
remove unused deps

PR: #768
PR-URL: https://github.com/apache/couchdb-fauxton/pull/768
Reviewed-By: Robert Newson 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/249f48d7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/249f48d7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/249f48d7

Branch: refs/heads/master
Commit: 249f48d7d9bfb74f52449ec582baa5d58cc69b6f
Parents: 91bb6e4
Author: Robert Kowalski 
Authored: Mon Sep 5 15:14:35 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 6 17:08:16 2016 +0200

--
 test/mocha/mocha.css |  251 ---
 test/mocha/mocha.js  | 5428 -
 2 files changed, 5679 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/249f48d7/test/mocha/mocha.css
--
diff --git a/test/mocha/mocha.css b/test/mocha/mocha.css
deleted file mode 100755
index 1d74784..000
--- a/test/mocha/mocha.css
+++ /dev/null
@@ -1,251 +0,0 @@
-@charset "utf-8";
-
-body {
-  margin:0;
-}
-
-#mocha {
-  font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
-  margin: 60px 50px;
-}
-
-#mocha ul, #mocha li {
-  margin: 0;
-  padding: 0;
-}
-
-#mocha ul {
-  list-style: none;
-}
-
-#mocha h1, #mocha h2 {
-  margin: 0;
-}
-
-#mocha h1 {
-  margin-top: 15px;
-  font-size: 1em;
-  font-weight: 200;
-}
-
-#mocha h1 a {
-  text-decoration: none;
-  color: inherit;
-}
-
-#mocha h1 a:hover {
-  text-decoration: underline;
-}
-
-#mocha .suite .suite h1 {
-  margin-top: 0;
-  font-size: .8em;
-}
-
-#mocha .hidden {
-  display: none;
-}
-
-#mocha h2 {
-  font-size: 12px;
-  font-weight: normal;
-  cursor: pointer;
-}
-
-#mocha .suite {
-  margin-left: 15px;
-}
-
-#mocha .test {
-  margin-left: 15px;
-  overflow: hidden;
-}
-
-#mocha .test.pending:hover h2::after {
-  content: '(pending)';
-  font-family: arial, sans-serif;
-}
-
-#mocha .test.pass.medium .duration {
-  background: #C09853;
-}
-
-#mocha .test.pass.slow .duration {
-  background: #B94A48;
-}
-
-#mocha .test.pass::before {
-  content: '✓';
-  font-size: 12px;
-  display: block;
-  float: left;
-  margin-right: 5px;
-  color: #00d6b2;
-}
-
-#mocha .test.pass .duration {
-  font-size: 9px;
-  margin-left: 5px;
-  padding: 2px 5px;
-  color: white;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  -ms-border-radius: 5px;
-  -o-border-radius: 5px;
-  border-radius: 5px;
-}
-
-#mocha .test.pass.fast .duration {
-  display: none;
-}
-
-#mocha .test.pending {
-  color: #0b97c4;
-}
-
-#mocha .test.pending::before {
-  content: '◦';
-  color: #0b97c4;
-}
-
-#mocha .test.fail {
-  color: #c00;
-}
-
-#mocha .test.fail pre {
-  color: black;
-}
-
-#mocha .test.fail::before {
-  content: '✖';
-  font-size: 12px;
-  display: block;
-  float: left;
-  margin-right: 5px;
-  color: #c00;
-}
-
-#mocha .test pre.error {
-  color: #c00;
-  max-height: 300px;
-  overflow: auto;
-}
-
-#mocha .test pre {
-  display: block;
-  float: left;
-  clear: left;
-  font: 12px/1.5 monaco, monospace;
-  margin: 5px;
-  padding: 15px;
-  border: 1px solid #eee;
-  border-bottom-color: #ddd;
-  -webkit-border-radius: 3px;
-  -webkit-box-shadow: 0 1px 3px #eee;
-  -moz-border-radius: 3px;
-  -moz-box-shadow: 0 1px 3px #eee;
-}
-
-#mocha .test h2 {
-  position: relative;
-}
-
-#mocha .test a.replay {
-  position: absolute;
-  top: 3px;
-  right: 0;
-  text-decoration: none;
-  vertical-align: middle;
-  display: block;
-  width: 15px;
-  height: 15px;
-  line-height: 15px;
-  text-align: center;
-  background: #eee;
-  font-size: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
-  -webkit-transition: opacity 200ms;
-  -moz-transition: opacity 200ms;
-  transition: opacity 200ms;
-  opacity: 0.3;
-  color: #888;
-}
-
-#mocha .test:hover a.replay {
-  opacity: 1;
-}
-
-#mocha-report.pass .test.fail {
-  display: none;
-}
-
-#mocha-report.fail .test.pass {
-  display: none;
-}
-
-#mocha-error {
-  color: #c00;
-  font-size: 1.5em;
-  font-weight: 100;
-  letter-spacing: 1px;
-}
-
-#mocha-stats {
-  position: fixed;
-  top: 15px;
-  right: 10px;
-  font-size: 12px;
-  margin: 0;
-  color: #888;
-  z-index: 1;
-}
-
-#mocha-stats .progress {
-  float: right;
-  padding-top: 0;
-}
-
-#mocha-stats em {
-  color: black;
-}
-
-#mocha-stats a {
-  text-decoration: none;
-  color: inherit;
-}
-
-#mocha-stats a:hover {
-  border-bottom: 1px solid #eee;
-}
-
-#mocha-stats li {
-  display: inline-block;
-  margin: 0 5px;
-  list-style: none;
-  padding-top: 11px;
-}
-
-#mocha-stats canvas {
-  width: 40px;
-  height: 40px;
-}
-

[1/4] fauxton commit: updated refs/heads/master to eb48fdb

2016-09-06 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 34df1bf39 -> eb48fdbe0


2.0 release: simplify copy, include zeroclipboard

ZeroClipboard.swf was not included in previous builds.
Additionally simplify copy instructions.

PR: #768
PR-URL: https://github.com/apache/couchdb-fauxton/pull/768
Reviewed-By: Robert Newson 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/eb48fdbe
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/eb48fdbe
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/eb48fdbe

Branch: refs/heads/master
Commit: eb48fdbe03b672e64a6857bb47618394a04a693a
Parents: 249f48d
Author: Robert Kowalski 
Authored: Tue Sep 6 11:52:27 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 6 17:08:16 2016 +0200

--
 Gruntfile.js | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eb48fdbe/Gruntfile.js
--
diff --git a/Gruntfile.js b/Gruntfile.js
index 7e1c7a7..a68c20c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -146,10 +146,7 @@ module.exports = function (grunt) {
 files: [
   // this gets built in the template task
   {src: "dist/release/index.html", dest: "../../share/www/index.html"},
-  {src: ["**"], dest: "../../share/www/dashboard.assets/js/", cwd: 
'dist/release/dashboard.assets/js/',  expand: true},
-  {src: ["**"], dest: "../../share/www/dashboard.assets/img/", cwd: 
'dist/release/dashboard.assets/img/', expand: true},
-  {src: ["**"], dest: "../../share/www/dashboard.assets/fonts/", cwd: 
'dist/release/dashboard.assets/fonts/', expand: true},
-  {src: ["**"], dest: "../../share/www/dashboard.assets/css/", cwd: 
"dist/release/dashboard.assets/css/", expand: true}
+  {src: ["**"], dest: '../../share/www/dashboard.assets/', cwd: 
'dist/release/dashboard.assets/',  expand: true},
 ]
   },
   couchdebug: {



[4/4] fauxton commit: updated refs/heads/master to eb48fdb

2016-09-06 Thread robertkowalski
add license headers

PR: #768
PR-URL: https://github.com/apache/couchdb-fauxton/pull/768
Reviewed-By: Robert Newson 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/91bb6e44
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/91bb6e44
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/91bb6e44

Branch: refs/heads/master
Commit: 91bb6e44f145353c87b66810c19d6728be73a265
Parents: 34df1bf
Author: Robert Kowalski 
Authored: Mon Sep 5 15:11:42 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 6 17:08:16 2016 +0200

--
 bin/create-animal-db | 12 
 bin/fauxton  | 12 
 bin/install-docker-travis.sh | 13 +
 bin/remove-test-dbs.js   | 12 
 4 files changed, 49 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/91bb6e44/bin/create-animal-db
--
diff --git a/bin/create-animal-db b/bin/create-animal-db
index bc81593..37afc11 100755
--- a/bin/create-animal-db
+++ b/bin/create-animal-db
@@ -1,5 +1,17 @@
 #!/usr/bin/env node
 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations 
under
+// the License.
+
 // deletes the old animaldb, creates a new, fresh one,
 // with conflicts for the zebra doc
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/91bb6e44/bin/fauxton
--
diff --git a/bin/fauxton b/bin/fauxton
index 0d6e1f0..e9630fc 100755
--- a/bin/fauxton
+++ b/bin/fauxton
@@ -1,5 +1,17 @@
 #!/usr/bin/env node
 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations 
under
+// the License.
+
 var optimist = require('optimist')
   .usage('Fauxton server \nUsage: $0')
   .options('couchdb', {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/91bb6e44/bin/install-docker-travis.sh
--
diff --git a/bin/install-docker-travis.sh b/bin/install-docker-travis.sh
index c8ba2e7..99a8286 100755
--- a/bin/install-docker-travis.sh
+++ b/bin/install-docker-travis.sh
@@ -1,4 +1,17 @@
 #!/bin/bash
+
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
 sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" 
> /etc/apt/sources.list.d/docker.list'
 sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 
58118E89F3A912897C070ADBF76221572C52609D
 sudo apt-get update

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/91bb6e44/bin/remove-test-dbs.js
--
diff --git a/bin/remove-test-dbs.js b/bin/remove-test-dbs.js
index 7d85efd..92a7491 100755
--- a/bin/remove-test-dbs.js
+++ b/bin/remove-test-dbs.js
@@ -1,5 +1,17 @@
 #!/usr/bin/env node
 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

[2/4] fauxton commit: updated refs/heads/master to eb48fdb

2016-09-06 Thread robertkowalski
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/249f48d7/test/mocha/mocha.js
--
diff --git a/test/mocha/mocha.js b/test/mocha/mocha.js
deleted file mode 100755
index a55115a..000
--- a/test/mocha/mocha.js
+++ /dev/null
@@ -1,5428 +0,0 @@
-;(function(){
-
-// CommonJS require()
-
-function require(p){
-var path = require.resolve(p)
-  , mod = require.modules[path];
-if (!mod) throw new Error('failed to require "' + p + '"');
-if (!mod.exports) {
-  mod.exports = {};
-  mod.call(mod.exports, mod, mod.exports, require.relative(path));
-}
-return mod.exports;
-  }
-
-require.modules = {};
-
-require.resolve = function (path){
-var orig = path
-  , reg = path + '.js'
-  , index = path + '/index.js';
-return require.modules[reg] && reg
-  || require.modules[index] && index
-  || orig;
-  };
-
-require.register = function (path, fn){
-require.modules[path] = fn;
-  };
-
-require.relative = function (parent) {
-return function(p){
-  if ('.' != p.charAt(0)) return require(p);
-
-  var path = parent.split('/')
-, segs = p.split('/');
-  path.pop();
-
-  for (var i = 0; i < segs.length; i++) {
-var seg = segs[i];
-if ('..' == seg) path.pop();
-else if ('.' != seg) path.push(seg);
-  }
-
-  return require(path.join('/'));
-};
-  };
-
-
-require.register("browser/debug.js", function(module, exports, require){
-
-module.exports = function(type){
-  return function(){
-  }
-};
-
-}); // module: browser/debug.js
-
-require.register("browser/diff.js", function(module, exports, require){
-/* See license.txt for terms of usage */
-
-/*
- * Text diff implementation.
- * 
- * This library supports the following APIS:
- * JsDiff.diffChars: Character by character diff
- * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores 
whitespace
- * JsDiff.diffLines: Line based diff
- * 
- * JsDiff.diffCss: Diff targeted at CSS content
- * 
- * These methods are based on the implementation proposed in
- * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
- * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
- */
-var JsDiff = (function() {
-  function clonePath(path) {
-return { newPos: path.newPos, components: path.components.slice(0) };
-  }
-  function removeEmpty(array) {
-var ret = [];
-for (var i = 0; i < array.length; i++) {
-  if (array[i]) {
-ret.push(array[i]);
-  }
-}
-return ret;
-  }
-  function escapeHTML(s) {
-var n = s;
-n = n.replace(/&/g, "&");
-n = n.replace(//g, ">");
-n = n.replace(/"/g, """);
-
-return n;
-  }
-
-
-  var fbDiff = function(ignoreWhitespace) {
-this.ignoreWhitespace = ignoreWhitespace;
-  };
-  fbDiff.prototype = {
-  diff: function(oldString, newString) {
-// Handle the identity case (this is due to unrolling editLength == 0
-if (newString == oldString) {
-  return [{ value: newString }];
-}
-if (!newString) {
-  return [{ value: oldString, removed: true }];
-}
-if (!oldString) {
-  return [{ value: newString, added: true }];
-}
-
-newString = this.tokenize(newString);
-oldString = this.tokenize(oldString);
-
-var newLen = newString.length, oldLen = oldString.length;
-var maxEditLength = newLen + oldLen;
-var bestPath = [{ newPos: -1, components: [] }];
-
-// Seed editLength = 0
-var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
-if (bestPath[0].newPos+1 >= newLen && oldPos+1 >= oldLen) {
-  return bestPath[0].components;
-}
-
-for (var editLength = 1; editLength <= maxEditLength; editLength++) {
-  for (var diagonalPath = -1*editLength; diagonalPath <= editLength; 
diagonalPath+=2) {
-var basePath;
-var addPath = bestPath[diagonalPath-1],
-removePath = bestPath[diagonalPath+1];
-oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
-if (addPath) {
-  // No one else is going to attempt to use this value, clear it
-  bestPath[diagonalPath-1] = undefined;
-}
-
-var canAdd = addPath && addPath.newPos+1 < newLen;
-var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
-if (!canAdd && !canRemove) {
-  bestPath[diagonalPath] = undefined;
-  continue;
-}
-
-// Select the diagonal that we want to branch from. We select the 
prior
-// path whose position in the new string is the farthest from the 
origin
-// and does not pass the bounds of the diff graph
-if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
-  basePath = clonePath(removePath);
- 

[2/2] couchdb commit: updated refs/heads/master to 18534cb

2016-09-06 Thread robertkowalski
update fauxton licenses

PR: #440
PR-URL: https://github.com/apache/couchdb/pull/440
Reviewed-By: Robert Newson 


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/18534cb5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/18534cb5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/18534cb5

Branch: refs/heads/master
Commit: 18534cb5aea93ba10c6598a7ea26f23a172ecd67
Parents: d976a29
Author: Robert Kowalski 
Authored: Tue Sep 6 11:18:46 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Sep 6 15:45:34 2016 +0200

--
 LICENSE | 2029 --
 1 file changed, 1269 insertions(+), 760 deletions(-)
--




[1/2] couchdb commit: updated refs/heads/master to 18534cb

2016-09-06 Thread robertkowalski
Repository: couchdb
Updated Branches:
  refs/heads/master d976a2936 -> 18534cb5a


http://git-wip-us.apache.org/repos/asf/couchdb/blob/18534cb5/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 9dba515..19cc6e7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -208,64 +208,13 @@ copyright notices and license terms. Your use of the code 
for the these
 subcomponents is subject to the terms and conditions of the following licenses.
 
 
-For the share/www/script/jquery.js component:
-
-  Copyright 2012 jQuery Foundation and other contributors
-  http://jquery.com/
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For the share/www/script/jquery-ui-* components:
-
-  Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
-
-  This software consists of voluntary contributions made by many
-  individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
-  contribution history, see the revision history and logs, available
-  at http://jquery-ui.googlecode.com/svn/
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For the share/www/script/json2.js component:
+For the share/server/json2.js component:
 
   Public Domain
 
   No warranty expressed or implied. Use at your own risk.
 
+
 For the share/www/favicon.ico component from 
https://github.com/BigBlueHat/futon2:
 
  Apache License
@@ -771,279 +720,6 @@ For the share/server/coffee-script.js file
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
 
-For src/fauxton/apps/modules/pouchdb
-
-  Copyright (c) 2012 Dale Harvey et al
-
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License. You may obtain a copy of
-  the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  License for the specific language governing permissions and limitations under
-  the License.
-
-For src/fauxton/assets/js/libs/backbone.js
-
-   Copyright (c) 2010-2013 Jeremy Ashkenas, DocumentCloud
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation
-   files (the "Software"), to deal in the Software without
-   restriction, including without limitation the rights to use,
-   copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the
-   Software is furnished to do so, subject to the following
-   conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-  

[3/3] fauxton commit: updated refs/heads/license to a57e97c

2016-09-05 Thread robertkowalski
remove unused deps


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a57e97c7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a57e97c7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a57e97c7

Branch: refs/heads/license
Commit: a57e97c7b65e14544dadf16ef3a6b7bbf2f0bc6d
Parents: d2cbf10
Author: Robert Kowalski 
Authored: Mon Sep 5 15:14:35 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 15:14:35 2016 +0200

--
 test/mocha/mocha.css |  251 ---
 test/mocha/mocha.js  | 5428 -
 2 files changed, 5679 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a57e97c7/test/mocha/mocha.css
--
diff --git a/test/mocha/mocha.css b/test/mocha/mocha.css
deleted file mode 100755
index 1d74784..000
--- a/test/mocha/mocha.css
+++ /dev/null
@@ -1,251 +0,0 @@
-@charset "utf-8";
-
-body {
-  margin:0;
-}
-
-#mocha {
-  font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
-  margin: 60px 50px;
-}
-
-#mocha ul, #mocha li {
-  margin: 0;
-  padding: 0;
-}
-
-#mocha ul {
-  list-style: none;
-}
-
-#mocha h1, #mocha h2 {
-  margin: 0;
-}
-
-#mocha h1 {
-  margin-top: 15px;
-  font-size: 1em;
-  font-weight: 200;
-}
-
-#mocha h1 a {
-  text-decoration: none;
-  color: inherit;
-}
-
-#mocha h1 a:hover {
-  text-decoration: underline;
-}
-
-#mocha .suite .suite h1 {
-  margin-top: 0;
-  font-size: .8em;
-}
-
-#mocha .hidden {
-  display: none;
-}
-
-#mocha h2 {
-  font-size: 12px;
-  font-weight: normal;
-  cursor: pointer;
-}
-
-#mocha .suite {
-  margin-left: 15px;
-}
-
-#mocha .test {
-  margin-left: 15px;
-  overflow: hidden;
-}
-
-#mocha .test.pending:hover h2::after {
-  content: '(pending)';
-  font-family: arial, sans-serif;
-}
-
-#mocha .test.pass.medium .duration {
-  background: #C09853;
-}
-
-#mocha .test.pass.slow .duration {
-  background: #B94A48;
-}
-
-#mocha .test.pass::before {
-  content: '✓';
-  font-size: 12px;
-  display: block;
-  float: left;
-  margin-right: 5px;
-  color: #00d6b2;
-}
-
-#mocha .test.pass .duration {
-  font-size: 9px;
-  margin-left: 5px;
-  padding: 2px 5px;
-  color: white;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  -ms-border-radius: 5px;
-  -o-border-radius: 5px;
-  border-radius: 5px;
-}
-
-#mocha .test.pass.fast .duration {
-  display: none;
-}
-
-#mocha .test.pending {
-  color: #0b97c4;
-}
-
-#mocha .test.pending::before {
-  content: '◦';
-  color: #0b97c4;
-}
-
-#mocha .test.fail {
-  color: #c00;
-}
-
-#mocha .test.fail pre {
-  color: black;
-}
-
-#mocha .test.fail::before {
-  content: '✖';
-  font-size: 12px;
-  display: block;
-  float: left;
-  margin-right: 5px;
-  color: #c00;
-}
-
-#mocha .test pre.error {
-  color: #c00;
-  max-height: 300px;
-  overflow: auto;
-}
-
-#mocha .test pre {
-  display: block;
-  float: left;
-  clear: left;
-  font: 12px/1.5 monaco, monospace;
-  margin: 5px;
-  padding: 15px;
-  border: 1px solid #eee;
-  border-bottom-color: #ddd;
-  -webkit-border-radius: 3px;
-  -webkit-box-shadow: 0 1px 3px #eee;
-  -moz-border-radius: 3px;
-  -moz-box-shadow: 0 1px 3px #eee;
-}
-
-#mocha .test h2 {
-  position: relative;
-}
-
-#mocha .test a.replay {
-  position: absolute;
-  top: 3px;
-  right: 0;
-  text-decoration: none;
-  vertical-align: middle;
-  display: block;
-  width: 15px;
-  height: 15px;
-  line-height: 15px;
-  text-align: center;
-  background: #eee;
-  font-size: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
-  -webkit-transition: opacity 200ms;
-  -moz-transition: opacity 200ms;
-  transition: opacity 200ms;
-  opacity: 0.3;
-  color: #888;
-}
-
-#mocha .test:hover a.replay {
-  opacity: 1;
-}
-
-#mocha-report.pass .test.fail {
-  display: none;
-}
-
-#mocha-report.fail .test.pass {
-  display: none;
-}
-
-#mocha-error {
-  color: #c00;
-  font-size: 1.5em;
-  font-weight: 100;
-  letter-spacing: 1px;
-}
-
-#mocha-stats {
-  position: fixed;
-  top: 15px;
-  right: 10px;
-  font-size: 12px;
-  margin: 0;
-  color: #888;
-  z-index: 1;
-}
-
-#mocha-stats .progress {
-  float: right;
-  padding-top: 0;
-}
-
-#mocha-stats em {
-  color: black;
-}
-
-#mocha-stats a {
-  text-decoration: none;
-  color: inherit;
-}
-
-#mocha-stats a:hover {
-  border-bottom: 1px solid #eee;
-}
-
-#mocha-stats li {
-  display: inline-block;
-  margin: 0 5px;
-  list-style: none;
-  padding-top: 11px;
-}
-
-#mocha-stats canvas {
-  width: 40px;
-  height: 40px;
-}
-
-#mocha code .comment { color: #ddd }
-#mocha code .init { color: #2F6FAD }
-#mocha code .strin

[1/3] fauxton commit: updated refs/heads/license to a57e97c

2016-09-05 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/license [created] a57e97c7b


add license headers


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/d2cbf107
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/d2cbf107
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/d2cbf107

Branch: refs/heads/license
Commit: d2cbf10771eecb8bdc1784a51d20bc1fff466f09
Parents: 34df1bf
Author: Robert Kowalski 
Authored: Mon Sep 5 15:11:42 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 15:11:42 2016 +0200

--
 bin/create-animal-db | 12 
 bin/fauxton  | 12 
 bin/install-docker-travis.sh | 13 +
 bin/remove-test-dbs.js   | 12 
 4 files changed, 49 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/d2cbf107/bin/create-animal-db
--
diff --git a/bin/create-animal-db b/bin/create-animal-db
index bc81593..37afc11 100755
--- a/bin/create-animal-db
+++ b/bin/create-animal-db
@@ -1,5 +1,17 @@
 #!/usr/bin/env node
 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations 
under
+// the License.
+
 // deletes the old animaldb, creates a new, fresh one,
 // with conflicts for the zebra doc
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/d2cbf107/bin/fauxton
--
diff --git a/bin/fauxton b/bin/fauxton
index 0d6e1f0..e9630fc 100755
--- a/bin/fauxton
+++ b/bin/fauxton
@@ -1,5 +1,17 @@
 #!/usr/bin/env node
 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations 
under
+// the License.
+
 var optimist = require('optimist')
   .usage('Fauxton server \nUsage: $0')
   .options('couchdb', {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/d2cbf107/bin/install-docker-travis.sh
--
diff --git a/bin/install-docker-travis.sh b/bin/install-docker-travis.sh
index c8ba2e7..99a8286 100755
--- a/bin/install-docker-travis.sh
+++ b/bin/install-docker-travis.sh
@@ -1,4 +1,17 @@
 #!/bin/bash
+
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
 sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" 
> /etc/apt/sources.list.d/docker.list'
 sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 
58118E89F3A912897C070ADBF76221572C52609D
 sudo apt-get update

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/d2cbf107/bin/remove-test-dbs.js
--
diff --git a/bin/remove-test-dbs.js b/bin/remove-test-dbs.js
index 7d85efd..92a7491 100755
--- a/bin/remove-test-dbs.js
+++ b/bin/remove-test-dbs.js
@@ -1,5 +1,17 @@
 #!/usr/bin/env node
 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy 
of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// Lic

[2/3] fauxton commit: updated refs/heads/license to a57e97c

2016-09-05 Thread robertkowalski
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a57e97c7/test/mocha/mocha.js
--
diff --git a/test/mocha/mocha.js b/test/mocha/mocha.js
deleted file mode 100755
index a55115a..000
--- a/test/mocha/mocha.js
+++ /dev/null
@@ -1,5428 +0,0 @@
-;(function(){
-
-// CommonJS require()
-
-function require(p){
-var path = require.resolve(p)
-  , mod = require.modules[path];
-if (!mod) throw new Error('failed to require "' + p + '"');
-if (!mod.exports) {
-  mod.exports = {};
-  mod.call(mod.exports, mod, mod.exports, require.relative(path));
-}
-return mod.exports;
-  }
-
-require.modules = {};
-
-require.resolve = function (path){
-var orig = path
-  , reg = path + '.js'
-  , index = path + '/index.js';
-return require.modules[reg] && reg
-  || require.modules[index] && index
-  || orig;
-  };
-
-require.register = function (path, fn){
-require.modules[path] = fn;
-  };
-
-require.relative = function (parent) {
-return function(p){
-  if ('.' != p.charAt(0)) return require(p);
-
-  var path = parent.split('/')
-, segs = p.split('/');
-  path.pop();
-
-  for (var i = 0; i < segs.length; i++) {
-var seg = segs[i];
-if ('..' == seg) path.pop();
-else if ('.' != seg) path.push(seg);
-  }
-
-  return require(path.join('/'));
-};
-  };
-
-
-require.register("browser/debug.js", function(module, exports, require){
-
-module.exports = function(type){
-  return function(){
-  }
-};
-
-}); // module: browser/debug.js
-
-require.register("browser/diff.js", function(module, exports, require){
-/* See license.txt for terms of usage */
-
-/*
- * Text diff implementation.
- * 
- * This library supports the following APIS:
- * JsDiff.diffChars: Character by character diff
- * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores 
whitespace
- * JsDiff.diffLines: Line based diff
- * 
- * JsDiff.diffCss: Diff targeted at CSS content
- * 
- * These methods are based on the implementation proposed in
- * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
- * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
- */
-var JsDiff = (function() {
-  function clonePath(path) {
-return { newPos: path.newPos, components: path.components.slice(0) };
-  }
-  function removeEmpty(array) {
-var ret = [];
-for (var i = 0; i < array.length; i++) {
-  if (array[i]) {
-ret.push(array[i]);
-  }
-}
-return ret;
-  }
-  function escapeHTML(s) {
-var n = s;
-n = n.replace(/&/g, "&");
-n = n.replace(//g, ">");
-n = n.replace(/"/g, """);
-
-return n;
-  }
-
-
-  var fbDiff = function(ignoreWhitespace) {
-this.ignoreWhitespace = ignoreWhitespace;
-  };
-  fbDiff.prototype = {
-  diff: function(oldString, newString) {
-// Handle the identity case (this is due to unrolling editLength == 0
-if (newString == oldString) {
-  return [{ value: newString }];
-}
-if (!newString) {
-  return [{ value: oldString, removed: true }];
-}
-if (!oldString) {
-  return [{ value: newString, added: true }];
-}
-
-newString = this.tokenize(newString);
-oldString = this.tokenize(oldString);
-
-var newLen = newString.length, oldLen = oldString.length;
-var maxEditLength = newLen + oldLen;
-var bestPath = [{ newPos: -1, components: [] }];
-
-// Seed editLength = 0
-var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
-if (bestPath[0].newPos+1 >= newLen && oldPos+1 >= oldLen) {
-  return bestPath[0].components;
-}
-
-for (var editLength = 1; editLength <= maxEditLength; editLength++) {
-  for (var diagonalPath = -1*editLength; diagonalPath <= editLength; 
diagonalPath+=2) {
-var basePath;
-var addPath = bestPath[diagonalPath-1],
-removePath = bestPath[diagonalPath+1];
-oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
-if (addPath) {
-  // No one else is going to attempt to use this value, clear it
-  bestPath[diagonalPath-1] = undefined;
-}
-
-var canAdd = addPath && addPath.newPos+1 < newLen;
-var canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
-if (!canAdd && !canRemove) {
-  bestPath[diagonalPath] = undefined;
-  continue;
-}
-
-// Select the diagonal that we want to branch from. We select the 
prior
-// path whose position in the new string is the farthest from the 
origin
-// and does not pass the bounds of the diff graph
-if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
-  basePath = clonePath(removePath);
- 

fauxton commit: updated refs/heads/fix-deps to 8d05ae8

2016-09-04 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/fix-deps e35eacf75 -> 8d05ae8fe


slim down installed pouchdb deps


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/8d05ae8f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/8d05ae8f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/8d05ae8f

Branch: refs/heads/fix-deps
Commit: 8d05ae8fe92370f017ffa780695dd2df6df21c77
Parents: e35eacf
Author: Robert Kowalski 
Authored: Mon Sep 5 03:04:38 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 03:04:38 2016 +0200

--
 app/addons/documents/rev-browser/rev-browser.actions.js | 2 +-
 package.json| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8d05ae8f/app/addons/documents/rev-browser/rev-browser.actions.js
--
diff --git a/app/addons/documents/rev-browser/rev-browser.actions.js 
b/app/addons/documents/rev-browser/rev-browser.actions.js
index 794fa7b..48eb81e 100644
--- a/app/addons/documents/rev-browser/rev-browser.actions.js
+++ b/app/addons/documents/rev-browser/rev-browser.actions.js
@@ -16,7 +16,7 @@ import app from "../../../app";
 import FauxtonAPI from "../../../core/api";
 import ActionTypes from "./rev-browser.actiontypes";
 import getTree from "visualizeRevTree/lib/getTree";
-import PouchDB from "pouchdb";
+import PouchDB from "pouchdb-browser";
 
 let db;
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8d05ae8f/package.json
--
diff --git a/package.json b/package.json
index 7b0b390..401b886 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
 "jquery": "^2.2.0",
 "jsondiffpatch": "^0.1.41",
 "moment": "^2.8.4",
-"pouchdb": "^5.3.1",
+"pouchdb-browser": "^5.3.1",
 "react": "~15.0.1",
 "react-addons-css-transition-group": "~15.0.1",
 "react-bootstrap": "^0.28.5",



[2/6] fauxton commit: updated refs/heads/fix-deps to e35eacf

2016-09-04 Thread robertkowalski
cleanup package.json

- remove invalid / unused parts
- put scripts section to top so people opening it in an editor
  can see possible scripts immediately


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/53caf707
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/53caf707
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/53caf707

Branch: refs/heads/fix-deps
Commit: 53caf707e47f44b147ee2ca8a1a460b5ff228b5a
Parents: 85a9f2e
Author: Robert Kowalski 
Authored: Mon Sep 5 00:50:45 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 00:50:47 2016 +0200

--
 package.json | 65 ++-
 1 file changed, 26 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/53caf707/package.json
--
diff --git a/package.json b/package.json
index 50f4eae..03d45d3 100644
--- a/package.json
+++ b/package.json
@@ -2,18 +2,32 @@
   "name": "fauxton",
   "version": "1.1.8",
   "description": "Fauxton is a modular CouchDB dashboard and Futon 
replacement.",
-  "main": "./index.js",
-  "directories": {
-"test": "test"
-  },
-  "bin": {
-"fauxton": "./bin/fauxton"
-  },
-  "babel": {
-"presets": [
-  "es2015",
-  "react"
-]
+  "scripts": {
+"stylecheck": "eslint --ext=js,jsx .",
+"webpack:dev": "webpack --debug --progress --colors --config 
./webpack.config.dev.js",
+"webpack:test": "webpack --debug --progress --colors --config 
./webpack.config.test.js",
+"webpack:release": "webpack --debug --progress --colors --config 
./webpack.config.release.js",
+"test": "grunt test",
+"phantomjs": "./node_modules/.bin/mocha-phantomjs --debug=false 
--ssl-protocol=sslv2 --web-security=false --ignore-ssl-errors=true 
./test/runner.html",
+"couchdebug": "grunt couchdebug",
+"couchdb": "grunt couchdb",
+"couchapp": "grunt couchapp_deploy",
+"dev": "node ./devserver.js",
+"nightwatch": "grunt nightwatch",
+"start": "node ./bin/fauxton",
+"start-debug": "DIST=./dist/debug node ./bin/fauxton",
+"preversion": "node version-check.js && grunt release",
+"test-before-publish": "npm run preversion && npm install . -g",
+"create:animaldb": "./bin/create-animal-db",
+"docker:couchdb-up": "docker-compose -f ./docker/dc.selenium.yml up -d 
couchdb",
+"docker:selenium-up": "docker-compose -f ./docker/dc.selenium.yml up -d 
selenium",
+"docker:selenium-debug-up": "docker-compose -f 
./docker/dc.selenium-debug.yml up -d selenium",
+"docker:reset": "npm run docker:down && npm run docker:up",
+"docker:logs": "docker logs couchdb",
+"docker:up": "docker-compose -f ./docker/dc.selenium.yml up -d",
+"docker:debug-up": "docker-compose -f ./docker/dc.selenium-debug.yml up 
-d",
+"docker:down": "docker-compose -f ./docker/dc.selenium.yml down",
+"remove-test-dbs": "node ./bin/remove-test-dbs.js"
   },
   "devDependencies": {
 "enzyme": "^2.4.1",
@@ -95,33 +109,6 @@
 "webpack-dev-server": "^1.14.1",
 "zeroclipboard": "^2.2.0"
   },
-  "scripts": {
-"stylecheck": "eslint --ext=js,jsx .",
-"webpack:dev": "webpack --debug --progress --colors --config 
./webpack.config.dev.js",
-"webpack:test": "webpack --debug --progress --colors --config 
./webpack.config.test.js",
-"webpack:release": "webpack --debug --progress --colors --config 
./webpack.config.release.js",
-"test": "grunt test",
-"phantomjs": "./node_modules/.bin/mocha-phantomjs --debug=false 
--ssl-protocol=sslv2 --web-security=false --ignore-ssl-errors=true 
./test/runner.html",
-"couchdebug": "grunt couchdebug",
-"couchdb": "grunt couchdb",
-"couchapp": "grunt couchapp_deploy",
-"dev": "node ./devserver.js",
-"nightwatch": "grunt nightwatch",
-"start": "node ./bin/fauxton",
-"start-debug": "DIST=./dist/debug node ./bin/fauxton",
-"preversion": "node version-check.js && grunt release",
-"test-before-publish": "npm run preversion && npm install . -g",
-"create:animaldb": "./bin/create-animal-db",
-"docker:couchdb-up": "docker-compose -f ./docker/dc.selenium.yml up -d 
couchdb",
-"docker:selenium-up": "docker-compose -f ./docker/dc.selenium.yml up -d 
selenium",
-"docker:selenium-debug-up": "docker-compose -f 
./docker/dc.selenium-debug.yml up -d selenium",
-"docker:reset": "npm run docker:down && npm run docker:up",
-"docker:logs": "docker logs couchdb",
-"docker:up": "docker-compose -f ./docker/dc.selenium.yml up -d",
-"docker:debug-up": "docker-compose -f ./docker/dc.selenium-debug.yml up 
-d",
-"docker:down": "docker-compose -f ./docker/dc.selenium.yml down",
-"remove-test-

[1/6] fauxton commit: updated refs/heads/fix-deps to e35eacf

2016-09-04 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/fix-deps [created] e35eacf75


fix repo url


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/85a9f2e0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/85a9f2e0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/85a9f2e0

Branch: refs/heads/fix-deps
Commit: 85a9f2e069d064285e0f73cb104794cfbd4a8629
Parents: 34df1bf
Author: Robert Kowalski 
Authored: Mon Sep 5 00:47:38 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 00:47:38 2016 +0200

--
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/85a9f2e0/package.json
--
diff --git a/package.json b/package.json
index f2af97d..50f4eae 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
   },
   "repository": {
 "type": "git",
-"url": "https://git-wip-us.apache.org/repos/asf/couchdb.git";
+"url": "https://git-wip-us.apache.org/repos/asf/couchdb-fauxton.git";
   },
   "keywords": [
 "couchdb",



[6/6] fauxton commit: updated refs/heads/fix-deps to e35eacf

2016-09-04 Thread robertkowalski
remove superfluoues dep


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e35eacf7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e35eacf7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e35eacf7

Branch: refs/heads/fix-deps
Commit: e35eacf75a5135aa19ef883e0e9013187a4ef282
Parents: 17b694c
Author: Robert Kowalski 
Authored: Mon Sep 5 02:08:51 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 02:08:51 2016 +0200

--
 package.json | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e35eacf7/package.json
--
diff --git a/package.json b/package.json
index 4930cf6..7b0b390 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,6 @@
 "lodash": "^3.10.1",
 "mkdirp": "^0.5.1",
 "nano": "~5.12.0",
-"optimist": "^0.6.1",
 "request": "^2.54.0",
 "semver": "^5.1.0",
 "send": "^0.13.1",



[4/6] fauxton commit: updated refs/heads/fix-deps to e35eacf

2016-09-04 Thread robertkowalski
readd prepublish check


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/377b5c61
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/377b5c61
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/377b5c61

Branch: refs/heads/fix-deps
Commit: 377b5c6117dbacf19ec4a55527346c5419f2d630
Parents: 959e465
Author: Robert Kowalski 
Authored: Mon Sep 5 01:45:30 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 01:45:30 2016 +0200

--
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/377b5c61/package.json
--
diff --git a/package.json b/package.json
index 8b12c23..4930cf6 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
 "docker:up": "docker-compose -f ./docker/dc.selenium.yml up -d",
 "docker:debug-up": "docker-compose -f ./docker/dc.selenium-debug.yml up 
-d",
 "docker:down": "docker-compose -f ./docker/dc.selenium.yml down",
-"remove-test-dbs": "node ./bin/remove-test-dbs.js"
+"remove-test-dbs": "node ./bin/remove-test-dbs.js",
+"prepublish":  "grunt release"
   },
   "dependencies": {
 "backbone": "^1.1.0",



[5/6] fauxton commit: updated refs/heads/fix-deps to e35eacf

2016-09-04 Thread robertkowalski
optimize gitignore


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/17b694c6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/17b694c6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/17b694c6

Branch: refs/heads/fix-deps
Commit: 17b694c60a8f78edee3f2cd93553cea0df90421f
Parents: 377b5c6
Author: Robert Kowalski 
Authored: Mon Sep 5 02:08:34 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 02:08:34 2016 +0200

--
 .npmignore | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/17b694c6/.npmignore
--
diff --git a/.npmignore b/.npmignore
index 0da95e4..636dbad 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,6 +1,2 @@
-app/
-assets/
-tasks
-test/
-dist/debug
-dist/tmp-out
+*
+!dist/release/*



[3/6] fauxton commit: updated refs/heads/fix-deps to e35eacf

2016-09-04 Thread robertkowalski
cleanup


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/959e465a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/959e465a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/959e465a

Branch: refs/heads/fix-deps
Commit: 959e465a32742fda87ab03681807a1c3d09e75eb
Parents: 53caf70
Author: Robert Kowalski 
Authored: Mon Sep 5 01:26:55 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Sep 5 01:40:59 2016 +0200

--
 bin/fauxton  |  31 -
 index.js | 100 --
 package.json |  67 ++--
 3 files changed, 33 insertions(+), 165 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/959e465a/bin/fauxton
--
diff --git a/bin/fauxton b/bin/fauxton
deleted file mode 100755
index 0d6e1f0..000
--- a/bin/fauxton
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-
-var optimist = require('optimist')
-  .usage('Fauxton server \nUsage: $0')
-  .options('couchdb', {
-alias : 'c',
-default : 'http://localhost:5984',
-describe: 'Url to your CouchDB instance'
-  })
-  .options('port', {
-alias : 'p',
-default : 8000,
-describe: 'Local port that Fauxton will run on'
-  })
-  .options('help', {
-alias : 'h',
-describe: 'Show this message'
-  })
-  .options('contentSecurityPolicy', {
-alias : 'csp',
-default : true,
-describe: 'Configure the content security policy'
-  });
-
-var argv = optimist.argv;
-
-if (argv.help || argv.h) {
-  return optimist.showHelp(console.log);
-}
-
-var server = require('..')(argv);

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/959e465a/index.js
--
diff --git a/index.js b/index.js
deleted file mode 100644
index 5ad25fe..000
--- a/index.js
+++ /dev/null
@@ -1,100 +0,0 @@
-var path = require("path");
-var http = require("http");
-var httpProxy = require('http-proxy');
-var send = require('send');
-var urlLib = require('url');
-var _ = require('lodash');
-var dist_dir = process.env.DIST || __dirname + '/dist/release/';
-
-module.exports = function (options) {
-  // Options
-  var setContentSecurityPolicy = options.contentSecurityPolicy;
-  var port = options.port;
-  var proxyUrl = options.couchdb;
-
-  function sendFile (req, res, filePath) {
-return send(req, filePath)
-.on('error', function (err) {
-  if (err.status === 404) {
-console.log('Could not locate', filePath);
-  } else {
-console.log('ERROR', filePath, err);
-  }
-
-  res.setHeader("Content-Type", "text/javascript");
-  res.statusCode = 404;
-  res.end(JSON.stringify({error: err.message}));
-})
-.pipe(res);
-  }
-
-  var fileTypes = ['.js', '.css', '.png', '.swf', '.eot', '.woff', '.svg', 
'.ttf', '.swf'];
-
-  function isFile (url) {
-return _.contains(fileTypes, path.extname(url));
-  }
-
-  // create proxy to couch for all couch requests
-  var proxy = httpProxy.createServer({
-secure: false,
-changeOrigin: true,
-target: proxyUrl
-  });
-
-  http.createServer(function (req, res) {
-var isDocLink = /_utils\/docs/.test(req.url);
-var url = req.url.split(/\?v=|\?noCache/)[0].replace('_utils', '');
-var accept = [];
-if (req.headers.accept) {
-  var accept = req.headers.accept.split(',');
-}
-if (setContentSecurityPolicy) {
-  var headerValue = "default-src 'self'; child-src 'self' data: blob:; 
img-src 'self' data:; font-src 'self'; " +
-"script-src 'self' 'unsafe-eval'; style-src 'self' 
'unsafe-inline';";
-  res.setHeader('Content-Security-Policy', headerValue);
-}
-
-if (url === '/' && accept[0] !== 'application/json') {
-  // serve main index file from here
-  return sendFile(req, res, path.join(dist_dir, 'index.html'));
-} else if (isFile(url) && !isDocLink) {
-  return sendFile(req, res, path.join(dist_dir, url));
-}
-
-// 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, '0.0.0.0');
-
-  proxy.on('error', function (e) {
-// don't explode on cancelled requests
-  });
-
-  //Remove Secure on the cookie if the proxy is communicating to a CouchDB 
instance
-  // via https.
-  proxy.on('proxyRes', function (proxyRes, req, res) {
-if (proxyRes.headers['set-cookie']) {
-  proxyRes.headers['set-cookie'][0] = 
proxyRes.headers["set-cookie"][0].replace('Secure', '');
-}
-  });
-
-  va

couchdb commit: updated refs/heads/master to eeab832

2016-09-02 Thread robertkowalski
Repository: couchdb
Updated Branches:
  refs/heads/master fd1a8d0cc -> eeab83242


remove papaparse from license file


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/eeab8324
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/eeab8324
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/eeab8324

Branch: refs/heads/master
Commit: eeab832425ffe7f54fb36ceed28873a1934e517a
Parents: fd1a8d0
Author: Robert Kowalski 
Authored: Fri Sep 2 09:47:31 2016 +0200
Committer: Robert Kowalski 
Committed: Fri Sep 2 09:47:31 2016 +0200

--
 LICENSE | 23 ---
 1 file changed, 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/eeab8324/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 4f7f04e..9dba515 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1678,29 +1678,6 @@ for src/fauxton/assets/js/libs/css.escape.js
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-for src/fauxton/assets/js/libs/papaparse.js
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Matthew Holt
-
-Permission is hereby granted, free of charge, to any person obtaining a 
copy of
-this software and associated documentation files (the "Software"), to deal 
in
-the Software without restriction, including without limitation the rights 
to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
copies of
-the Software, and to permit persons to whom the Software is furnished to 
do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 for src/fauxton/assets/js/libs/react-bootstrap.js
 
 The MIT License (MIT)



fauxton commit: updated refs/heads/master to 34df1bf

2016-09-02 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master e79955110 -> 34df1bf39


remove unused dependency papaparse


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/34df1bf3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/34df1bf3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/34df1bf3

Branch: refs/heads/master
Commit: 34df1bf399df296a43a3f3ae9a2cd2681584abc1
Parents: e799551
Author: Robert Kowalski 
Authored: Fri Sep 2 09:45:34 2016 +0200
Committer: Robert Kowalski 
Committed: Fri Sep 2 09:45:34 2016 +0200

--
 package.json | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/34df1bf3/package.json
--
diff --git a/package.json b/package.json
index 31e0fba..f2af97d 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,6 @@
 "moment": "^2.8.4",
 "nano": "~5.12.0",
 "optimist": "^0.6.1",
-"papaparse": "^4.1.2",
 "pouchdb": "^5.3.1",
 "react": "~15.0.1",
 "react-addons-css-transition-group": "~15.0.1",



[3/4] fauxton commit: updated refs/heads/master to e799551

2016-09-01 Thread robertkowalski
allow setting amount of decimals

PR: #757
PR-URL: https://github.com/apache/couchdb-fauxton/pull/757
Reviewed-By: Michelle Phung 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6bd82869
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6bd82869
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6bd82869

Branch: refs/heads/master
Commit: 6bd82869bf9923624112f82d9109b72c1c1cec9f
Parents: e617ad2
Author: Robert Kowalski 
Authored: Tue Aug 23 13:10:17 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Sep 1 17:09:18 2016 +0200

--
 app/helpers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6bd82869/app/helpers.js
--
diff --git a/app/helpers.js b/app/helpers.js
index 16f56ee..f80a3f0 100644
--- a/app/helpers.js
+++ b/app/helpers.js
@@ -38,7 +38,7 @@ Helpers.getDocUrl = function (key) {
 };
 
 // File size pretty printing, taken from futon.format.js
-Helpers.formatSize = function (size) {
+Helpers.formatSize = function (size, decimals = 1) {
 var jump = 512;
 if (size < jump) return size + " bytes";
 var units = ["KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
@@ -47,7 +47,7 @@ Helpers.formatSize = function (size) {
   i += 1;
   size /= 1024;
 }
-return size.toFixed(1) + ' ' + units[i - 1];
+return size.toFixed(decimals) + ' ' + units[i - 1];
   };
 
 Helpers.formatDate = function (timestamp) {



[1/4] fauxton commit: updated refs/heads/master to e799551

2016-09-01 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 700557539 -> e79955110


fix list style type appearing in active tasks

PR: #757
PR-URL: https://github.com/apache/couchdb-fauxton/pull/757
Reviewed-By: Michelle Phung 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e7995511
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e7995511
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e7995511

Branch: refs/heads/master
Commit: e7995511042777c95010fc00c2631ec676ad780f
Parents: 6bd8286
Author: Robert Kowalski 
Authored: Thu Aug 25 14:41:09 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Sep 1 17:09:18 2016 +0200

--
 app/addons/activetasks/components.react.jsx| 2 +-
 app/addons/components/assets/less/tab-element.less | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7995511/app/addons/activetasks/components.react.jsx
--
diff --git a/app/addons/activetasks/components.react.jsx 
b/app/addons/activetasks/components.react.jsx
index 2add311..43c4115 100644
--- a/app/addons/activetasks/components.react.jsx
+++ b/app/addons/activetasks/components.react.jsx
@@ -151,7 +151,7 @@ var ActiveTasksFilterTabs = React.createClass({
 return (
   
 {filterTabs}
-
+
   http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e7995511/app/addons/components/assets/less/tab-element.less
--
diff --git a/app/addons/components/assets/less/tab-element.less 
b/app/addons/components/assets/less/tab-element.less
index d9cc152..6ef1d98 100644
--- a/app/addons/components/assets/less/tab-element.less
+++ b/app/addons/components/assets/less/tab-element.less
@@ -24,6 +24,10 @@
   min-width: 770px;
 }
 
+.component-tab-list-element {
+  list-style-type: none;
+}
+
 .component-tab-element {
   background-color: #eee;
   margin-top: 10px;



[4/4] fauxton commit: updated refs/heads/master to e799551

2016-09-01 Thread robertkowalski
tabs: minor style updates

 - make font for selected tab bold
 - don't highlight tab content on hover if tab is selected
 - inccrease space between tabs to 5px
 - reset margin applied from bootstrap

PR: #757
PR-URL: https://github.com/apache/couchdb-fauxton/pull/757
Reviewed-By: Michelle Phung 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b2c7fc2c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b2c7fc2c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b2c7fc2c

Branch: refs/heads/master
Commit: b2c7fc2c7bb856f665f742a2d3094c0c981180ad
Parents: 7005575
Author: Robert Kowalski 
Authored: Fri Jul 29 15:02:27 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Sep 1 17:09:18 2016 +0200

--
 .../components/assets/less/tab-element.less | 21 +++-
 .../components/react-components.react.jsx   |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2c7fc2c/app/addons/components/assets/less/tab-element.less
--
diff --git a/app/addons/components/assets/less/tab-element.less 
b/app/addons/components/assets/less/tab-element.less
index 6258cff..d9cc152 100644
--- a/app/addons/components/assets/less/tab-element.less
+++ b/app/addons/components/assets/less/tab-element.less
@@ -13,6 +13,9 @@
 @import "../../../../../assets/less/mixins.less";
 
 .component-tab-element-wrapper {
+  margin-left: 0;
+  padding-left: 0;
+  margin-bottom: 0;
   height: 60px;
   background-color: #CBCBCB;
   padding-left: 20px;
@@ -24,6 +27,10 @@
 .component-tab-element {
   background-color: #eee;
   margin-top: 10px;
+  margin-right: 5px;
+  margin-bottom: -1px;
+  float: left;
+  list-style-type: none;
   line-height: 40px;
 
   input {
@@ -32,13 +39,13 @@
 
   label {
 margin-right: 0;
+margin-bottom: 0;
 line-height: 25px;
 .noselect()
   }
 
   .tab-element-content {
 padding: 8px 12px 12px 12px;
-
   }
 
   .tab-element-indicator-wrapper {
@@ -59,6 +66,10 @@
 background-color: #fff;
   }
 
+  &.tab-element-checked .tab-element-content {
+font-weight: bold;
+  }
+
   transition: all .25s linear;
 
   &:hover {
@@ -66,6 +77,14 @@
 color: @linkColorHover;
   };
 
+  &.tab-element-checked .tab-element-content:hover {
+color: initial;
+  };
+
+  &.tab-element-checked:hover {
+color: initial;
+  };
+
   &:hover .tab-element-indicator {
 height: 5px;
 background-color: @linkColorHover;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2c7fc2c/app/addons/components/react-components.react.jsx
--
diff --git a/app/addons/components/react-components.react.jsx 
b/app/addons/components/react-components.react.jsx
index 34d0b3d..2938cbc 100644
--- a/app/addons/components/react-components.react.jsx
+++ b/app/addons/components/react-components.react.jsx
@@ -1586,7 +1586,7 @@ TabElement.propTypes = {
 
 const TabElementWrapper = ({children}) => {
   return (
-
+
   {children}
 
   );



[2/4] fauxton commit: updated refs/heads/master to e799551

2016-09-01 Thread robertkowalski
given the tray is not open do not fire tray events to close

PR: #757
PR-URL: https://github.com/apache/couchdb-fauxton/pull/757
Reviewed-By: Michelle Phung 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e617ad26
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e617ad26
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e617ad26

Branch: refs/heads/master
Commit: e617ad26a8cc98b1db027305dc3410c21383d805
Parents: b2c7fc2
Author: Robert Kowalski 
Authored: Wed Aug 3 13:51:37 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Sep 1 17:09:18 2016 +0200

--
 app/addons/components/react-components.react.jsx | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e617ad26/app/addons/components/react-components.react.jsx
--
diff --git a/app/addons/components/react-components.react.jsx 
b/app/addons/components/react-components.react.jsx
index 2938cbc..d1dcbf1 100644
--- a/app/addons/components/react-components.react.jsx
+++ b/app/addons/components/react-components.react.jsx
@@ -1395,6 +1395,11 @@ var APIBar = React.createClass({
 
   componentDidMount: function () {
 $('body').on('click.APIBar', function (e) {
+
+  if (!$('.show-tray.api-bar-tray').length) {
+return;
+  }
+
   if ($(e.target).closest('.api-bar-tray,.control-toggle-api-url').length 
=== 0) {
 Actions.toggleApiBarVisibility(false);
   }



fauxton commit: updated refs/heads/master to da1b45b

2016-08-18 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 2f9df630e -> da1b45bf5


React Breadcrumbs port: let mango use the new header

PR: #763
PR-URL: https://github.com/apache/couchdb-fauxton/pull/763
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/da1b45bf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/da1b45bf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/da1b45bf

Branch: refs/heads/master
Commit: da1b45bf54ad6fce47ce02aff3cb6905bd0bf979
Parents: 2f9df63
Author: Robert Kowalski 
Authored: Wed Aug 17 19:46:20 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Aug 18 14:55:37 2016 +0200

--
 app/addons/documents/routes-mango.js| 96 +---
 .../tests/nightwatch/previousButton.js  |  8 +-
 2 files changed, 48 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/da1b45bf/app/addons/documents/routes-mango.js
--
diff --git a/app/addons/documents/routes-mango.js 
b/app/addons/documents/routes-mango.js
index f29402a..7839d82 100644
--- a/app/addons/documents/routes-mango.js
+++ b/app/addons/documents/routes-mango.js
@@ -29,7 +29,7 @@ import IndexResultsComponents from 
"./index-results/index-results.components.rea
 import SidebarActions from "./sidebar/actions";
 import RightAllDocsHeader from './components/rightalldocsheader.react';
 
-var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
+const MangoIndexEditorAndQueryEditor = FauxtonAPI.RouteObject.extend({
   layout: 'two_pane',
   routes: {
 'database/:database/_index': {
@@ -42,37 +42,33 @@ var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
 },
   },
 
+  disableLoader: true,
+
   initialize: function (route, masterLayout, options) {
 var databaseName = options[0];
 this.databaseName = databaseName;
 this.database = new Databases.Model({id: databaseName});
 
-// magic methods
-this.allDatabases = this.getAllDatabases();
-this.createDesignDocsCollection();
-this.addLeftHeader();
-
 MangoActions.setDatabase({
   database: this.database
 });
   },
 
-  findUsingIndex: function () {
-var params = this.createParams(),
-urlParams = params.urlParams,
-mangoResultCollection = new Resources.MangoDocumentCollection(null, {
-  database: this.database,
-  paging: {
-pageSize: IndexResultStores.indexResultsStore.getPerPage()
-  }
-}),
-mangoIndexList = new Resources.MangoIndexCollection(null, {
-  database: this.database,
-  params: null,
-  paging: {
-pageSize: IndexResultStores.indexResultsStore.getPerPage()
-  }
-});
+  findUsingIndex: function (database) {
+const mangoResultCollection = new Resources.MangoDocumentCollection(null, {
+  database: this.database,
+  paging: {
+pageSize: IndexResultStores.indexResultsStore.getPerPage()
+  }
+});
+
+const mangoIndexList = new Resources.MangoIndexCollection(null, {
+  database: this.database,
+  params: null,
+  paging: {
+pageSize: IndexResultStores.indexResultsStore.getPerPage()
+  }
+});
 
 SidebarActions.selectNavItem('mango-query');
 this.setComponent('#react-headerbar', 
ReactHeader.BulkDocumentHeaderController, {showIncludeAllDocs: false});
@@ -88,15 +84,6 @@ var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
   indexList: mangoIndexList
 });
 
-var url = FauxtonAPI.urls('allDocs', 'app', this.database.safeID(), 
'?limit=' + FauxtonAPI.constants.DATABASES.DOCUMENT_LIMIT);
-this.breadcrumbs = this.setView('#breadcrumbs', new 
Components.Breadcrumbs({
-  toggleDisabled: true,
-  crumbs: [
-{'type': 'back', 'link': url},
-{'name': app.i18n.en_US['mango-title-editor'], 'link': url}
-  ]
-}));
-
 this.setComponent('#left-content', 
MangoComponents.MangoQueryEditorController, {
   description: app.i18n.en_US['mango-descripton'],
   editorTitle: app.i18n.en_US['mango-title-editor'],
@@ -105,20 +92,27 @@ var MangoIndexEditorAndQueryEditor = BaseRoute.extend({
 this.setComponent('#dashboard-lower-content', IndexResultsComponents.List);
 
 this.apiUrl = function () {
-  return [mangoResultCollection.urlRef('query-apiurl', urlParams), 
FauxtonAPI.constants.DOC_URLS.MANGO_SEARCH];
+  return [mangoResultCollection.urlRef('query-apiurl', ''), 
FauxtonAPI.constants.DOC_URLS.MANGO_SEARCH];
 };
+
+const url = FauxtonAPI.urls(
+  'allDocs', 'app', this.database.safeID(), '?limit=' + 
FauxtonAPI.constants.DATABASES.DOCUMENT_LIMIT
+);
+
+this.crum

fauxton commit: updated refs/heads/master to 5aeb8c4

2016-08-12 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 799cfd33b -> 5aeb8c43e


Breadcrumbs React port: remove jump-to-db

PR: #739
PR-URL: https://github.com/apache/couchdb-fauxton/pull/739
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5aeb8c43
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5aeb8c43
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5aeb8c43

Branch: refs/heads/master
Commit: 5aeb8c43eed5195e7abce2cb9509120df601e517
Parents: 799cfd3
Author: Robert Kowalski 
Authored: Wed Jun 29 10:28:47 2016 +0200
Committer: Robert Kowalski 
Committed: Fri Aug 12 16:56:15 2016 +0200

--
 app/addons/documents/routes-documents.js|   7 --
 app/addons/documents/shared-routes.js   |  26 +---
 .../documents/tests/nightwatch/lookaheadTray.js |  28 -
 .../switchDatabaseViaLookaheadTray.js   |  42 ---
 app/addons/fauxton/components.js| 126 ---
 app/addons/fauxton/templates/header_left.html   |   3 -
 .../fauxton/templates/lookahead_tray.html   |  16 ---
 app/addons/permissions/routes.js|  16 ---
 assets/less/trays.less  |  99 ---
 9 files changed, 1 insertion(+), 362 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5aeb8c43/app/addons/documents/routes-documents.js
--
diff --git a/app/addons/documents/routes-documents.js 
b/app/addons/documents/routes-documents.js
index 7858177..469f99f 100644
--- a/app/addons/documents/routes-documents.js
+++ b/app/addons/documents/routes-documents.js
@@ -53,7 +53,6 @@ var DocumentsRouteObject = BaseRoute.extend({
 
   initialize: function (route, masterLayout, options) {
 this.initViews(options[0]);
-this.listenToLookaheadTray();
   },
 
   establish: function () {
@@ -191,12 +190,6 @@ var DocumentsRouteObject = BaseRoute.extend({
 this.apiUrl = function () {
   return [FauxtonAPI.urls('changes', 'apiurl', this.database.id, ''), 
this.database.documentation()];
 };
-  },
-
-  cleanup: function () {
-// we're no longer interested in listening to the lookahead tray event on 
this route object
-this.stopListening(FauxtonAPI.Events, 'lookaheadTray:update', 
this.onSelectDatabase);
-FauxtonAPI.RouteObject.prototype.cleanup.apply(this);
   }
 
 });

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5aeb8c43/app/addons/documents/shared-routes.js
--
diff --git a/app/addons/documents/shared-routes.js 
b/app/addons/documents/shared-routes.js
index 5248c46..e96b8af 100644
--- a/app/addons/documents/shared-routes.js
+++ b/app/addons/documents/shared-routes.js
@@ -44,24 +44,6 @@ var BaseRoute = FauxtonAPI.RouteObject.extend({
 });
   },
 
-  onSelectDatabase: function (dbName) {
-this.cleanup();
-this.initViews(dbName);
-
-var url = FauxtonAPI.urls('allDocs', 'app',  
app.utils.safeURLName(dbName), '');
-FauxtonAPI.navigate(url, {
-  trigger: true
-});
-
-// we need to start listening again because cleanup() removed the 
listener, but in this case
-// initialize() doesn't fire to re-set up the listener
-this.listenToLookaheadTray();
-  },
-
-  listenToLookaheadTray: function () {
-this.listenTo(FauxtonAPI.Events, 'lookaheadTray:update', 
this.onSelectDatabase);
-  },
-
   getAllDatabases: function () {
 return new Databases.List();  //getAllDatabases() can be overwritten 
instead of hard coded into initViews
   },
@@ -89,13 +71,7 @@ var BaseRoute = FauxtonAPI.RouteObject.extend({
   addLeftHeader: function () {
 this.leftheader = this.setView('#breadcrumbs', new Components.LeftHeader({
   databaseName: this.database.safeID(),
-  crumbs: this.getCrumbs(this.database),
-  lookaheadTrayOptions: {
-databaseCollection: this.allDatabases,
-toggleEventName: 'lookaheadTray:toggle',
-onUpdateEventName: 'lookaheadTray:update',
-placeholder: 'Enter database name'
-  }
+  crumbs: this.getCrumbs(this.database)
 }));
   },
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5aeb8c43/app/addons/documents/tests/nightwatch/lookaheadTray.js
--
diff --git a/app/addons/documents/tests/nightwatch/lookaheadTray.js 
b/app/addons/documents/tests/nightwatch/lookaheadTray.js
deleted file mode 100644
index 08da65b..000
--- a/app/addons/documents/tests/nightwatch/lookaheadTray.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except i

fauxton commit: updated refs/heads/master to 7308368

2016-07-28 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 6a618ebda -> 7308368d0


remove polling feature

there is no real world use case for watching the changes feed in
production. as the feature has a bug, we decided removing it would
make more sense.

PR: #755
PR-URL: https://github.com/apache/couchdb-fauxton/pull/755
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/7308368d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/7308368d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/7308368d

Branch: refs/heads/master
Commit: 7308368d0896c259601bbc328649d8bea194ca9d
Parents: 6a618eb
Author: Robert Kowalski 
Authored: Thu Jul 28 14:31:37 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Jul 28 15:59:40 2016 +0200

--
 app/addons/documents/assets/less/changes.less   | 11 --
 app/addons/documents/changes/actions.js | 15 ---
 app/addons/documents/changes/actiontypes.js |  3 +-
 .../documents/changes/components.react.jsx  | 41 
 app/addons/documents/changes/stores.js  | 16 
 app/addons/documents/routes-documents.js|  2 +-
 .../documents/tests/nightwatch/changes.js   | 28 -
 7 files changed, 2 insertions(+), 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7308368d/app/addons/documents/assets/less/changes.less
--
diff --git a/app/addons/documents/assets/less/changes.less 
b/app/addons/documents/assets/less/changes.less
index c86e016..ffafd7d 100644
--- a/app/addons/documents/assets/less/changes.less
+++ b/app/addons/documents/assets/less/changes.less
@@ -137,17 +137,6 @@
   margin-left: 20px;
 }
 
-.changes-polling {
-  padding: 20px 0;
-  float: right;
-  input {
-margin: 0 8px 1px;
-  }
-  label {
-display: inline-block;
-  }
-}
-
 .new-change-row {
   -webkit-animation: slideDown 1.5s both, highlight-element 2.0s 1;
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7308368d/app/addons/documents/changes/actions.js
--
diff --git a/app/addons/documents/changes/actions.js 
b/app/addons/documents/changes/actions.js
index 1ec5c37..4d2635f 100644
--- a/app/addons/documents/changes/actions.js
+++ b/app/addons/documents/changes/actions.js
@@ -75,20 +75,5 @@ export default {
 seqNum: latestSeqNum
   });
 }
-
-if (changesStore.pollingEnabled()) {
-  this.getLatestChanges();
-}
-  },
-
-  togglePolling: function () {
-FauxtonAPI.dispatch({ type: ActionTypes.TOGGLE_CHANGES_POLLING });
-
-// the user just enabled polling. Start 'er up
-if (changesStore.pollingEnabled()) {
-  this.getLatestChanges();
-} else {
-  currentRequest.abort();
-}
   }
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7308368d/app/addons/documents/changes/actiontypes.js
--
diff --git a/app/addons/documents/changes/actiontypes.js 
b/app/addons/documents/changes/actiontypes.js
index 34e42f7..bd2e412 100644
--- a/app/addons/documents/changes/actiontypes.js
+++ b/app/addons/documents/changes/actiontypes.js
@@ -16,6 +16,5 @@ export default {
   ADD_CHANGES_FILTER_ITEM: 'ADD_CHANGES_FILTER_ITEM',
   REMOVE_CHANGES_FILTER_ITEM: 'REMOVE_CHANGES_FILTER_ITEM',
   UPDATE_CHANGES_FILTER: 'UPDATE_CHANGES_FILTER',
-  TOGGLE_CHANGES_CODE_VISIBILITY: 'TOGGLE_CHANGES_CODE_VISIBILITY',
-  TOGGLE_CHANGES_POLLING: 'TOGGLE_CHANGES_POLLING'
+  TOGGLE_CHANGES_CODE_VISIBILITY: 'TOGGLE_CHANGES_CODE_VISIBILITY'
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/7308368d/app/addons/documents/changes/components.react.jsx
--
diff --git a/app/addons/documents/changes/components.react.jsx 
b/app/addons/documents/changes/components.react.jsx
index d015181..fb01a36 100644
--- a/app/addons/documents/changes/components.react.jsx
+++ b/app/addons/documents/changes/components.react.jsx
@@ -137,46 +137,6 @@ class ChangesTabContent extends React.Component {
 }
 
 
-class PollingOption extends React.Component {
-  constructor (props) {
-super(props);
-this.state = this.getStoreState();
-  }
-
-  getStoreState () {
-return {
-  pollingEnabled: store.pollingEnabled()
-};
-  }
-
-  onChange () {
-this.setState(this.getStoreState());
-  }
-
-  componentDidMount () {
-store.on('change', this.onChange, this);
-  }
-
-  componentWillUnmount () {
-store.off('change', this.onChange);
-  }
-
-  render () {
-return (
-  
- Actions.togglePolling()}
-/>
-   

fauxton commit: updated refs/heads/master to 6a618eb

2016-07-28 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 8bb5be380 -> 6a618ebda


testsuite: autocheck if document/db appears after creation

make sure that at least one request is successful right after the
creation of the database.

PR: #754
PR-URL: https://github.com/apache/couchdb-fauxton/pull/754
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6a618ebd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6a618ebd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6a618ebd

Branch: refs/heads/master
Commit: 6a618ebda054eb834fb0052c8261a091bc9bcd46
Parents: 8bb5be3
Author: Robert Kowalski 
Authored: Wed Jul 27 17:56:49 2016 +0200
Committer: Robert Kowalski 
Committed: Thu Jul 28 14:58:53 2016 +0200

--
 .../tests/nightwatch/checkDatabaseTooltip.js|  4 +-
 .../custom-commands/checkForDatabaseCreated.js  | 25 
 .../custom-commands/checkForDocumentCreated.js  | 26 +
 .../custom-commands/createDatabase.js   | 21 +++---
 .../custom-commands/createDocument.js   | 20 --
 test/nightwatch_tests/custom-commands/helper.js | 41 
 6 files changed, 90 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6a618ebd/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
--
diff --git a/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js 
b/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
index 2862fe7..7c54ee6 100644
--- a/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
+++ b/app/addons/databases/tests/nightwatch/checkDatabaseTooltip.js
@@ -20,13 +20,13 @@ module.exports = {
 baseUrl = client.globals.test_settings.launch_url;
 
 client
-  .loginToGUI()
-
   // use nano to quickly set up a DB with a single doc
   .deleteDatabase(newDatabaseName)
   .createDatabase(newDatabaseName)
   .createDocument(newDocumentName, newDatabaseName)
 
+  .loginToGUI()
+
   // delete the document manually. This'll ensure the database page has at 
least one "!" icon
   .waitForElementPresent('#dashboard-content a[href="#/database/' + 
newDatabaseName + '/_all_docs"]', waitTime, false)
   .click('#dashboard-content a[href="#/database/' + newDatabaseName + 
'/_all_docs"]')

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6a618ebd/test/nightwatch_tests/custom-commands/checkForDatabaseCreated.js
--
diff --git a/test/nightwatch_tests/custom-commands/checkForDatabaseCreated.js 
b/test/nightwatch_tests/custom-commands/checkForDatabaseCreated.js
index a3ac324..1de4abd 100644
--- a/test/nightwatch_tests/custom-commands/checkForDatabaseCreated.js
+++ b/test/nightwatch_tests/custom-commands/checkForDatabaseCreated.js
@@ -15,6 +15,9 @@ var util = require('util'),
 helpers = require('../helpers/helpers.js'),
 request = require('request');
 
+const commandHelper = require('./helper.js');
+const checkForDatabaseCreated = commandHelper.checkForDatabaseCreated;
+
 function CheckForDatabaseCreated () {
   events.EventEmitter.call(this);
 }
@@ -23,29 +26,15 @@ function CheckForDatabaseCreated () {
 util.inherits(CheckForDatabaseCreated, events.EventEmitter);
 
 CheckForDatabaseCreated.prototype.command = function (databaseName, timeout) {
-  var couchUrl = this.client.options.db_url;
+  const couchUrl = this.client.options.db_url;
 
   if (!timeout) {
 timeout = helpers.maxWaitTime;
   }
 
-  var timeOutId = setTimeout(function () {
-throw new Error('timeout waiting for db to appear');
-  }, timeout);
-
-  var intervalId = setInterval(function () {
-request(couchUrl + '/_all_dbs', function (er, res, body) {
-  if (body) {
-var reg = new RegExp('"' + databaseName + '"', 'g');
-if (reg.test(body)) {
-  clearTimeout(timeOutId);
-  console.log('database created: ' + databaseName);
-  clearInterval(intervalId);
-  this.emit('complete');
-}
-  }
-}.bind(this));
-  }.bind(this), 1000);
+  checkForDatabaseCreated(couchUrl, databaseName, timeout, () => {
+this.emit('complete');
+  });
 
   return this;
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6a618ebd/test/nightwatch_tests/custom-commands/checkForDocumentCreated.js
--
diff --git a/test/nightwatch_tests/custom-commands/checkForDocumentCreated.js 
b/test/nightwatch_tests/custom-commands/checkForDocumentCreated.js
index 4b0e2e4..d6b156e 100644
--- a/test/nightwatch_tests/custom-commands/checkForDocume

fauxton commit: updated refs/heads/master to c5fc701

2016-07-12 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 9cf388a82 -> c5fc7018a


display not exist error just on 404

just in case of a 404 the notification "The document does not
exist" is relevant.

PR: #743
PR-URL: https://github.com/apache/couchdb-fauxton/pull/743
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/c5fc7018
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/c5fc7018
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/c5fc7018

Branch: refs/heads/master
Commit: c5fc7018ac4465362576cc996d9a4ff3f7870b92
Parents: 9cf388a
Author: Robert Kowalski 
Authored: Thu Jul 7 18:04:59 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Jul 12 17:25:22 2016 +0200

--
 app/addons/documents/doc-editor/actions.js | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c5fc7018/app/addons/documents/doc-editor/actions.js
--
diff --git a/app/addons/documents/doc-editor/actions.js 
b/app/addons/documents/doc-editor/actions.js
index 9b6a1fc..9331ddd 100644
--- a/app/addons/documents/doc-editor/actions.js
+++ b/app/addons/documents/doc-editor/actions.js
@@ -36,7 +36,10 @@ function initDocEditor (params) {
   params.onLoaded();
 }
   }, function (xhr, reason, msg) {
-errorNotification('The document does not exist.');
+if (xhr.status === 404) {
+  errorNotification('The document does not exist.');
+}
+
 FauxtonAPI.navigate(FauxtonAPI.urls('allDocs', 'app', params.database.id, 
''));
   });
 }



[6/7] fauxton commit: updated refs/heads/master to 73521f1

2016-07-04 Thread robertkowalski
changes from review

PR: #732
PR-URL: https://github.com/apache/couchdb-fauxton/pull/732
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/18d08e96
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/18d08e96
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/18d08e96

Branch: refs/heads/master
Commit: 18d08e96a90dc4d1e77865b39d00a890ace899ea
Parents: db95bb3
Author: Robert Kowalski 
Authored: Mon Jun 27 16:33:40 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jul 4 15:25:28 2016 +0200

--
 app/addons/components/actions.js|   9 --
 app/addons/components/actiontypes.js|   1 -
 .../assets/less/header-breadcrumbs.less |   6 +
 app/addons/components/header-breadcrumbs.jsx|   9 +-
 app/addons/components/stores.js | 129 +++
 .../documents/doc-editor/components.react.jsx   |   7 +-
 app/addons/documents/helpers.js |  18 ---
 app/addons/documents/routes-doc-editor.js   |  29 ++---
 app/addons/fauxton/base.js  |   2 +-
 app/core/tests/routeObjectSpec.js   |   2 -
 10 files changed, 150 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/18d08e96/app/addons/components/actions.js
--
diff --git a/app/addons/components/actions.js b/app/addons/components/actions.js
index c9618aa..53ccd15 100644
--- a/app/addons/components/actions.js
+++ b/app/addons/components/actions.js
@@ -69,17 +69,8 @@ function deleteDatabase (dbId) {
   });
 }
 
-function setBreadCrumbs (crumbs) {
-  FauxtonAPI.dispatch({
-type: ActionTypes.CMPNTS_BREADCRUMBS_SET_CRUMBS,
-options: {
-  crumbs: crumbs
-}
-  });
-}
 
 export default {
-  setBreadCrumbs: setBreadCrumbs,
   deleteDatabase: deleteDatabase,
   showDeleteDatabaseModal: showDeleteDatabaseModal,
   showAPIBarButton: showAPIBarButton,

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/18d08e96/app/addons/components/actiontypes.js
--
diff --git a/app/addons/components/actiontypes.js 
b/app/addons/components/actiontypes.js
index 2940c51..c349806 100644
--- a/app/addons/components/actiontypes.js
+++ b/app/addons/components/actiontypes.js
@@ -16,5 +16,4 @@ export default {
   CMPNTS_UPDATE_API_BAR: 'CMPNTS_UPDATE_API_BAR',
   CMPNTS_SET_API_BAR_CONTENT_VISIBLE_STATE: 
'CMPNTS_SET_API_BAR_CONTENT_VISIBLE_STATE',
   CMPNTS_DATABASES_SHOWDELETE_MODAL: 'CMPNTS_DATABASES_SHOWDELETE_MODAL',
-  CMPNTS_BREADCRUMBS_SET_CRUMBS: 'CMPNTS_BREADCRUMBS_SET_CRUMBS'
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/18d08e96/app/addons/components/assets/less/header-breadcrumbs.less
--
diff --git a/app/addons/components/assets/less/header-breadcrumbs.less 
b/app/addons/components/assets/less/header-breadcrumbs.less
index f419eb1..37f5bd2 100644
--- a/app/addons/components/assets/less/header-breadcrumbs.less
+++ b/app/addons/components/assets/less/header-breadcrumbs.less
@@ -27,6 +27,12 @@
   cursor: hand;
 }
 
+.faux-header__breadcrumbs-divider {
+  width: 13px;
+  padding-top: 22px;
+  font-size: 20px;
+}
+
 .faux-header__controlbox-backlink {
   border-right: 1px solid #ccc;
   padding-left: 10px;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/18d08e96/app/addons/components/header-breadcrumbs.jsx
--
diff --git a/app/addons/components/header-breadcrumbs.jsx 
b/app/addons/components/header-breadcrumbs.jsx
index c93561f..8c3cdef 100644
--- a/app/addons/components/header-breadcrumbs.jsx
+++ b/app/addons/components/header-breadcrumbs.jsx
@@ -15,11 +15,9 @@ import ReactDOM from 'react-dom';
 
 export const Breadcrumbs = ({crumbs}) => {
 
-  const childs = getChildren(crumbs);
-
   return (
 
-  {childs}
+  {getChildren(crumbs)}
 
   );
 
@@ -35,11 +33,8 @@ const CrumbElement = ({children}) => {
 };
 
 const Divider = () => {
-  const style = {width: '13px', paddingTop: '22px', fontSize: '20px'};
   return (
-
+
   );
 };
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/18d08e96/app/addons/components/stores.js
--
diff --git a/app/addons/components/stores.js b/app/addons/components/stores.js
new file mode 100644
index 000..af5a69c
--- /dev/null
+++ b/app/addons/components/stores.js
@@ -0,0 +1,129 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may o

[1/7] fauxton commit: updated refs/heads/master to 73521f1

2016-07-04 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 5be261085 -> 73521f15c


add fix for functional components

PR: #732
PR-URL: https://github.com/apache/couchdb-fauxton/pull/732
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/73521f15
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/73521f15
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/73521f15

Branch: refs/heads/master
Commit: 73521f15c0d0b96ffc1830845813c68fab7dd71e
Parents: 18d08e9
Author: Robert Kowalski 
Authored: Fri Jul 1 14:06:02 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jul 4 15:25:28 2016 +0200

--
 .../components/tests/headerBreadcrumbsSpec.react.jsx  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/73521f15/app/addons/components/tests/headerBreadcrumbsSpec.react.jsx
--
diff --git a/app/addons/components/tests/headerBreadcrumbsSpec.react.jsx 
b/app/addons/components/tests/headerBreadcrumbsSpec.react.jsx
index b96cd08..2c40683 100644
--- a/app/addons/components/tests/headerBreadcrumbsSpec.react.jsx
+++ b/app/addons/components/tests/headerBreadcrumbsSpec.react.jsx
@@ -36,7 +36,7 @@ describe('Breadcrumbs', () => {
 const crumbs = [{name: 'pineapple'}];
 
 let el = TestUtils.renderIntoDocument(
-  ,
+  ,
   container
 );
 
@@ -54,7 +54,7 @@ describe('Breadcrumbs', () => {
 ];
 
 let el = TestUtils.renderIntoDocument(
-  ,
+  ,
   container
 );
 
@@ -72,7 +72,7 @@ describe('Breadcrumbs', () => {
 ];
 
 let el = TestUtils.renderIntoDocument(
-  ,
+  ,
   container
 );
 
@@ -90,12 +90,12 @@ describe('Breadcrumbs', () => {
 ];
 
 let el = TestUtils.renderIntoDocument(
-  ,
+  ,
   container
 );
 
 const $node = $(ReactDOM.findDOMNode(el));
 
-assert.equal($node.find('.faux-header__breadcrumbs-link').length, 3);
+assert.equal($node.find('.faux-header__breadcrumbs-link').length, 0);
   });
 });



[5/7] fauxton commit: updated refs/heads/master to 73521f1

2016-07-04 Thread robertkowalski
Breadcrumbs React port: refactor clone-doc action

 - use helper function for docId sanitizing
 - move clone-doc-action out of route ofbject
 - delete route-event `duplicateDoc`
 - fix issue where breadcrumb header was not updating after clone

PR: #732
PR-URL: https://github.com/apache/couchdb-fauxton/pull/732
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/50e08c89
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/50e08c89
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/50e08c89

Branch: refs/heads/master
Commit: 50e08c899b574d22784392755814284341936a48
Parents: de9b12b
Author: Robert Kowalski 
Authored: Tue Jun 21 14:14:18 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jul 4 15:25:28 2016 +0200

--
 app/addons/documents/doc-editor/actions.js  | 27 +
 .../documents/doc-editor/components.react.jsx   | 12 ++--
 app/addons/documents/routes-doc-editor.js   | 31 +---
 .../documents/tests/nightwatch/cloneDoc.js  |  1 -
 4 files changed, 31 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/50e08c89/app/addons/documents/doc-editor/actions.js
--
diff --git a/app/addons/documents/doc-editor/actions.js 
b/app/addons/documents/doc-editor/actions.js
index ed00f94..9b6a1fc 100644
--- a/app/addons/documents/doc-editor/actions.js
+++ b/app/addons/documents/doc-editor/actions.js
@@ -112,13 +112,28 @@ function hideCloneDocModal () {
   FauxtonAPI.dispatch({ type: ActionTypes.HIDE_CLONE_DOC_MODAL });
 }
 
-function cloneDoc (newId) {
-  var isDDoc = newId.match(/^_design\//),
-removeDDocID = newId.replace(/^_design\//, ''),
-encodedID = isDDoc ? '_design/' + app.utils.safeURLName(removeDDocID) : 
app.utils.safeURLName(newId);
+function cloneDoc (database, doc, newId) {
+  const docId = app.utils.getSafeIdForDoc(newId);
+
+  hideCloneDocModal();
+
+  doc.copy(docId).then(() => {
+doc.set({ _id: docId });
+
+FauxtonAPI.navigate('/database/' + database.safeID() + '/' + docId, { 
trigger: true });
+
+FauxtonAPI.addNotification({
+  msg: 'Document has been duplicated.'
+});
+
+  }, (error) => {
+const errorMsg = `Could not duplicate document, reason: 
${error.responseText}.`;
+FauxtonAPI.addNotification({
+  msg: errorMsg,
+  type: 'error'
+});
+  });
 
-  this.hideCloneDocModal();
-  FauxtonAPI.triggerRouteEvent('duplicateDoc', encodedID);
 }
 
 function showUploadModal () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/50e08c89/app/addons/documents/doc-editor/components.react.jsx
--
diff --git a/app/addons/documents/doc-editor/components.react.jsx 
b/app/addons/documents/doc-editor/components.react.jsx
index c2a7f15..7c53dd6 100644
--- a/app/addons/documents/doc-editor/components.react.jsx
+++ b/app/addons/documents/doc-editor/components.react.jsx
@@ -190,6 +190,8 @@ var DocEditorController = React.createClass({
   visible={this.state.uploadModalVisible}
   doc={this.state.doc} />
 
 http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/50e08c89/app/addons/documents/routes-doc-editor.js
--
diff --git a/app/addons/documents/routes-doc-editor.js 
b/app/addons/documents/routes-doc-editor.js
index c830ec9..0600105 100644
--- a/app/addons/documents/routes-doc-editor.js
+++ b/app/addons/documents/routes-doc-editor.js
@@ -40,7 +40,7 @@ const RevBrowserRouteObject = FauxtonAPI.RouteObject.extend({
   },
 
   crumbs: function () {
-const previousPage = Helpers.getPreviousPageForDoc(this.database, 
this.wasCloned);
+const previousPage = Helpers.getPreviousPageForDoc(this.database);
 const docUrl = FauxtonAPI.urls('document', 'app', this.database.safeID(), 
this.docId);
 
 return [
@@ -83,10 +83,6 @@ const DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
 'database/:database/new': 'codeEditor'
   },
 
-  events: {
-'route:duplicateDoc': 'duplicateDoc'
-  },
-
   crumbs: function () {
 
 if (this.docId) {
@@ -124,31 +120,6 @@ const DocEditorRouteObject = 
FauxtonAPI.RouteObject.extend({
 this.codeEditor(database, '_design/' + ddoc);
   },
 
-  duplicateDoc: function (newId) {
-var doc = this.doc,
-database = this.database;
-
-this.docID = newId;
-
-var that = this;
-doc.copy(newId).then(function () {
-  doc.set({ _id: newId });
-  that.wasCloned = true;
-
-  FauxtonAPI.navigate('/database/' + database.safeID() + '/' + 
app.utils.safeURLName(newId), { trigger: true });
-  Fauxton

[3/7] fauxton commit: updated refs/heads/master to 73521f1

2016-07-04 Thread robertkowalski
Breadcrumbs React port: add breadcrumb component for simple header

PR: #732
PR-URL: https://github.com/apache/couchdb-fauxton/pull/732
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/de9b12b3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/de9b12b3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/de9b12b3

Branch: refs/heads/master
Commit: de9b12b358425a5454ee7d4d0e1285a983a77891
Parents: 9c13fd4
Author: Robert Kowalski 
Authored: Tue Jun 21 13:24:22 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jul 4 15:25:28 2016 +0200

--
 Gruntfile.js|   3 +-
 app/addons/components/actions.js|  10 ++
 app/addons/components/actiontypes.js|   3 +-
 .../components/assets/less/components.less  |   1 +
 .../assets/less/header-breadcrumbs.less |  34 +
 app/addons/components/header-breadcrumbs.jsx|  71 ++
 app/addons/components/stores.js | 129 ---
 .../tests/headerBreadcrumbsSpec.react.jsx   | 101 +++
 .../documents/tests/nightwatch/cloneDoc.js  |  58 +
 .../tests/nightwatch/createsDocument.js |   2 +-
 .../nightwatch/createsDocumentWithoutId.js  |   2 +-
 .../tests/nightwatch/editDocumentsFromView.js   |   7 +-
 .../tests/nightwatch/fixRegressionTableView.js  |   2 +-
 .../tests/nightwatch/navigateFromNewDoc.js  |   2 +-
 .../tests/nightwatch/selectDocViaTypeahead.js   |   1 -
 app/addons/fauxton/base.js  |  21 +--
 app/addons/fauxton/tests/baseSpec.js|  84 
 app/addons/fauxton/tests/breadcrumbsSpec.js |  86 -
 18 files changed, 300 insertions(+), 317 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/de9b12b3/Gruntfile.js
--
diff --git a/Gruntfile.js b/Gruntfile.js
index 39ed769..f2cc6e1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -220,7 +220,8 @@ module.exports = function (grunt) {
   src: initHelper.getFileList(['[Ss]pec.js'], [
 './app/core/**/*[Ss]pec.js',
 './app/addons/**/*[Ss]pec.js',
-'./app/addons/**/*[Ss]pec.react.jsx'
+'./app/addons/**/*[Ss]pec.react.jsx',
+'./app/addons/**/*[Ss]pec.jsx'
   ])
 },
 template: 'test/test.config.underscore'

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/de9b12b3/app/addons/components/actions.js
--
diff --git a/app/addons/components/actions.js b/app/addons/components/actions.js
index a2b5855..c9618aa 100644
--- a/app/addons/components/actions.js
+++ b/app/addons/components/actions.js
@@ -69,7 +69,17 @@ function deleteDatabase (dbId) {
   });
 }
 
+function setBreadCrumbs (crumbs) {
+  FauxtonAPI.dispatch({
+type: ActionTypes.CMPNTS_BREADCRUMBS_SET_CRUMBS,
+options: {
+  crumbs: crumbs
+}
+  });
+}
+
 export default {
+  setBreadCrumbs: setBreadCrumbs,
   deleteDatabase: deleteDatabase,
   showDeleteDatabaseModal: showDeleteDatabaseModal,
   showAPIBarButton: showAPIBarButton,

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/de9b12b3/app/addons/components/actiontypes.js
--
diff --git a/app/addons/components/actiontypes.js 
b/app/addons/components/actiontypes.js
index e1ce518..2940c51 100644
--- a/app/addons/components/actiontypes.js
+++ b/app/addons/components/actiontypes.js
@@ -15,5 +15,6 @@ export default {
   CMPNTS_HIDE_API_BAR_BUTTON: 'CMPNTS_HIDE_API_BAR_BUTTON',
   CMPNTS_UPDATE_API_BAR: 'CMPNTS_UPDATE_API_BAR',
   CMPNTS_SET_API_BAR_CONTENT_VISIBLE_STATE: 
'CMPNTS_SET_API_BAR_CONTENT_VISIBLE_STATE',
-  CMPNTS_DATABASES_SHOWDELETE_MODAL: 'CMPNTS_DATABASES_SHOWDELETE_MODAL'
+  CMPNTS_DATABASES_SHOWDELETE_MODAL: 'CMPNTS_DATABASES_SHOWDELETE_MODAL',
+  CMPNTS_BREADCRUMBS_SET_CRUMBS: 'CMPNTS_BREADCRUMBS_SET_CRUMBS'
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/de9b12b3/app/addons/components/assets/less/components.less
--
diff --git a/app/addons/components/assets/less/components.less 
b/app/addons/components/assets/less/components.less
index 0600d39..ac57783 100644
--- a/app/addons/components/assets/less/components.less
+++ b/app/addons/components/assets/less/components.less
@@ -22,3 +22,4 @@
 @import "modals.less";
 @import "tab-element.less";
 @import "left-header.less";
+@import "header-breadcrumbs.less";

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/de9b12b3/app/addons/components/assets/less/header-

[7/7] fauxton commit: updated refs/heads/master to 73521f1

2016-07-04 Thread robertkowalski
Breadcrumbs React port: remove unused classname

PR: #732
PR-URL: https://github.com/apache/couchdb-fauxton/pull/732
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/42259fd3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/42259fd3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/42259fd3

Branch: refs/heads/master
Commit: 42259fd30a5722b5e5dde2191bc585cad2e1938c
Parents: 50e08c8
Author: Robert Kowalski 
Authored: Wed Jun 22 15:55:23 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jul 4 15:25:28 2016 +0200

--
 app/templates/layouts/with_tabs_sidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/42259fd3/app/templates/layouts/with_tabs_sidebar.html
--
diff --git a/app/templates/layouts/with_tabs_sidebar.html 
b/app/templates/layouts/with_tabs_sidebar.html
index e90d4a5..60c3298 100644
--- a/app/templates/layouts/with_tabs_sidebar.html
+++ b/app/templates/layouts/with_tabs_sidebar.html
@@ -15,7 +15,7 @@ the License.
 
   
 
-  
+  
   
 
 



[2/7] fauxton commit: updated refs/heads/master to 73521f1

2016-07-04 Thread robertkowalski
Breadcrumbs React port: fix & delete broken tests

 - fixes race conditions in tests where the global singleton
   `FauxtonAPI` was monkey patched later in other modules, but
   `fauxton/base.js` wasn't loaded
- deletes tests that messed with references / monkey patching and
   did not add much value
 - fixes a few restore calls

PR: #732
PR-URL: https://github.com/apache/couchdb-fauxton/pull/732
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/db95bb3c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/db95bb3c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/db95bb3c

Branch: refs/heads/master
Commit: db95bb3c7a9bbbeacfa1097bd200cd48a2ba
Parents: 42259fd
Author: Robert Kowalski 
Authored: Thu Jun 23 16:55:14 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jul 4 15:25:28 2016 +0200

--
 app/addons/cors/tests/actionsSpecs.js   |  11 +-
 app/addons/databases/tests/actionsSpec.js   | 249 ---
 .../documents/doc-editor/components.react.jsx   |   5 +-
 app/addons/documents/resources.js   |  20 +-
 app/addons/fauxton/base.js  |  26 --
 app/core/base.js|  25 +-
 6 files changed, 54 insertions(+), 282 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/db95bb3c/app/addons/cors/tests/actionsSpecs.js
--
diff --git a/app/addons/cors/tests/actionsSpecs.js 
b/app/addons/cors/tests/actionsSpecs.js
index 9b4fb7a..6778982 100644
--- a/app/addons/cors/tests/actionsSpecs.js
+++ b/app/addons/cors/tests/actionsSpecs.js
@@ -14,14 +14,19 @@ import testUtils from "testUtils";
 import FauxtonAPI from "../../../core/api";
 import Actions from "../actions";
 import sinon from "sinon";
-var assert = testUtils.assert;
+
+const assert = testUtils.assert;
+const restore = testUtils.restore;
 
 describe('CORS actions', function () {
 
   describe('save', function () {
 
 afterEach(function () {
-  Actions.saveCorsOrigins.restore && Actions.saveCorsOrigins.restore();
+  restore(Actions.saveCorsOrigins);
+
+  restore(FauxtonAPI.when);
+  restore(FauxtonAPI.addNotification);
 });
 
 it('should save cors enabled to httpd', function () {
@@ -103,8 +108,6 @@ describe('CORS actions', function () {
   });
 
   assert.ok(spy.calledOnce);
-  FauxtonAPI.when.restore();
-  FauxtonAPI.addNotification.restore();
 });
 
   });

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/db95bb3c/app/addons/databases/tests/actionsSpec.js
--
diff --git a/app/addons/databases/tests/actionsSpec.js 
b/app/addons/databases/tests/actionsSpec.js
deleted file mode 100644
index 3dbe0c2..000
--- a/app/addons/databases/tests/actionsSpec.js
+++ /dev/null
@@ -1,249 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy 
of
-// the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations 
under
-// the License.
-
-import app from "../../../app";
-import FauxtonAPI from "../../../core/api";
-import utils from "../../../../test/mocha/testUtils";
-import Base from "../base";
-import Stores from "../stores";
-import Actions from "../actions";
-import ActionTypes from "../actiontypes";
-import Resources from "../resources";
-import "../../documents/base";
-
-var assert = utils.assert;
-
-describe('Databases Actions', function () {
-
-  describe('Initialization', function () {
-
-var oldDispatch, oldWhen, oldGetParams;
-var dispatchEvents, thenCallback, alwaysCallback;
-var databasesMock;
-
-beforeEach(function () {
-  oldDispatch = FauxtonAPI.dispatch;
-  dispatchEvents = [];
-  FauxtonAPI.dispatch = function (what) {
-dispatchEvents.push(what);
-  };
-  oldWhen = FauxtonAPI.when;
-  FauxtonAPI.when = function () {
-return {
-  then: function (callback) {
-thenCallback = callback;
-callback();
-  },
-  always: function (callback) {
-alwaysCallback = callback;
-callback();
-  }
-};
-  };
-  // (replace on demand)
-  oldGetParams = app.getParams;
-  databasesMock = {
-fetch: function () {
-}

[4/7] fauxton commit: updated refs/heads/master to 73521f1

2016-07-04 Thread robertkowalski
Breadcrumbs React port: cleanup

Clean up un-needed, not used link properties. They would link in
a breadcrumb system which supports links.

PR: #732
PR-URL: https://github.com/apache/couchdb-fauxton/pull/732
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9c13fd47
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9c13fd47
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9c13fd47

Branch: refs/heads/master
Commit: 9c13fd47607cc0db3ccb3ae54e1e5a3855d99a43
Parents: 5be2610
Author: Robert Kowalski 
Authored: Tue Jun 21 11:52:18 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jul 4 15:25:28 2016 +0200

--
 app/addons/activetasks/routes.js  | 2 +-
 app/addons/auth/routes.js | 6 +++---
 app/addons/cluster/routes.js  | 2 +-
 app/addons/components/base.js | 3 ++-
 app/addons/config/routes.js   | 4 ++--
 app/addons/databases/routes.js| 2 +-
 app/addons/documentation/routes.js| 2 +-
 app/addons/documents/routes-doc-editor.js | 6 +++---
 app/addons/documents/shared-routes.js | 5 +
 app/addons/permissions/routes.js  | 2 +-
 app/addons/replication/route.js   | 2 +-
 app/addons/setup/route.js | 2 +-
 app/addons/verifyinstall/routes.js| 2 +-
 13 files changed, 19 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/activetasks/routes.js
--
diff --git a/app/addons/activetasks/routes.js b/app/addons/activetasks/routes.js
index 3aed827..cee53e3 100644
--- a/app/addons/activetasks/routes.js
+++ b/app/addons/activetasks/routes.js
@@ -25,7 +25,7 @@ var ActiveTasksRouteObject = FauxtonAPI.RouteObject.extend({
 'activetasks': 'showActiveTasks'
   },
   crumbs: [
-{'name': 'Active Tasks', 'link': 'activetasks'}
+{'name': 'Active Tasks'}
   ],
   apiUrl: function () {
 var apiurl = window.location.origin + '/_active_tasks';

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/auth/routes.js
--
diff --git a/app/addons/auth/routes.js b/app/addons/auth/routes.js
index 2ba3931..2e42f4b 100644
--- a/app/addons/auth/routes.js
+++ b/app/addons/auth/routes.js
@@ -35,7 +35,7 @@ var AuthRouteObject = FauxtonAPI.RouteObject.extend({
   },
 
   login: function () {
-this.crumbs = [{ name: 'Log In to CouchDB', link: "#" }];
+this.crumbs = [{ name: 'Log In to CouchDB' }];
 this.setComponent('#dashboard-content', Components.LoginForm, { urlBack: 
app.getParams().urlback });
   },
 
@@ -48,7 +48,7 @@ var AuthRouteObject = FauxtonAPI.RouteObject.extend({
 
   createAdminForNode: function () {
 ClusterActions.fetchNodes();
-this.crumbs = [{name: 'Create Admin', link: '#'}];
+this.crumbs = [{ name: 'Create Admin' }];
 this.setComponent('#dashboard-content', Components.CreateAdminForm, { 
loginAfter: true });
   }
 });
@@ -104,7 +104,7 @@ var UserRouteObject = FauxtonAPI.RouteObject.extend({
 this.setComponent('#dashboard-content', Components.CreateAdminForm, { 
loginAfter: false });
   },
 
-  crumbs: [{name: 'User Management', link: '#'}]
+  crumbs: [{name: 'User Management'}]
 });
 
 Auth.RouteObjects = [AuthRouteObject, UserRouteObject];

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/cluster/routes.js
--
diff --git a/app/addons/cluster/routes.js b/app/addons/cluster/routes.js
index 7287c5a..b741b65 100644
--- a/app/addons/cluster/routes.js
+++ b/app/addons/cluster/routes.js
@@ -25,7 +25,7 @@ var ConfigDisabledRouteObject = 
FauxtonAPI.RouteObject.extend({
   },
 
   crumbs: [
-{ name: 'Config disabled', link: '_config' }
+{ name: 'Config disabled' }
   ],
 
   apiUrl: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/components/base.js
--
diff --git a/app/addons/components/base.js b/app/addons/components/base.js
index 7fa290e..1f6481d 100644
--- a/app/addons/components/base.js
+++ b/app/addons/components/base.js
@@ -11,7 +11,8 @@
 // the License.
 
 import "./assets/less/components.less";
-var Components = {};
+
+const Components = {};
 Components.initialize = function () {};
 
 export default Components;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9c13fd47/app/addons/config/routes.js
--
diff --git a/app/addons/config/routes.js b/app/addons/config/routes.js
in

[3/5] fauxton commit: updated refs/heads/master to 5be2610

2016-06-28 Thread robertkowalski
add codemod to fix eslint's "space-in-parens"-rule

the codemod fixes the issues found by eslint

PR: #734
PR-URL: https://github.com/apache/couchdb-fauxton/pull/734
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/cb4ac3fc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/cb4ac3fc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/cb4ac3fc

Branch: refs/heads/master
Commit: cb4ac3fc8a8dc6209b0ac5b216e6251fba8c6741
Parents: 747b695
Author: Robert Kowalski 
Authored: Wed Jun 22 11:39:03 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Jun 28 16:46:01 2016 +0200

--
 codemods/space-in-parens.sh | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cb4ac3fc/codemods/space-in-parens.sh
--
diff --git a/codemods/space-in-parens.sh b/codemods/space-in-parens.sh
new file mode 100755
index 000..3c99287
--- /dev/null
+++ b/codemods/space-in-parens.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./node_modules/.bin/eslint --ext=.jsx,.js --fix . space-in-parens: ["error", 
"never"]



[1/5] fauxton commit: updated refs/heads/master to 5be2610

2016-06-28 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 968f714f2 -> 5be261085


linter: add space-in-parens-rule

PR: #734
PR-URL: https://github.com/apache/couchdb-fauxton/pull/734
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/747b695b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/747b695b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/747b695b

Branch: refs/heads/master
Commit: 747b695badb56540ba54024bbc75fed3f0dadbbc
Parents: ad2cbec
Author: Robert Kowalski 
Authored: Wed Jun 22 11:38:44 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Jun 28 16:45:08 2016 +0200

--
 .eslintrc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/747b695b/.eslintrc
--
diff --git a/.eslintrc b/.eslintrc
index c344a00..7cc98db 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -6,7 +6,7 @@
   ],
 
   "rules-todo": {
-"space-in-parens": 2,
+
 "space-unary-ops": 2,
 "camelcase": 2
   },
@@ -25,7 +25,8 @@
 "no-mixed-spaces-and-tabs": [2, "smart-tabs"],
 "no-trailing-spaces": 2,
 "semi-spacing": [2, {"before": false, "after": true}],
-"no-empty": 2
+"no-empty": 2,
+"space-in-parens": ["error", "never"]
   },
 
   "parserOptions": {



[5/5] fauxton commit: updated refs/heads/master to 5be2610

2016-06-28 Thread robertkowalski
move first codemod to codemods folder

PR: #734
PR-URL: https://github.com/apache/couchdb-fauxton/pull/734
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5be26108
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5be26108
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5be26108

Branch: refs/heads/master
Commit: 5be261085761c5f1d0510f2d28117775ea3e0da2
Parents: d70343d
Author: Robert Kowalski 
Authored: Mon Jun 27 17:07:21 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Jun 28 16:46:01 2016 +0200

--
 codemods/amd-to-es6-import.md | 9 +
 import.md | 9 -
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5be26108/codemods/amd-to-es6-import.md
--
diff --git a/codemods/amd-to-es6-import.md b/codemods/amd-to-es6-import.md
new file mode 100644
index 000..5cb447e
--- /dev/null
+++ b/codemods/amd-to-es6-import.md
@@ -0,0 +1,9 @@
+#From `define` to `import`
+
+To run the ast to change a file from using amd to es6 import follow these 
steps:
+
+* npm i -g jscodeshift
+* npm install 5to6-codemod
+* Replace `./node_modules/5to6-codemod/transforms/amd.js` with 
https://gist.github.com/robertkowalski/9167d45c0af6b9abdd4b51a09ef4e039
+* run `jscodeshift --extensions=js,jsx -t 
node_modules/5to6-codemod/transforms/amd.js app/file/name`
+* run git diff to check

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5be26108/import.md
--
diff --git a/import.md b/import.md
deleted file mode 100644
index 5cb447e..000
--- a/import.md
+++ /dev/null
@@ -1,9 +0,0 @@
-#From `define` to `import`
-
-To run the ast to change a file from using amd to es6 import follow these 
steps:
-
-* npm i -g jscodeshift
-* npm install 5to6-codemod
-* Replace `./node_modules/5to6-codemod/transforms/amd.js` with 
https://gist.github.com/robertkowalski/9167d45c0af6b9abdd4b51a09ef4e039
-* run `jscodeshift --extensions=js,jsx -t 
node_modules/5to6-codemod/transforms/amd.js app/file/name`
-* run git diff to check



[2/5] fauxton commit: updated refs/heads/master to 5be2610

2016-06-28 Thread robertkowalski
upgrade eslint @ 2.x

PR: #734
PR-URL: https://github.com/apache/couchdb-fauxton/pull/734
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ad2cbecf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ad2cbecf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ad2cbecf

Branch: refs/heads/master
Commit: ad2cbecf5c9de9d0a7f7bfdcd287cd98a25229df
Parents: 968f714
Author: Robert Kowalski 
Authored: Tue Jun 21 15:34:35 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Jun 28 16:45:08 2016 +0200

--
 .eslintrc| 19 +++
 package.json |  3 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ad2cbecf/.eslintrc
--
diff --git a/.eslintrc b/.eslintrc
index d94a612..c344a00 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,10 +1,9 @@
 {
   "root": true,
 
-  "ecmaFeatures": {
-"jsx": true,
-"modules": true
-  },
+  "plugins": [
+"react"
+  ],
 
   "rules-todo": {
 "space-in-parens": 2,
@@ -15,11 +14,8 @@
   "rules": {
 "semi": [2, "always"],
 "no-undef": 2,
-"space-after-keywords": 2,
-"space-before-keywords": 2,
-"space-before-function-paren": 2,
+"keyword-spacing": 2,
 "space-infix-ops": 2,
-"space-return-throw-case": 2,
 "space-before-blocks": 2,
 "array-bracket-spacing": [2, "never"],
 "brace-style": [2, "1tbs", { "allowSingleLine": true }],
@@ -32,6 +28,13 @@
 "no-empty": 2
   },
 
+  "parserOptions": {
+"sourceType": "module",
+"ecmaFeatures": {
+  "jsx": true
+}
+  },
+
   "env": {
 "browser": true,
 "node": true,

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ad2cbecf/package.json
--
diff --git a/package.json b/package.json
index 661f18f..1fba1e0 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,9 @@
 "couchapp": "~0.11.0",
 "css-loader": "^0.23.1",
 "d3": "^3.4.11",
-"eslint": "^1.6.0",
+"eslint": "^2.0.0",
 "eslint-loader": "^1.3.0",
+"eslint-plugin-react": "^5.2.2",
 "exports-loader": "^0.6.2",
 "expose-loader": "^0.7.1",
 "express": "^4.13.4",



[4/5] fauxton commit: updated refs/heads/master to 5be2610

2016-06-28 Thread robertkowalski
fix parenthesis spacing

PR: #734
PR-URL: https://github.com/apache/couchdb-fauxton/pull/734
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/d70343d6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/d70343d6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/d70343d6

Branch: refs/heads/master
Commit: d70343d637f32016d1b7168dd4d19a4f6406f55d
Parents: cb4ac3f
Author: Robert Kowalski 
Authored: Wed Jun 22 11:41:11 2016 +0200
Committer: Robert Kowalski 
Committed: Tue Jun 28 16:46:01 2016 +0200

--
 app/addons/cors/components.react.jsx  |  2 +-
 app/addons/documents/base.js  | 10 +-
 app/addons/documents/components/jumptodoc.react.jsx   |  2 +-
 app/addons/documents/index-results/stores.js  |  2 +-
 .../index-results/tests/index-results.storesSpec.js   |  2 +-
 app/addons/documents/shared-resources.js  |  2 +-
 app/addons/fauxton/components.react.jsx   |  2 +-
 app/addons/replication/base.js|  2 +-
 app/addons/verifyinstall/resources.js |  2 +-
 app/core/base.js  |  2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/d70343d6/app/addons/cors/components.react.jsx
--
diff --git a/app/addons/cors/components.react.jsx 
b/app/addons/cors/components.react.jsx
index 8cd42d2..8868997 100644
--- a/app/addons/cors/components.react.jsx
+++ b/app/addons/cors/components.react.jsx
@@ -265,7 +265,7 @@ var CORSController = React.createClass({
   },
 
   enableCorsChange: function () {
-if (this.state.corsEnabled && !_.isEmpty(this.state.origins) ) {
+if (this.state.corsEnabled && !_.isEmpty(this.state.origins)) {
   var result = window.confirm(app.i18n.en_US['cors-disable-cors-prompt']);
   if (!result) { return; }
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/d70343d6/app/addons/documents/base.js
--
diff --git a/app/addons/documents/base.js b/app/addons/documents/base.js
index f85c573..e2de385 100644
--- a/app/addons/documents/base.js
+++ b/app/addons/documents/base.js
@@ -22,7 +22,7 @@ function getQueryParam (query) {
   return query;
 }
 
-FauxtonAPI.registerUrls( 'allDocs', {
+FauxtonAPI.registerUrls('allDocs', {
   server: function (id, query) {
 return app.host + '/' + id + '/_all_docs' + getQueryParam(query);
   },
@@ -52,7 +52,7 @@ FauxtonAPI.registerUrls('revision-browser', {
   }
 });
 
-FauxtonAPI.registerUrls( 'designDocs', {
+FauxtonAPI.registerUrls('designDocs', {
   server: function (id, designDoc) {
 return app.host + '/' + id + '/' + designDoc + '/_info';
   },
@@ -66,7 +66,7 @@ FauxtonAPI.registerUrls( 'designDocs', {
   }
 });
 
-FauxtonAPI.registerUrls( 'view', {
+FauxtonAPI.registerUrls('view', {
   server: function (database, designDoc, viewName) {
 return app.host + '/' + database + '/_design/' + designDoc + '/_view/' + 
viewName;
   },
@@ -125,7 +125,7 @@ FauxtonAPI.registerUrls('document', {
   }
 });
 
-FauxtonAPI.registerUrls( 'new', {
+FauxtonAPI.registerUrls('new', {
   newDocument: function (database) {
 return '/database/' + database + '/new';
   },
@@ -139,7 +139,7 @@ FauxtonAPI.registerUrls( 'new', {
   }
 });
 
-FauxtonAPI.registerUrls( 'base', {
+FauxtonAPI.registerUrls('base', {
   server: function (database) {
 return app.host + '/' + database + '/';
   },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/d70343d6/app/addons/documents/components/jumptodoc.react.jsx
--
diff --git a/app/addons/documents/components/jumptodoc.react.jsx 
b/app/addons/documents/components/jumptodoc.react.jsx
index c40b697..c8398ea 100644
--- a/app/addons/documents/components/jumptodoc.react.jsx
+++ b/app/addons/documents/components/jumptodoc.react.jsx
@@ -26,7 +26,7 @@ const JumpToDoc = ({database, loadOptions}) => {
 loadOptions={loadOptions}
 clearable={false}
 onChange={({value: docId}) => {
-  const url = FauxtonAPI.urls('document', 'app', 
app.utils.safeURLName(database.id), app.utils.safeURLName(docId) );
+  const url = FauxtonAPI.urls('document', 'app', 
app.utils.safeURLName(database.id), app.utils.safeURLName(docId));
   // We navigating away from the page. So we need to take that 
navigation out of the loop otherwise
   // it causes an issue where the react-select state is changed after 
its unmounted
   setTimeout(() => Fauxt

[1/2] fauxton commit: updated refs/heads/master to 6583275

2016-06-27 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master c1fa250dd -> 6583275ad


provide debugging help for monkey patched established methods

inheritance is so ridiculous. inheritance in javascript is
just monkey patching. today i spent 8 hrs to finding a bug where
a promise failed silently in a monkey patched route object.

i found it by stringifying a function at runtime with
`console.log(this.establish.toString());` in the renderpipeline
which calls establish on the routeobjects.

the promise in the establish fails, the whole renderpipeline
fails silently and the breadcrumbs component is not rendered.

this commit will make finding those issues in the future a lot
easier

PR: #731
PR-URL: https://github.com/apache/couchdb-fauxton/pull/731
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6583275a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6583275a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6583275a

Branch: refs/heads/master
Commit: 6583275ad04bd83994c5f17e1e1f764cee5667bf
Parents: e8fbed0
Author: Robert Kowalski 
Authored: Fri Jun 17 19:43:49 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jun 27 11:52:13 2016 +0200

--
 app/core/routeObject.js | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6583275a/app/core/routeObject.js
--
diff --git a/app/core/routeObject.js b/app/core/routeObject.js
index 6d9060a..00a37a0 100644
--- a/app/core/routeObject.js
+++ b/app/core/routeObject.js
@@ -102,17 +102,27 @@ _.extend(RouteObject.prototype, Backbone.Events, {
 establishError = _.bind(this.establishError, this),
 renderComplete = _.bind(this.renderComplete, this),
 callEstablish = _.bind(this.callEstablish, this),
-renderReactComponents = _.bind(this.renderReactComponents, this),
-promise = this.establish();
+renderReactComponents = _.bind(this.renderReactComponents, this);
+
+const promise = this.establish();
 
 // Only start the view rendering process once the template has been 
rendered
 // otherwise we get double renders
 promiseLayout.then(function () {
   renderReactComponents();
+
   callEstablish(promise)
 .then(renderAllViews, establishError)
-.then(renderComplete);
-});
+.then(renderComplete, (err) => {
+  console.error('renderpipeline broke');
+  console.error('check your establish method');
+
+  console.log(this.establish.toString());
+  console.error(err);
+});
+
+
+}.bind(this));
   },
 
   setTemplateOnFullRender: function (masterLayout) {



[2/2] fauxton commit: updated refs/heads/master to 6583275

2016-06-27 Thread robertkowalski
fix comment

PR: #731
PR-URL: https://github.com/apache/couchdb-fauxton/pull/731
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/e8fbed04
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/e8fbed04
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/e8fbed04

Branch: refs/heads/master
Commit: e8fbed041619963a2b0c9b4cf08a9344c4291d63
Parents: c1fa250
Author: Robert Kowalski 
Authored: Fri Jun 17 19:43:40 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jun 27 11:52:13 2016 +0200

--
 app/core/routeObject.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e8fbed04/app/core/routeObject.js
--
diff --git a/app/core/routeObject.js b/app/core/routeObject.js
index 07552ed..6d9060a 100644
--- a/app/core/routeObject.js
+++ b/app/core/routeObject.js
@@ -54,7 +54,7 @@ RouteObject.on = function (eventName, fn) {
  Current Events to subscribe to:
   * beforeFullRender -- before a full render is being done
   * beforeEstablish -- before the routeobject calls establish
-  * AfterEstablish -- after the routeobject has run establish
+  * afterEstablish -- after the routeobject has run establish
   * beforeRender -- before a view is rendered
   * afterRender -- a view is finished being rendered
   * renderComplete -- all rendering is complete



[2/3] fauxton commit: updated refs/heads/master to c74ea9c

2016-06-13 Thread robertkowalski
add redirect option to router

PR: #728
PR-URL: https://github.com/apache/couchdb-fauxton/pull/728
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/6a442954
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/6a442954
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/6a442954

Branch: refs/heads/master
Commit: 6a442954118a3a29eb7c5d3279f52a863eeb9d30
Parents: 049d6ca
Author: Robert Kowalski 
Authored: Mon Jun 13 12:32:52 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jun 13 16:07:06 2016 +0200

--
 app/core/router.js | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/6a442954/app/core/router.js
--
diff --git a/app/core/router.js b/app/core/router.js
index 35cbc6d..9c242b9 100644
--- a/app/core/router.js
+++ b/app/core/router.js
@@ -27,18 +27,23 @@ export default Backbone.Router.extend({
 delete beforeUnloads[name];
   },
 
-  navigate: function (fragment, trigger) {
-var continueNav  = true,
-msg = _.find(_.map(beforeUnloads, function (fn) { return fn(); }), 
function (beforeReturn) {
-  if (beforeReturn) { return true; }
-});
+
+  navigate: function (fragment, options) {
+let continueNav = true;
+const msg = _.find(_.map(beforeUnloads, function (fn) { return fn(); }), 
function (beforeReturn) {
+  if (beforeReturn) { return true; }
+});
 
 if (msg) {
   continueNav = window.confirm(msg);
 }
 
+if (options && options.redirect) {
+  return window.location = fragment;
+}
+
 if (continueNav) {
-  Backbone.Router.prototype.navigate(fragment, trigger);
+  Backbone.Router.prototype.navigate(fragment, options);
 }
   },
 



[1/3] fauxton commit: updated refs/heads/master to c74ea9c

2016-06-13 Thread robertkowalski
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 39cba4997 -> c74ea9cc4


support disabled state in confirmbutton

PR: #728
PR-URL: https://github.com/apache/couchdb-fauxton/pull/728
Reviewed-By: garren smith 


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/c74ea9cc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/c74ea9cc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/c74ea9cc

Branch: refs/heads/master
Commit: c74ea9cc4b712e1ad103d8ce638ebfede3125c1e
Parents: 6a44295
Author: Robert Kowalski 
Authored: Fri Jun 10 11:59:17 2016 +0200
Committer: Robert Kowalski 
Committed: Mon Jun 13 16:07:06 2016 +0200

--
 app/addons/components/react-components.react.jsx | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c74ea9cc/app/addons/components/react-components.react.jsx
--
diff --git a/app/addons/components/react-components.react.jsx 
b/app/addons/components/react-components.react.jsx
index 34ec668..ee297d2 100644
--- a/app/addons/components/react-components.react.jsx
+++ b/app/addons/components/react-components.react.jsx
@@ -1108,7 +1108,7 @@ var LoadLines = React.createClass({
   }
 });
 
-var ConfirmButton = React.createClass({
+const ConfirmButton = React.createClass({
   propTypes: {
 showIcon: React.PropTypes.bool,
 id: React.PropTypes.string,
@@ -1116,11 +1116,13 @@ var ConfirmButton = React.createClass({
 style: React.PropTypes.object,
 buttonType: React.PropTypes.string,
 'data-id': React.PropTypes.string,
-onClick: React.PropTypes.func
+onClick: React.PropTypes.func,
+disabled: React.PropTypes.bool,
   },
 
   getDefaultProps: function () {
 return {
+  disabled: false,
   showIcon: true,
   customIcon: 'fonticon-ok-circled',
   buttonType: 'btn-success',
@@ -1140,11 +1142,12 @@ var ConfirmButton = React.createClass({
   },
 
   render: function () {
-const { onClick, buttonType, id, style, text } = this.props;
+const { onClick, buttonType, id, style, text, disabled } = this.props;
 return (
   

  1   2   3   4   5   6   7   8   9   10   >