Skip to content

Commit

Permalink
Merge pull request #17 from arcticicestudio/subtask/gh-16-migrate-to-…
Browse files Browse the repository at this point in the history
…mit-license

Migrate to MIT license
  • Loading branch information
arcticicestudio authored Jan 2, 2018
2 parents 156c4b1 + 1d3c494 commit ce9c46e
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 422 deletions.
29 changes: 13 additions & 16 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title ESLint Configuration +
project nord-tilix +
repository https://github.com/arcticicestudio/nord-tilix +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
* Project: Nord Tilix
* Repository: https://github.com/arcticicestudio/nord-tilix
* License: MIT
* References:
* http://eslint.org/docs/user-guide/configuring
* http://eslint.org/docs/user-guide/configuring#using-configuration-files
* http://eslint.org/docs/user-guide/configuring#specifying-environments
* http://eslint.org/docs/user-guide/configuring#configuring-plugins
* http://eslint.org/docs/rules
*/

[References]
ESLint
http://eslint.org/docs/user-guide/configuring
http://eslint.org/docs/user-guide/configuring#using-configuration-files
http://eslint.org/docs/user-guide/configuring#specifying-environments
http://eslint.org/docs/user-guide/configuring#configuring-plugins
http://eslint.org/docs/rules
*/
module.exports = {
"env": {
"node": true,
Expand Down
22 changes: 10 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Travis CI Build Configuration +
# project nord-tilix +
# repository https://github.com/arcticicestudio/nord-tilix +
# author Arctic Ice Studio +
# email [email protected] +
# copyright Copyright (C) 2017 +
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [References]
# Travis CI Documentation
# (https://docs.travis-ci.com/user/languages/javascript-with-nodejs)
#!/usr/bin/env bash
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
# Copyright (c) 2016-present Sven Greb <[email protected]>

# Project: Nord Tilix
# Repository: https://github.com/arcticicestudio/nord-tilix
# License: MIT
# References:
# https://docs.travis-ci.com/user/languages/javascript-with-nodejs

language: node_js
node_js:
- "6"
Expand Down
378 changes: 22 additions & 356 deletions LICENSE.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ Please report issues/bugs, feature requests and suggestions for improvements to

<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-footer-mountains.svg" /></p>

<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2016 Arctic Ice Studio</p>
<p align="center">Copyright &copy; 2016-present Arctic Ice Studio</p>

<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-5E81AC.svg"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-5E81AC.svg"/></a></p>
<p align="center"><a href="https://github.com/arcticicestudio/nord-tilix/blob/develop/LICENSE.md"><img src="https://img.shields.io/badge/License-MIT-5E81AC.svg?style=flat-square"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-5E81AC.svg?style=flat-square"/></a></p>
24 changes: 11 additions & 13 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Circle CI Build Configuration +
# project nord-tilix +
# repository https://github.com/arcticicestudio/nord-tilix +
# author Arctic Ice Studio +
# email [email protected] +
# copyright Copyright (C) 2017 +
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#
# [References]
# Circle CI
# (https://circleci.com/docs/language-nodejs)
# (https://circleci.com/docs/yarn)
#!/usr/bin/env bash
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
# Copyright (c) 2016-present Sven Greb <[email protected]>

# Project: Nord Tilix
# Repository: https://github.com/arcticicestudio/nord-tilix
# License: MIT
# References:
# https://circleci.com/docs/language-nodejs
# https://circleci.com/docs/yarn

machine:
node:
version: 6
Expand Down
24 changes: 10 additions & 14 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Project Gulp File +
project nord-tilix +
repository https://github.com/arcticicestudio/nord-tilix +
author Arctic Ice Studio +
email [email protected] +
copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
* Copyright (c) 2016-present Sven Greb <[email protected]>
* Project: Nord Tilix
* Repository: https://github.com/arcticicestudio/nord-tilix
* License: MIT
* References:
* http://gulpjs.com
* https://www.npmjs.com
*/

[References]
Gulp
(http://gulpjs.com)
npmjs
(https://www.npmjs.com)
*/
/*+---------+
+ Imports +
+---------+*/
Expand Down
15 changes: 7 additions & 8 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#!/usr/bin/env bash
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Install Script +
# project nord-tilix +
# repository https://github.com/arcticicestudio/nord-tilix +
# author Arctic Ice Studio +
# email [email protected] +
# copyright Copyright (C) 2017 +
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
# Copyright (c) 2016-present Sven Greb <[email protected]>

# Project: Nord Tilix
# Repository: https://github.com/arcticicestudio/nord-tilix
# License: MIT

set -e

_ct_error="\e[0;31m"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bugs": {
"url": "https://github.com/arcticicestudio/nord-tilix/issues"
},
"license" : "(Apache-2.0 AND CC-BY-SA-4.0)",
"license" : "(MIT AND CC-BY-SA-4.0)",
"keywords": [
"nord",
"arctic",
Expand Down

0 comments on commit ce9c46e

Please sign in to comment.