diff --git a/.gitattributes b/.gitattributes new file mode 100755 index 0000000..7134386 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +AUTHORS merge=union diff --git a/.travis.yml b/.travis.yml index 7d904bb..7707531 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,4 @@ language: node_js node_js: "5.1" before_script: - npm install -g grunt-cli +script: npm run test-travis diff --git a/AUTHORS b/AUTHORS new file mode 100755 index 0000000..bc7ed80 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,57 @@ +# The jQuery Foundation AUTHORS Certificate v1.0 +# +# This certificate clarifies the terms under which You, the person listed below, +# may make Contributions — which may include without limitation, software, bug +# fixes, configuration changes, documentation, or any other materials — to any +# of the projects owned or managed by the jQuery Foundation. +# +# You accept and agree to the following terms and conditions for Your present +# and future Contributions submitted to the jQuery Foundation. Except for the +# license granted herein to the jQuery Foundation, You reserve all right, title, +# and interest in and to Your Contributions. +# +# By proposing a change to this project that adds a line like +# +# Name +# +# below, or, having previously signed the jQuery Foundation Contributor License +# Agreement, you agree to the following terms. +# +# Licenses +# +# jQuery Foundation projects (code, documentation, and any other materials) are +# each released under the terms of the individual licenses as noted in the +# project's repository, or, if no separate license is specified, under the terms +# of the MIT license, with the following exception: +# +# Copyright and related rights for sample code as defined in the project's +# LICENSE.txt file are waived via CC0. Rights to any change to existing sample +# code or contribution of new code denoted as sample code as defined in the +# project's LICENSE.txt file are waived via CC0. +# +# You certify that: +# +# (a) Your Contributions are created in whole or in part by You and You have the +# right to submit it under the designated license; or +# +# (b) Your Contributions are based upon previous work that, to the best of your +# knowledge, is covered under an appropriate open source license and You +# have the right under that license to submit that work with modifications, +# whether created in whole or in part by You, under the designated license; +# or +# +# (c) Your Contributions are provided directly to You by some other person who +# certified (a) or (b) and You have not modified them. +# +# (d) You understand and agree that the jQuery Foundation projects and Your +# Contributions are public and that a record of the Contributions (including +# all metadata and personal information You submit with them) is maintained +# indefinitely and may be redistributed consistent with the jQuery +# Foundation's policies and the requirements of the MIT license where they +# are relevant. +# +# (e) You are granting Your Contributions to the jQuery Foundation under the +# terms of the license as noted in the project's repository or if not +# specified, either the MIT open source license or the CC0 as applicable. + +Kris Borchers diff --git a/LICENSE b/LICENSE index 8592e6e..9eda12d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) 2015 jQuery Foundation and other contributors, https://jquery.org/ +Copyright jQuery Foundation and other contributors listed in AUTHORS, +https://jquery.org/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,4 +20,3 @@ 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. - diff --git a/package.json b/package.json index 13fdbe9..94621d4 100755 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "src/" ], "scripts": { - "test": "grunt test" + "test-travis": "grunt test && npm run install-temp-checker", + "check-authors-travis": "check-authors-certificate pr=true" }, "keywords": [ "react", @@ -40,6 +41,7 @@ "babel-preset-react": "^6.5.0", "babel-register": "^6.7.2", "chai": "^3.5.0", + "check-authors-certificate": "file:temp\\check-authors-certificate.js\\", "cldr-data": ">=25", "cldrjs": "^0.4.3", "enzyme": "^1.2.0", diff --git a/temp/check-authors-certificate.js b/temp/check-authors-certificate.js new file mode 160000 index 0000000..fc32f84 --- /dev/null +++ b/temp/check-authors-certificate.js @@ -0,0 +1 @@ +Subproject commit fc32f84247c0cb82db816f6cb21acf090c2414f8