From a12505b017d4650faa441c6fca17a591b2008153 Mon Sep 17 00:00:00 2001 From: jos Date: Sat, 13 Aug 2016 21:23:43 +0200 Subject: [PATCH] Updated license information on some other places too --- LICENSE | 2 +- NOTICE | 17 ----------------- gulpfile.js | 5 +---- src/header.js | 15 +++------------ 4 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 NOTICE diff --git a/LICENSE b/LICENSE index 5eca8dd..0bb340d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 Jos de Jong +Copyright (c) 2011-2016 Jos de Jong 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/NOTICE b/NOTICE deleted file mode 100644 index ff2aa45..0000000 --- a/NOTICE +++ /dev/null @@ -1,17 +0,0 @@ -JSON Editor -https://github.com/josdejong/jsoneditor - -Copyright (C) 2011-2015 Jos de Jong - - -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. diff --git a/gulpfile.js b/gulpfile.js index 5be0f7b..f2086e8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -128,7 +128,4 @@ gulp.task('watch', ['bundle'], function () { }); // The default task (called when you run `gulp`) -gulp.task('default', [ - 'bundle', - 'bundle-minimalist' -]); +gulp.task('default', [ 'bundle', 'bundle-minimalist' ]); diff --git a/src/header.js b/src/header.js index 52ef8d3..1f2d913 100644 --- a/src/header.js +++ b/src/header.js @@ -1,5 +1,6 @@ /*! * jsoneditor.js + * https://github.com/josdejong/jsoneditor * * @brief * JSONEditor is a web-based tool to view, edit, format, and validate JSON. @@ -9,19 +10,9 @@ * Supported browsers: Chrome, Firefox, Safari, Opera, Internet Explorer 8+ * * @license - * 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 + * The MIT License (MIT) * - * 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. - * - * Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org + * Copyright (c) 2011-2016 Jos de Jong * * @author Jos de Jong, * @version @@version