From 4555e251e5313c7ec7d308f4a2db5b378bfc9406 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Fri, 10 Aug 2018 12:22:08 +0200 Subject: [PATCH 1/4] Remove "coding: utf-8" line in conf.py: not needed in Python 3 files --- docs/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 31edb2c..79bbeb9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- # # BigchainDB Javascript Driver documentation build configuration file, created by # sphinx-quickstart on Wed Aug 2 15:39:03 2017. From 27509dcb89d3335c914ea6f4eee9b5a8e4f88377 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Fri, 10 Aug 2018 12:28:17 +0200 Subject: [PATCH 2/4] Add LICENSE-docs file, and reference it in README.md --- LICENSE-docs | 1 + README.md | 19 +++---------------- 2 files changed, 4 insertions(+), 16 deletions(-) create mode 100644 LICENSE-docs diff --git a/LICENSE-docs b/LICENSE-docs new file mode 100644 index 0000000..b19b0b8 --- /dev/null +++ b/LICENSE-docs @@ -0,0 +1 @@ +The official BigchainDB documentation, _except for the short code snippets embedded within it_, is licensed under a Creative Commons Attribution-ShareAlike 4.0 International license, the full text of which can be found at [http://creativecommons.org/licenses/by-sa/4.0/legalcode](http://creativecommons.org/licenses/by-sa/4.0/legalcode). \ No newline at end of file diff --git a/README.md b/README.md index 2737839..0dfb030 100644 --- a/README.md +++ b/README.md @@ -183,21 +183,8 @@ npm run doc * inspired by [`js-bigchaindb-quickstart`](https://github.com/sohkai/js-bigchaindb-quickstart) of @sohkhai [thanks] * BigchainDB +* BigchainDB contributors -## License +## Licenses -``` -Copyright 2017 BigchainDB GmbH - -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. -``` +See [LICENSE](LICENSE) and [LICENSE-docs](LICENSE-docs). From 54dfcf637f02596ab4d2cf300269a7d28aea3017 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Fri, 10 Aug 2018 12:49:26 +0200 Subject: [PATCH 3/4] Add SPDX license info strings to all source files --- .ci/travis-before-install.sh | 4 ++++ .ci/travis-before-script.sh | 4 ++++ .ci/travis-install.sh | 4 ++++ .travis.yml | 4 ++++ API.md | 6 ++++++ CODE_OF_CONDUCT.md | 6 ++++++ CONTRIBUTING.rst | 5 +++++ README.md | 6 ++++++ docker-compose.yml | 4 ++++ docs/README.md | 6 ++++++ docs/source/advanced.rst | 5 +++++ docs/source/conf.py | 4 ++++ docs/source/index.rst | 5 +++++ docs/source/quickstart.rst | 5 +++++ docs/source/readme.rst | 5 +++++ docs/source/usage.rst | 5 +++++ docs/upgrade-guides/0.3.0.md | 6 ++++++ examples/README.md | 6 ++++++ examples/src/basic-usage-async-await.js | 4 ++++ examples/src/basic-usage.js | 4 ++++ examples/src/query-assets.js | 4 ++++ examples/src/seed-func.js | 4 ++++ plugins/add-vendors-plugin.js | 4 ++++ src/Ed25519Keypair.js | 4 ++++ src/baseRequest.js | 4 ++++ src/connection.js | 4 ++++ src/format_text.js | 4 ++++ src/index.js | 4 ++++ src/request.js | 4 ++++ src/sanitize.js | 4 ++++ src/sha256Hash.js | 4 ++++ src/stringify_as_query_param.js | 4 ++++ src/transaction.js | 4 ++++ src/utils/ccJsonLoad.js | 4 ++++ src/utils/ccJsonify.js | 4 ++++ test/base-request/test_baseRequest.js | 4 ++++ test/connection/test_connection.js | 4 ++++ test/constants.js | 4 ++++ test/integration/test_integration.js | 4 ++++ test/sanitize/test_sanitize.js | 4 ++++ test/text-format/test_format_text.js | 4 ++++ test/transaction/test_cryptoconditions.js | 4 ++++ test/transaction/test_transaction.js | 4 ++++ webpack.common.js | 4 ++++ webpack.config.js | 4 ++++ webpack.development.js | 4 ++++ webpack.parts.js | 4 ++++ webpack.production.js | 4 ++++ 48 files changed, 210 insertions(+) diff --git a/.ci/travis-before-install.sh b/.ci/travis-before-install.sh index 49b639f..8a49747 100755 --- a/.ci/travis-before-install.sh +++ b/.ci/travis-before-install.sh @@ -1,4 +1,8 @@ #!/bin/bash +# Copyright BigchainDB GmbH and BigchainDB contributors +# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +# Code is Apache-2.0 and docs are CC-BY-4.0 + sudo apt-get update sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce diff --git a/.ci/travis-before-script.sh b/.ci/travis-before-script.sh index 35094dd..d1b3920 100755 --- a/.ci/travis-before-script.sh +++ b/.ci/travis-before-script.sh @@ -1,4 +1,8 @@ #!/bin/bash +# Copyright BigchainDB GmbH and BigchainDB contributors +# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +# Code is Apache-2.0 and docs are CC-BY-4.0 + set -e -x diff --git a/.ci/travis-install.sh b/.ci/travis-install.sh index 32165a8..de89abc 100755 --- a/.ci/travis-install.sh +++ b/.ci/travis-install.sh @@ -1,4 +1,8 @@ #!/bin/bash +# Copyright BigchainDB GmbH and BigchainDB contributors +# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +# Code is Apache-2.0 and docs are CC-BY-4.0 + set -e -x diff --git a/.travis.yml b/.travis.yml index edffa8c..033c0d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +# Copyright BigchainDB GmbH and BigchainDB contributors +# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +# Code is Apache-2.0 and docs are CC-BY-4.0 + sudo: required services: diff --git a/API.md b/API.md index f585057..64b7dc0 100644 --- a/API.md +++ b/API.md @@ -1,3 +1,9 @@ + + ### Table of Contents diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 49e8150..8118864 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,9 @@ + + # Contributor Code of Conduct ## Our Pledge diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 6eb6ab0..1d7668e 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,3 +1,8 @@ + +.. Copyright BigchainDB GmbH and BigchainDB contributors + SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) + Code is Apache-2.0 and docs are CC-BY-4.0 + .. highlight:: shell ============ diff --git a/README.md b/README.md index 0dfb030..ab58b4e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + # [![js-bigchaindb-driver](media/repo-banner@2x.png)](https://www.bigchaindb.com) > Official JavaScript driver for [BigchainDB](https://github.com/bigchaindb/bigchaindb) to create transactions in Node.js and the browser. diff --git a/docker-compose.yml b/docker-compose.yml index 7b9a563..eb6136b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,7 @@ +# Copyright BigchainDB GmbH and BigchainDB contributors +# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +# Code is Apache-2.0 and docs are CC-BY-4.0 + version: '2.1' services: diff --git a/docs/README.md b/docs/README.md index 7709702..8d1657e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,2 +1,8 @@ + + # BigchainDBJavaScriptDriverDocs BigchainDB JavaScript Driver Documentation with Sphinx diff --git a/docs/source/advanced.rst b/docs/source/advanced.rst index 7dd131d..839cbdf 100644 --- a/docs/source/advanced.rst +++ b/docs/source/advanced.rst @@ -1,3 +1,8 @@ + +.. Copyright BigchainDB GmbH and BigchainDB contributors + SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) + Code is Apache-2.0 and docs are CC-BY-4.0 + ================= Advanced Examples ================= diff --git a/docs/source/conf.py b/docs/source/conf.py index 79bbeb9..b72381c 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,4 +1,8 @@ #!/usr/bin/env python3 +# Copyright BigchainDB GmbH and BigchainDB contributors +# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +# Code is Apache-2.0 and docs are CC-BY-4.0 + # # BigchainDB Javascript Driver documentation build configuration file, created by # sphinx-quickstart on Wed Aug 2 15:39:03 2017. diff --git a/docs/source/index.rst b/docs/source/index.rst index 001a047..ee7e770 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -1,3 +1,8 @@ + +.. Copyright BigchainDB GmbH and BigchainDB contributors + SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) + Code is Apache-2.0 and docs are CC-BY-4.0 + BigchainDB Javascript Driver Documentation ========================================== diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst index 19d0fb4..9aa5fd6 100644 --- a/docs/source/quickstart.rst +++ b/docs/source/quickstart.rst @@ -1,3 +1,8 @@ + +.. Copyright BigchainDB GmbH and BigchainDB contributors + SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) + Code is Apache-2.0 and docs are CC-BY-4.0 + ========================= Quickstart / Installation ========================= diff --git a/docs/source/readme.rst b/docs/source/readme.rst index 0ea5a81..5396c88 100644 --- a/docs/source/readme.rst +++ b/docs/source/readme.rst @@ -1,3 +1,8 @@ + +.. Copyright BigchainDB GmbH and BigchainDB contributors + SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) + Code is Apache-2.0 and docs are CC-BY-4.0 + BigchainDB JavaScript Driver ============================ diff --git a/docs/source/usage.rst b/docs/source/usage.rst index 3b28dce..1d119b1 100644 --- a/docs/source/usage.rst +++ b/docs/source/usage.rst @@ -1,3 +1,8 @@ + +.. Copyright BigchainDB GmbH and BigchainDB contributors + SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) + Code is Apache-2.0 and docs are CC-BY-4.0 + ==================== Basic Usage Examples ==================== diff --git a/docs/upgrade-guides/0.3.0.md b/docs/upgrade-guides/0.3.0.md index f4d4fd2..7714045 100644 --- a/docs/upgrade-guides/0.3.0.md +++ b/docs/upgrade-guides/0.3.0.md @@ -1,3 +1,9 @@ + + # Updating js-bigchaindb-driver from v0.1.x to v0.3.0 The latest version of js-bigchaindb-driver contains breaking changes to its diff --git a/examples/README.md b/examples/README.md index 45c7fa1..dee4ee3 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,3 +1,9 @@ + + # Quick Notes `dotenv` is listed as a dependencies in `package.json`. If you want to use this, add a `.env` file to the root of this project (same level as this `README.md` file) diff --git a/examples/src/basic-usage-async-await.js b/examples/src/basic-usage-async-await.js index 9414985..719598a 100644 --- a/examples/src/basic-usage-async-await.js +++ b/examples/src/basic-usage-async-await.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable import/no-unresolved */ const driver = require('bigchaindb-driver') diff --git a/examples/src/basic-usage.js b/examples/src/basic-usage.js index fe66e28..bad44ee 100644 --- a/examples/src/basic-usage.js +++ b/examples/src/basic-usage.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable import/no-unresolved */ const driver = require('bigchaindb-driver') diff --git a/examples/src/query-assets.js b/examples/src/query-assets.js index c4829e0..8f11692 100644 --- a/examples/src/query-assets.js +++ b/examples/src/query-assets.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable import/no-unresolved */ const driver = require('bigchaindb-driver') diff --git a/examples/src/seed-func.js b/examples/src/seed-func.js index 21540ec..d201678 100644 --- a/examples/src/seed-func.js +++ b/examples/src/seed-func.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable import/no-unresolved */ import bip39 from 'bip39' diff --git a/plugins/add-vendors-plugin.js b/plugins/add-vendors-plugin.js index be75bcd..76e4a09 100644 --- a/plugins/add-vendors-plugin.js +++ b/plugins/add-vendors-plugin.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + const { ConcatSource } = require('webpack-sources') module.exports = class AddVendorsPlugin { diff --git a/src/Ed25519Keypair.js b/src/Ed25519Keypair.js index 4de118d..8c8b9b0 100644 --- a/src/Ed25519Keypair.js +++ b/src/Ed25519Keypair.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import base58 from 'bs58' import nacl from 'tweetnacl' diff --git a/src/baseRequest.js b/src/baseRequest.js index 6825630..3b97b05 100644 --- a/src/baseRequest.js +++ b/src/baseRequest.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import { Promise } from 'es6-promise' import fetchPonyfill from 'fetch-ponyfill' import { vsprintf } from 'sprintf-js' diff --git a/src/connection.js b/src/connection.js index 0f9a2ef..4b2641b 100644 --- a/src/connection.js +++ b/src/connection.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import request from './request' const HEADER_BLACKLIST = ['content-type'] diff --git a/src/format_text.js b/src/format_text.js index b24203c..c8077ff 100644 --- a/src/format_text.js +++ b/src/format_text.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import { sprintf } from 'sprintf-js' diff --git a/src/index.js b/src/index.js index bbc98ee..5723214 100644 --- a/src/index.js +++ b/src/index.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + export Ed25519Keypair from './Ed25519Keypair' export Connection from './connection' diff --git a/src/request.js b/src/request.js index 1e45574..66ebd58 100644 --- a/src/request.js +++ b/src/request.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import baseRequest from './baseRequest' import sanitize from './sanitize' diff --git a/src/sanitize.js b/src/sanitize.js index 8fecfcc..3400472 100644 --- a/src/sanitize.js +++ b/src/sanitize.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import coreIncludes from 'core-js/library/fn/array/includes' import coreObjectEntries from 'core-js/library/fn/object/entries' diff --git a/src/sha256Hash.js b/src/sha256Hash.js index b8199f1..c97f9ec 100644 --- a/src/sha256Hash.js +++ b/src/sha256Hash.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import sha3 from 'js-sha3' export default function sha256Hash(data) { diff --git a/src/stringify_as_query_param.js b/src/stringify_as_query_param.js index 714fb48..8045fd6 100644 --- a/src/stringify_as_query_param.js +++ b/src/stringify_as_query_param.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import coreObjectEntries from 'core-js/library/fn/object/entries' import decamelize from 'decamelize' import queryString from 'query-string' diff --git a/src/transaction.js b/src/transaction.js index 494898a..f28f70a 100644 --- a/src/transaction.js +++ b/src/transaction.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import { Buffer } from 'buffer' import stableStringify from 'json-stable-stringify' import clone from 'clone' diff --git a/src/utils/ccJsonLoad.js b/src/utils/ccJsonLoad.js index a364737..7dc4ec4 100644 --- a/src/utils/ccJsonLoad.js +++ b/src/utils/ccJsonLoad.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import { Buffer } from 'buffer' import base58 from 'bs58' import cc from 'crypto-conditions' diff --git a/src/utils/ccJsonify.js b/src/utils/ccJsonify.js index cb59de9..52f3ddb 100644 --- a/src/utils/ccJsonify.js +++ b/src/utils/ccJsonify.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import base58 from 'bs58' /** diff --git a/test/base-request/test_baseRequest.js b/test/base-request/test_baseRequest.js index ac61927..9f89b5b 100644 --- a/test/base-request/test_baseRequest.js +++ b/test/base-request/test_baseRequest.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import test from 'ava' import baseRequest from '../../src/baseRequest' diff --git a/test/connection/test_connection.js b/test/connection/test_connection.js index 23b866c..7f9c65b 100644 --- a/test/connection/test_connection.js +++ b/test/connection/test_connection.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import test from 'ava' import sinon from 'sinon' diff --git a/test/constants.js b/test/constants.js index 2194151..6062fec 100644 --- a/test/constants.js +++ b/test/constants.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import test from 'ava' import { Transaction, Ed25519Keypair } from '../src' // TODO: Find out if ava has something like conftest, if so put this there. diff --git a/test/integration/test_integration.js b/test/integration/test_integration.js index 9862822..5218935 100644 --- a/test/integration/test_integration.js +++ b/test/integration/test_integration.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import test from 'ava' import { Ed25519Keypair, Transaction, Connection } from '../../src' diff --git a/test/sanitize/test_sanitize.js b/test/sanitize/test_sanitize.js index 1d381d4..d699c24 100644 --- a/test/sanitize/test_sanitize.js +++ b/test/sanitize/test_sanitize.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import test from 'ava' import rewire from 'rewire' diff --git a/test/text-format/test_format_text.js b/test/text-format/test_format_text.js index 6e5039e..a392572 100644 --- a/test/text-format/test_format_text.js +++ b/test/text-format/test_format_text.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import test from 'ava' import formatText from '../../src/format_text' diff --git a/test/transaction/test_cryptoconditions.js b/test/transaction/test_cryptoconditions.js index 83f6dc5..80609b2 100644 --- a/test/transaction/test_cryptoconditions.js +++ b/test/transaction/test_cryptoconditions.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import test from 'ava' import cc from 'crypto-conditions' import { Ed25519Keypair, Transaction, ccJsonLoad } from '../../src' diff --git a/test/transaction/test_transaction.js b/test/transaction/test_transaction.js index b1dc58b..b161cd1 100644 --- a/test/transaction/test_transaction.js +++ b/test/transaction/test_transaction.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + import test from 'ava' import sinon from 'sinon' diff --git a/webpack.common.js b/webpack.common.js index eb2795c..a7194e1 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable strict, no-console, object-shorthand */ 'use strict' diff --git a/webpack.config.js b/webpack.config.js index 384f0ec..8136429 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable strict, no-console, object-shorthand */ 'use strict' diff --git a/webpack.development.js b/webpack.development.js index c383594..4b2751e 100644 --- a/webpack.development.js +++ b/webpack.development.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable strict, no-console, object-shorthand */ 'use strict' diff --git a/webpack.parts.js b/webpack.parts.js index 89606f7..7407ee4 100644 --- a/webpack.parts.js +++ b/webpack.parts.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable strict, no-console, object-shorthand */ 'use strict' diff --git a/webpack.production.js b/webpack.production.js index 368a93d..5bcf8d8 100644 --- a/webpack.production.js +++ b/webpack.production.js @@ -1,3 +1,7 @@ +// Copyright BigchainDB GmbH and BigchainDB contributors +// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +// Code is Apache-2.0 and docs are CC-BY-4.0 + /* eslint-disable strict, no-console, object-shorthand */ 'use strict' From cc203c514bb8fbbd24cbf44063a94f1966fbda33 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Fri, 10 Aug 2018 14:50:09 +0200 Subject: [PATCH 4/4] Reformat LICENSE-docs for readability --- LICENSE-docs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/LICENSE-docs b/LICENSE-docs index b19b0b8..0402210 100644 --- a/LICENSE-docs +++ b/LICENSE-docs @@ -1 +1,4 @@ -The official BigchainDB documentation, _except for the short code snippets embedded within it_, is licensed under a Creative Commons Attribution-ShareAlike 4.0 International license, the full text of which can be found at [http://creativecommons.org/licenses/by-sa/4.0/legalcode](http://creativecommons.org/licenses/by-sa/4.0/legalcode). \ No newline at end of file +The official BigchainDB documentation, _except for the short code snippets +embedded within it_, is licensed under a Creative Commons Attribution- +ShareAlike 4.0 International license, the full text of which can be found +at http://creativecommons.org/licenses/by-sa/4.0/legalcode