diff options
author | Alexander Shorin <kxepal@apache.org> | 2013-10-26 05:42:15 +0400 |
---|---|---|
committer | Alexander Shorin <kxepal@apache.org> | 2013-10-26 05:42:15 +0400 |
commit | 9e5e3a59fdbf635bd2e283c656232c2dbb57897e (patch) | |
tree | fe7cde5a6d5cba0972b4ac9bb368488630537416 | |
parent | 408ce4478d6c3fbbf95633228138015cc7dc59b1 (diff) | |
download | couchdb-9e5e3a59fdbf635bd2e283c656232c2dbb57897e.tar.gz |
Fix Fauxton license bits: add missed headers, use explicit skip policy
-rw-r--r-- | license.skip | 28 | ||||
-rw-r--r-- | src/fauxton/app/addons/activetasks/assets/less/activetasks.less | 12 | ||||
-rw-r--r-- | src/fauxton/app/addons/auth/assets/less/auth.less | 11 | ||||
-rw-r--r-- | src/fauxton/app/addons/compaction/assets/less/compaction.less | 11 | ||||
-rw-r--r-- | src/fauxton/app/addons/permissions/assets/less/permissions.less | 12 | ||||
-rw-r--r-- | src/fauxton/app/addons/stats/assets/less/stats.less | 23 | ||||
-rw-r--r-- | src/fauxton/app/addons/verifyinstall/assets/less/verifyinstall.less | 23 | ||||
-rw-r--r-- | src/fauxton/app/app.js | 12 | ||||
-rw-r--r-- | src/fauxton/app/config.js | 12 | ||||
-rw-r--r-- | src/fauxton/app/main.js | 12 | ||||
-rw-r--r-- | src/fauxton/app/modules/pouchdb/base.js | 13 | ||||
-rw-r--r-- | src/fauxton/assets/less/icons.less | 12 | ||||
-rw-r--r-- | src/fauxton/couchapp.js | 12 | ||||
-rw-r--r-- | src/fauxton/test/runner.html | 15 |
14 files changed, 161 insertions, 47 deletions
diff --git a/license.skip b/license.skip index 3321a6d7b..a20ab0074 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/*/* diff --git a/src/fauxton/app/addons/activetasks/assets/less/activetasks.less b/src/fauxton/app/addons/activetasks/assets/less/activetasks.less index 695799d8c..743917d2e 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; } diff --git a/src/fauxton/app/addons/auth/assets/less/auth.less b/src/fauxton/app/addons/auth/assets/less/auth.less index cbab983e0..598da1047 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; diff --git a/src/fauxton/app/addons/compaction/assets/less/compaction.less b/src/fauxton/app/addons/compaction/assets/less/compaction.less index c197d9a16..70b034b1d 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; diff --git a/src/fauxton/app/addons/permissions/assets/less/permissions.less b/src/fauxton/app/addons/permissions/assets/less/permissions.less index 5f5a0db8d..7ce4d10b9 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; diff --git a/src/fauxton/app/addons/stats/assets/less/stats.less b/src/fauxton/app/addons/stats/assets/less/stats.less index 8c81f86f2..cfa7679dd 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; diff --git a/src/fauxton/app/addons/verifyinstall/assets/less/verifyinstall.less b/src/fauxton/app/addons/verifyinstall/assets/less/verifyinstall.less index 8a116df71..e084cb388 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; diff --git a/src/fauxton/app/app.js b/src/fauxton/app/app.js index 77c1b7083..ac3c0c449 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", diff --git a/src/fauxton/app/config.js b/src/fauxton/app/config.js index cbbcb4d4b..4edeba056 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({ diff --git a/src/fauxton/app/main.js b/src/fauxton/app/main.js index fba4f6e86..2182f2c5a 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", diff --git a/src/fauxton/app/modules/pouchdb/base.js b/src/fauxton/app/modules/pouchdb/base.js index ddaf06d5c..ee323a766 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 diff --git a/src/fauxton/assets/less/icons.less b/src/fauxton/assets/less/icons.less index b6e01a6a4..cf0593c54 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"; diff --git a/src/fauxton/couchapp.js b/src/fauxton/couchapp.js index 63ea29703..fec8dd3ab 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; diff --git a/src/fauxton/test/runner.html b/src/fauxton/test/runner.html index b27fdda66..2eeb27f0e 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"> |