You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2013/10/26 03:42:50 UTC
[1/2] git commit: updated refs/heads/master to 9e5e3a5
Updated Branches:
refs/heads/master 22d40270b -> 9e5e3a59f
Fix /_session section title
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/408ce447
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/408ce447
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/408ce447
Branch: refs/heads/master
Commit: 408ce4478d6c3fbbf95633228138015cc7dc59b1
Parents: 22d4027
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 26 05:31:39 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Oct 26 05:31:39 2013 +0400
----------------------------------------------------------------------
share/doc/src/api/server/authn.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/408ce447/share/doc/src/api/server/authn.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/api/server/authn.rst b/share/doc/src/api/server/authn.rst
index 98d6f62..2495e1e 100644
--- a/share/doc/src/api/server/authn.rst
+++ b/share/doc/src/api/server/authn.rst
@@ -85,7 +85,7 @@ To obtain the first token and thus authenticate a user for the first time, the
.. _api/auth/session:
``/_session``
-------------
+-------------
.. http:post:: /_session
[2/2] git commit: updated refs/heads/master to 9e5e3a5
Posted by kx...@apache.org.
Fix Fauxton license bits: add missed headers, use explicit skip policy
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9e5e3a59
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9e5e3a59
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9e5e3a59
Branch: refs/heads/master
Commit: 9e5e3a59fdbf635bd2e283c656232c2dbb57897e
Parents: 408ce44
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 26 05:42:15 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Oct 26 05:42:15 2013 +0400
----------------------------------------------------------------------
license.skip | 28 +++++++++++++-------
.../activetasks/assets/less/activetasks.less | 12 +++++++++
.../app/addons/auth/assets/less/auth.less | 11 ++++++++
.../compaction/assets/less/compaction.less | 11 ++++++++
.../permissions/assets/less/permissions.less | 12 +++++++++
.../app/addons/stats/assets/less/stats.less | 23 ++++++++--------
.../assets/less/verifyinstall.less | 23 ++++++++--------
src/fauxton/app/app.js | 12 +++++++++
src/fauxton/app/config.js | 12 +++++++++
src/fauxton/app/main.js | 12 +++++++++
src/fauxton/app/modules/pouchdb/base.js | 13 ---------
src/fauxton/assets/less/icons.less | 12 +++++++++
src/fauxton/couchapp.js | 12 +++++++++
src/fauxton/test/runner.html | 15 +++++++++++
14 files changed, 161 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 3321a6d..a20ab00 100644
--- a/license.skip
+++ b/license.skip
@@ -118,23 +118,31 @@
^src/couch_dbupdates
^src/ejson/.*
^src/etap/.*
-^src/fauxton/app/app.js
-^src/fauxton/app/config.js
-^src/fauxton/app/main.js
-^src/fauxton/app/modules/pouchdb/*
-^src/fauxton/assets/.*
-^src/fauxton/couchapp.js
+^src/fauxton/app/modules/pouchdb/base.js
+^src/fauxton/app/modules/pouchdb/pouch.collate.js
+^src/fauxton/app/modules/pouchdb/pouchdb.mapreduce.js
+^src/fauxton/assets/css/codemirror.css
+^src/fauxton/assets/css/nv.d3.css
+^src/fauxton/assets/img/.*
+^src/fauxton/assets/js/libs/.*.js
+^src/fauxton/assets/js/plugins/.*.js
+^src/fauxton/assets/less/bootstrap/.*.less
+^src/fauxton/assets/less/bootstrap/tests/css-tests.css
+^src/fauxton/assets/less/bootstrap/tests/buttons.html
^src/fauxton/favicon.ico
^src/fauxton/package.json
+^src/fauxton/extensions.md
^src/fauxton/readme.md
^src/fauxton/writing_addons.md
^src/fauxton/TODO.md
^src/fauxton/settings.json.*
-^src/fauxton/test/.*
+^src/fauxton/test/test.config.underscore
+^src/fauxton/test/mocha/chai.js
+^src/fauxton/test/mocha/mocha.css
+^src/fauxton/test/mocha/mocha.js
+^src/fauxton/test/mocha/sinon.js
+^src/fauxton/test/mocha/sinon-chai.js
^src/fauxton/tasks/addon/rename.json
-^src/fauxton/app/addons/activetasks/assets/less/activetasks.less
-^src/fauxton/app/addons/auth/assets/less/auth.less
-^src/fauxton/app/addons/permissions/assets/less/permissions.less
^src/ibrowse/.*
^src/mochiweb/.*
^src/my-first-couchdb-plugin/priv/*/*
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/addons/activetasks/assets/less/activetasks.less
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/activetasks/assets/less/activetasks.less b/src/fauxton/app/addons/activetasks/assets/less/activetasks.less
index 695799d..743917d 100644
--- a/src/fauxton/app/addons/activetasks/assets/less/activetasks.less
+++ b/src/fauxton/app/addons/activetasks/assets/less/activetasks.less
@@ -1,3 +1,15 @@
+// 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.
+
.task-tabs li {
cursor: pointer;
}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/addons/auth/assets/less/auth.less
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/auth/assets/less/auth.less b/src/fauxton/app/addons/auth/assets/less/auth.less
index cbab983..598da10 100644
--- a/src/fauxton/app/addons/auth/assets/less/auth.less
+++ b/src/fauxton/app/addons/auth/assets/less/auth.less
@@ -1,3 +1,14 @@
+// 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.
.menuDropdown {
display: none;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/addons/compaction/assets/less/compaction.less
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/compaction/assets/less/compaction.less b/src/fauxton/app/addons/compaction/assets/less/compaction.less
index c197d9a..70b034b 100644
--- a/src/fauxton/app/addons/compaction/assets/less/compaction.less
+++ b/src/fauxton/app/addons/compaction/assets/less/compaction.less
@@ -1,3 +1,14 @@
+// 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.
.compaction-option {
background-color: #F7F7F7;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/addons/permissions/assets/less/permissions.less
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/permissions/assets/less/permissions.less b/src/fauxton/app/addons/permissions/assets/less/permissions.less
index 5f5a0db..7ce4d10 100644
--- a/src/fauxton/app/addons/permissions/assets/less/permissions.less
+++ b/src/fauxton/app/addons/permissions/assets/less/permissions.less
@@ -1,3 +1,15 @@
+// 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.
+
.border-hdr {
border-bottom: 1px solid #E3E3E3;
margin-bottom: 10px;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/addons/stats/assets/less/stats.less
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/stats/assets/less/stats.less b/src/fauxton/app/addons/stats/assets/less/stats.less
index 8c81f86..cfa7679 100644
--- a/src/fauxton/app/addons/stats/assets/less/stats.less
+++ b/src/fauxton/app/addons/stats/assets/less/stats.less
@@ -1,15 +1,14 @@
-/* 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.
.datatypes {
border: #d3d3d3 1px solid;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/addons/verifyinstall/assets/less/verifyinstall.less
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/verifyinstall/assets/less/verifyinstall.less b/src/fauxton/app/addons/verifyinstall/assets/less/verifyinstall.less
index 8a116df..e084cb3 100644
--- a/src/fauxton/app/addons/verifyinstall/assets/less/verifyinstall.less
+++ b/src/fauxton/app/addons/verifyinstall/assets/less/verifyinstall.less
@@ -1,15 +1,14 @@
-/* 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.
#start {
margin-bottom: 20px;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/app.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/app.js b/src/fauxton/app/app.js
index 77c1b70..ac3c0c4 100644
--- a/src/fauxton/app/app.js
+++ b/src/fauxton/app/app.js
@@ -1,3 +1,15 @@
+// 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.
+
define([
// Libraries.
"jquery",
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/config.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/config.js b/src/fauxton/app/config.js
index cbbcb4d..4edeba0 100644
--- a/src/fauxton/app/config.js
+++ b/src/fauxton/app/config.js
@@ -1,3 +1,15 @@
+// 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.
+
// Set the require.js configuration for your application.
require.config({
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/main.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/main.js b/src/fauxton/app/main.js
index fba4f6e..2182f2c 100644
--- a/src/fauxton/app/main.js
+++ b/src/fauxton/app/main.js
@@ -1,3 +1,15 @@
+// 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.
+
require([
// Application.
"app",
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/app/modules/pouchdb/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/pouchdb/base.js b/src/fauxton/app/modules/pouchdb/base.js
index ddaf06d..ee323a7 100644
--- a/src/fauxton/app/modules/pouchdb/base.js
+++ b/src/fauxton/app/modules/pouchdb/base.js
@@ -1,16 +1,3 @@
-// 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.
-
-
/*
* NOTE:
* This temporarily uses the PouchDB map reduce implementation
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/assets/less/icons.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/icons.less b/src/fauxton/assets/less/icons.less
index b6e01a6..cf0593c 100644
--- a/src/fauxton/assets/less/icons.less
+++ b/src/fauxton/assets/less/icons.less
@@ -1,3 +1,15 @@
+/* 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.
+ */
@font-face {
font-family: "fauxtonicon";
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/couchapp.js
----------------------------------------------------------------------
diff --git a/src/fauxton/couchapp.js b/src/fauxton/couchapp.js
index 63ea297..fec8dd3 100644
--- a/src/fauxton/couchapp.js
+++ b/src/fauxton/couchapp.js
@@ -1,3 +1,15 @@
+// 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 couchapp = require('couchapp'),
path = require('path'),
ddoc;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e5e3a59/src/fauxton/test/runner.html
----------------------------------------------------------------------
diff --git a/src/fauxton/test/runner.html b/src/fauxton/test/runner.html
index b27fdda..2eeb27f 100644
--- a/src/fauxton/test/runner.html
+++ b/src/fauxton/test/runner.html
@@ -1,3 +1,18 @@
+<!DOCTYPE html>
+<!--
+
+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.
+
+-->
<html>
<head>
<meta charset="utf-8">