From 870e82cd206455dabda7e87ce9f2f8c74acce839 Mon Sep 17 00:00:00 2001 From: Alexander Wunschik Date: Mon, 18 Nov 2019 20:04:59 +0100 Subject: [PATCH] Licenses (#195) * chore: rename license files * chore: update license copyright * chore: update License in README * chore: removed the time-traveling feature --- LICENSE-APACHE-2.0 => LICENSE.Apache-2.0.txt | 0 LICENSE-MIT => LICENSE.MIT.txt | 3 ++- LICENSE.md | 9 +++++++++ README.md | 16 +++++----------- 4 files changed, 16 insertions(+), 12 deletions(-) rename LICENSE-APACHE-2.0 => LICENSE.Apache-2.0.txt (100%) rename LICENSE-MIT => LICENSE.MIT.txt (91%) create mode 100644 LICENSE.md diff --git a/LICENSE-APACHE-2.0 b/LICENSE.Apache-2.0.txt similarity index 100% rename from LICENSE-APACHE-2.0 rename to LICENSE.Apache-2.0.txt diff --git a/LICENSE-MIT b/LICENSE.MIT.txt similarity index 91% rename from LICENSE-MIT rename to LICENSE.MIT.txt index ca928f7bb9..e8eb007291 100644 --- a/LICENSE-MIT +++ b/LICENSE.MIT.txt @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) 2014-2017 Almende B.V. +Copyright (c) 2014-2017 Almende B.V. and contributors +Copyright (c) 2017-2019 vis.js contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000000..543a4c1e48 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,9 @@ +# License + +Copyright (c) 2014-2017 Almende B.V. and contributors +Copyright (c) 2017-2019 vis.js contributors + +This work is dual-licensed under [Apache-2.0](./LICENSE.Apache-2.0.txt) and [MIT](./LICENSE.MIT.txt). +You can choose between one of them if you use this work. + +`SPDX-License-Identifier: Apache-2.0 OR MIT` diff --git a/README.md b/README.md index 290ade2b17..0c14eda76d 100644 --- a/README.md +++ b/README.md @@ -128,16 +128,10 @@ Support this project by becoming a sponsor. Your logo will show up here with a l ## License -Copyright (C) 2010-2018 Almende B.V. and Contributors +Copyright (c) 2014-2017 Almende B.V. and contributors +Copyright (c) 2017-2019 vis.js contributors -Vis.js is dual licensed under both +This work is dual-licensed under [Apache-2.0](./LICENSE.Apache-2.0.txt) and [MIT](./LICENSE.MIT.txt). +You can choose between one of them if you use this work. - * The Apache 2.0 License - http://www.apache.org/licenses/LICENSE-2.0 - -and - - * The MIT License - http://opensource.org/licenses/MIT - -Vis.js may be distributed under either license. \ No newline at end of file +`SPDX-License-Identifier: Apache-2.0 OR MIT`