From caadf49528268e04a5bc338dbb692fb9463a5c47 Mon Sep 17 00:00:00 2001 From: Alexander Wunschik Date: Sun, 29 Jan 2017 14:40:29 +0100 Subject: [PATCH 1/3] removed NOTICE file --- LICENSE-MIT | 3 +-- NOTICE | 33 --------------------------------- README.md | 2 +- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 NOTICE diff --git a/LICENSE-MIT b/LICENSE-MIT index 61da206c0..ca928f7bb 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2016 Almende B.V. +Copyright (c) 2014-2017 Almende B.V. 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 +19,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/NOTICE b/NOTICE deleted file mode 100644 index a5ef8dbf5..000000000 --- a/NOTICE +++ /dev/null @@ -1,33 +0,0 @@ -Vis.js -Copyright 2010-2016 Almende B.V. - -Vis.js is dual licensed under both - - * 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. - - -Vis.js uses and redistributes the following third-party libraries: - -- component-emitter - https://github.com/component/emitter - The MIT License - -- hammer.js - http://hammerjs.github.io/ - The MIT License - -- moment.js - http://momentjs.com/ - The MIT License - -- keycharm - https://github.com/AlexDM0/keycharm - The MIT License diff --git a/README.md b/README.md index b08e59972..977df78ac 100644 --- a/README.md +++ b/README.md @@ -330,7 +330,7 @@ Then run the tests: ## License -Copyright (C) 2010-2016 Almende B.V. and Contributors +Copyright (C) 2010-2017 Almende B.V. and Contributors Vis.js is dual licensed under both From 8f167d18d49097e69541aa85191bcce75ec25f19 Mon Sep 17 00:00:00 2001 From: Alexander Wunschik Date: Sun, 29 Jan 2017 14:41:44 +0100 Subject: [PATCH 2/3] updated license date range to include 2017 --- lib/header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/header.js b/lib/header.js index 3045a7971..0cdc0e21e 100644 --- a/lib/header.js +++ b/lib/header.js @@ -8,7 +8,7 @@ * @date @@date * * @license - * Copyright (C) 2011-2016 Almende B.V, http://almende.com + * Copyright (C) 2011-2017 Almende B.V, http://almende.com * * Vis.js is dual licensed under both * From 934b0007f57350994202af4582a777577f1833af Mon Sep 17 00:00:00 2001 From: Alexander Wunschik Date: Sun, 29 Jan 2017 14:43:58 +0100 Subject: [PATCH 3/3] chore(docs): updated support team members --- misc/we_need_help.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/misc/we_need_help.md b/misc/we_need_help.md index a3eb91061..00287215a 100644 --- a/misc/we_need_help.md +++ b/misc/we_need_help.md @@ -13,3 +13,5 @@ If you have shown some commitment to the project you can ask [@ludost](//github. * [@ludost](//github.com/ludost) (almende maintainer) * [@mojoaxel](//github.com/mojoaxel) * [@yotamberk](//github.com/yotamberk) +* [@Tooa](//github.com/Tooa) +* [@eymiha](//github.com/eymiha)