Skip to content

Commit 9412f37

Browse files
batpigandmebatpigandme
authored
Re-license as MIT
2 parents 2506ae3 + c1e12a2 commit 9412f37

File tree

6 files changed

+108
-80
lines changed

6 files changed

+108
-80
lines changed

‎.Rbuildignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
^_pkgdown\.yml$
1111
^docs$
1212
^pkgdown$
13+
^LICENSE\.md$

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Encoding: UTF-8
2222
Description: An extension to the 'testthat' package that makes it easy
2323
to add graphical unit tests. It provides a Shiny application to
2424
manage the test cases.
25-
License: GPL-3 | file LICENSE
25+
License: MIT + file LICENSE
2626
LazyData: true
2727
ByteCompile: true
2828
Depends:

‎LICENSE‎

Lines changed: 2 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,2 @@
1-
vdiffr as a whole is released under GPL-3. It includes:
2-
3-
- the jQuery library under the Apache 2.0 licence,
4-
- the js-imagediff library under the MIT licence,
5-
- the TwoFace library under the MIT licence,
6-
7-
all of which are compatible with the GPL-3.
8-
9-
10-
js-imagediff
11-
------------
12-
13-
Copyright (c) 2011 Carl Sutherland, Humble Software Development
14-
15-
Permission is hereby granted, free of charge, to any person
16-
obtaining a copy of this software and associated documentation
17-
files (the "Software"), to deal in the Software without
18-
restriction, including without limitation the rights to use,
19-
copy, modify, merge, publish, distribute, sublicense, and/or sell
20-
copies of the Software, and to permit persons to whom the
21-
Software is furnished to do so, subject to the following
22-
conditions:
23-
24-
The above copyright notice and this permission notice shall be
25-
included in all copies or substantial portions of the Software.
26-
27-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
28-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
29-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
30-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
31-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
32-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
33-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
34-
OTHER DEALINGS IN THE SOFTWARE.
35-
36-
37-
TwoFace
38-
-------
39-
40-
Copyright (c) 2016 David Hong
41-
42-
Permission is hereby granted, free of charge, to any person
43-
obtaining a copy of this software and associated documentation
44-
files (the "Software"), to deal in the Software without
45-
restriction, including without limitation the rights to use,
46-
copy, modify, merge, publish, distribute, sublicense, and/or sell
47-
copies of the Software, and to permit persons to whom the
48-
Software is furnished to do so, subject to the following
49-
conditions:
50-
51-
The above copyright notice and this permission notice shall be
52-
included in all copies or substantial portions of the Software.
53-
54-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
55-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
56-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
57-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
58-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
59-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
60-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
61-
OTHER DEALINGS IN THE SOFTWARE.
62-
63-
64-
jQuery
65-
------
66-
67-
Copyright (c) 2016 jQuery Foundation and other contributors, https://jquery.org/
68-
69-
Licensed under the Apache License, Version 2.0 (the "License");
70-
you may not use this file except in compliance with the License.
71-
You may obtain a copy of the License at
72-
73-
http://www.apache.org/licenses/LICENSE-2.0
74-
75-
Unless required by applicable law or agreed to in writing, software
76-
distributed under the License is distributed on an "AS IS" BASIS,
77-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
78-
See the License for the specific language governing permissions and
79-
limitations under the License.
1+
YEAR: 2021
2+
COPYRIGHT HOLDER: vdiffr authors

‎LICENSE.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# MIT License
2+
3+
Copyright (c) 2021 vdiffr authors
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎LICENSE.note‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
vdiffr as a whole is released under MIT. It includes:
2+
3+
- the jQuery library under the Apache 2.0 licence,
4+
- the js-imagediff library under the MIT licence,
5+
- the TwoFace library under the MIT licence,
6+
- the daff library under the MIT license,
7+
- the diff2html library under the MIT license,
8+
9+
all of which are compatible with the MIT.
10+
11+
12+
js-imagediff
13+
------------
14+
15+
Copyright (c) 2011 Carl Sutherland, Humble Software Development
16+
17+
Permission is hereby granted, free of charge, to any person
18+
obtaining a copy of this software and associated documentation
19+
files (the "Software"), to deal in the Software without
20+
restriction, including without limitation the rights to use,
21+
copy, modify, merge, publish, distribute, sublicense, and/or sell
22+
copies of the Software, and to permit persons to whom the
23+
Software is furnished to do so, subject to the following
24+
conditions:
25+
26+
The above copyright notice and this permission notice shall be
27+
included in all copies or substantial portions of the Software.
28+
29+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
30+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
31+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
32+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
33+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
34+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
35+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
36+
OTHER DEALINGS IN THE SOFTWARE.
37+
38+
39+
TwoFace
40+
-------
41+
42+
Copyright (c) 2016 David Hong
43+
44+
Permission is hereby granted, free of charge, to any person
45+
obtaining a copy of this software and associated documentation
46+
files (the "Software"), to deal in the Software without
47+
restriction, including without limitation the rights to use,
48+
copy, modify, merge, publish, distribute, sublicense, and/or sell
49+
copies of the Software, and to permit persons to whom the
50+
Software is furnished to do so, subject to the following
51+
conditions:
52+
53+
The above copyright notice and this permission notice shall be
54+
included in all copies or substantial portions of the Software.
55+
56+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
57+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
58+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
59+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
60+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
61+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
62+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
63+
OTHER DEALINGS IN THE SOFTWARE.
64+
65+
66+
jQuery
67+
------
68+
69+
Copyright (c) 2016 jQuery Foundation and other contributors, https://jquery.org/
70+
71+
Licensed under the Apache License, Version 2.0 (the "License");
72+
you may not use this file except in compliance with the License.
73+
You may obtain a copy of the License at
74+
75+
http://www.apache.org/licenses/LICENSE-2.0
76+
77+
Unless required by applicable law or agreed to in writing, software
78+
distributed under the License is distributed on an "AS IS" BASIS,
79+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
80+
See the License for the specific language governing permissions and
81+
limitations under the License.

‎NEWS.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
# vdiffr (development version)
33

4+
- vdiffr is now licensed as MIT (#95).
5+
46

57
# vdiffr 0.3.3
68

0 commit comments

Comments
 (0)