- License: Remove "CC-BY-SA-2.0" as explicit license type, but make note about unclear provenance of some images

- Docs: Update license badges to reflect lack of (known) CC-BY-SA-2.0 usage
- Replace CC-BY-SA-2.0 polygon image (thanks, @mowijo !)
master
Brett Zamir 2020-05-04 09:19:16 +08:00
parent e43d128a2f
commit 1a9b00a1f8
8 changed files with 64 additions and 202 deletions

View File

@ -10,12 +10,14 @@
licenses. See the new license badges on the README for a summary of
the licenses including either bundled devDependencies or all
`devDependencies` (we have no direct npm `dependencies` currently).
- License: Add note about unclear provenance of some images
- License: Relicense ext-mathjax from Apache-2.0 to MIT per
<https://github.com/josegaert/ext-mathjax/issues/6>
- License: Clarify in `@license` that `ext-server_moinsave.js` is
"(MIT OR GPL-2.0-or-later)" per subsequent text
- License: Reorder license listing in `jquery.contextMenu.js` so
that more permissive is noticeable first
- License: Replace CC-BY-SA-2.0 polygon image (thanks, @mowijo !)
- BREAKING CHANGE: Remove `$.pref` in favor of new `svgEditor.pref`
(avoiding polluting jQuery). (Might be moved to own module in
future.)
@ -55,6 +57,7 @@
summary of all licenses including bundled).
- Docs: Reprioritize `docs` in commit lists (prioritize user-facing)
- Docs: Update Pavol's email address (@prusnak)
- Docs: Update license badges to reflect lack of (known) CC-BY-SA-2.0 usage
- Docs: Update Contributing, Testing (renamed to Development),
Linting and ReleaseInstructions
- Update: Cypress code coverage plugin

View File

@ -18,9 +18,12 @@
(see also [licenses for dev. deps.](https://raw.githubusercontent.com/SVG-Edit/svgedit/master/badges/licenses-badge-dev.svg?sanitize=true))
(Note: The protective license `CC-BY-SA-2.0` is due to our containing at least
one image under this stricter license; to avoid its conditions, we'd
appreciate a replacement image. See [#377](https://github.com/SVG-Edit/svgedit/issues/377))
(Note: The license provenance of the images in `/editor/images` may not be
fully clear, even with the origin of some of the images listed as being from <http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/>. We would like to
replace these images if their provenance cannot be determined or is found to
be under a protective license. If you know of the original terms, or can help
create SVG replacement images, please let us know at:
[#377](https://github.com/SVG-Edit/svgedit/issues/377).)
<!-- [![License](https://img.shields.io/npm/l/svgedit.svg)](LICENSE-MIT) -->
[![issuehunt-to-marktext](https://issuehunt.io/static/embed/issuehunt-button-v1.svg)](https://issuehunt.io/r/SVG-Edit/svgedit)

View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="553" height="80"><defs><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="navy" d="M0 0h227v80H0z"/><path fill="green" d="M227 0h90v80h-90z"/><path fill="#cc0" d="M317 0h128v80H317z"/><path fill="pink" d="M445 0h108v80H445z"/><path fill="url(#smooth)" d="M0 0h553v80H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">License types</text><text class="high" x="5" y="14">License types</text><text class="shadow" x="5.5" y="27">(project, deps, and bundled devDeps)</text><text class="high" x="5" y="26">(project, deps, and bundled devDeps)</text><text class="shadow" x="232.5" y="15">Permissive</text><text class="high" x="232" y="14">Permissive</text><text class="shadow" x="232.5" y="39">1. Apache-2.0</text><text class="high" x="232" y="38">1. Apache-2.0</text><text class="shadow" x="232.5" y="51">2. ISC</text><text class="high" x="232" y="50">2. ISC</text><text class="shadow" x="232.5" y="63">3. MIT</text><text class="high" x="232" y="62">3. MIT</text><text class="shadow" x="232.5" y="75">4. X11</text><text class="high" x="232" y="74">4. X11</text><text class="shadow" x="322.5" y="15">Weakly</text><text class="high" x="322" y="14">Weakly</text><text class="shadow" x="322.5" y="27">protective</text><text class="high" x="322" y="26">protective</text><text class="shadow" x="322.5" y="51">1. LGPL-3.0-or-later</text><text class="high" x="322" y="50">1. LGPL-3.0-or-later</text><text class="shadow" x="450.5" y="15">Protective</text><text class="high" x="450" y="14">Protective</text><text class="shadow" x="450.5" y="39">1. CC-BY-SA-2.0</text><text class="high" x="450" y="38">1. CC-BY-SA-2.0</text></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="445" height="80"><defs><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="navy" d="M0 0h227v80H0z"/><path fill="green" d="M227 0h90v80h-90z"/><path fill="#cc0" d="M317 0h128v80H317z"/><path fill="url(#smooth)" d="M0 0h445v80H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">License types</text><text class="high" x="5" y="14">License types</text><text class="shadow" x="5.5" y="27">(project, deps, and bundled devDeps)</text><text class="high" x="5" y="26">(project, deps, and bundled devDeps)</text><text class="shadow" x="232.5" y="15">Permissive</text><text class="high" x="232" y="14">Permissive</text><text class="shadow" x="232.5" y="39">1. Apache-2.0</text><text class="high" x="232" y="38">1. Apache-2.0</text><text class="shadow" x="232.5" y="51">2. ISC</text><text class="high" x="232" y="50">2. ISC</text><text class="shadow" x="232.5" y="63">3. MIT</text><text class="high" x="232" y="62">3. MIT</text><text class="shadow" x="232.5" y="75">4. X11</text><text class="high" x="232" y="74">4. X11</text><text class="shadow" x="322.5" y="15">Weakly</text><text class="high" x="322" y="14">Weakly</text><text class="shadow" x="322.5" y="27">protective</text><text class="high" x="322" y="26">protective</text><text class="shadow" x="322.5" y="51">1. LGPL-3.0-or-later</text><text class="high" x="322" y="50">1. LGPL-3.0-or-later</text></g></svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -41,8 +41,8 @@ none.png
open.png
paste.png
path.png
polygon.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/tools/draw-polygon.png
polygon.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/tools/draw-polygon.svg
polygon.png https://github.com/SVG-Edit/svgedit/issues/377
polygon.svg https://github.com/SVG-Edit/svgedit/issues/377
rect.png
redo.png
rotate.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 557 B

After

Width:  |  Height:  |  Size: 922 B

View File

@ -1,219 +1,76 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="draw-polygon.svg"
sodipodi:docbase="/home/andreas/projekt/tango/22"
inkscape:version="0.42"
id="svg8728"
height="22.000000px"
version="1.1"
width="22.000000px"
inkscape:export-filename="/home/andreas/projekt/tango/22/draw-polygon.png"
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000">
height="22.000000px"
id="svg8728"
sodipodi:docname="polygon.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata id="license">
This file is released under the MIT license.
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1414"
inkscape:window-height="1016"
id="namedview989"
showgrid="false"
inkscape:zoom="9.8636364"
inkscape:cx="2.1014226"
inkscape:cy="26.429249"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="layer1" />
<defs
id="defs3">
<linearGradient
inkscape:collect="always"
id="linearGradient3941">
id="linearGradient928">
<stop
style="stop-color:#000000;stop-opacity:1;"
style="stop-color:#777777;stop-opacity:1;"
offset="0"
id="stop3943" />
id="stop924" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3945" />
</linearGradient>
<linearGradient
id="linearGradient6581">
<stop
style="stop-color:#eeeeec;stop-opacity:1;"
offset="0"
id="stop6583" />
<stop
style="stop-color:#e0e0de;stop-opacity:1.0000000;"
style="stop-color:#ffffff;stop-opacity:0"
offset="1.0000000"
id="stop6585" />
id="stop926" />
</linearGradient>
<linearGradient
id="linearGradient14920">
<stop
id="stop14922"
offset="0"
style="stop-color:#5a7aa4;stop-opacity:1;" />
<stop
id="stop14924"
offset="1.0000000"
style="stop-color:#1f2b3a;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient13390">
<stop
id="stop13392"
offset="0.0000000"
style="stop-color:#81a2cd;stop-opacity:1.0000000;" />
<stop
id="stop13394"
offset="1.0000000"
style="stop-color:#2a415f;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
id="linearGradient10325">
<stop
id="stop10327"
offset="0"
style="stop-color:#5a7aa4;stop-opacity:1;" />
<stop
id="stop10329"
offset="1.0000000"
style="stop-color:#455e7e;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
y2="39.486301"
x2="37.746555"
y1="23.992306"
x1="23.598076"
gradientTransform="matrix(0.363308,0,0,0.363571,1.976073,1.180651)"
id="linearGradient13217"
xlink:href="#linearGradient6581"
inkscape:collect="always" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3941"
id="radialGradient3947"
cx="2.25"
cy="16"
fx="2.25"
fy="16"
r="16.875"
gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,-5.774893e-15,10.66667)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6581"
id="linearGradient2398"
x1="10.769515"
y1="8.7196503"
x2="15.923767"
y2="15.039417"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6581"
id="linearGradient2403"
gradientUnits="userSpaceOnUse"
x1="10.769515"
y1="8.7196503"
x2="15.923767"
y2="15.039417"
gradientTransform="matrix(0.874941,0.000000,0.000000,0.868551,1.339139,1.349650)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6581"
id="linearGradient2405"
gradientUnits="userSpaceOnUse"
x1="10.769515"
y1="8.7196503"
x2="15.923767"
y2="15.039417"
gradientTransform="matrix(1.001575,0.000000,0.000000,1.000000,-3.040037e-3,0.000000)" />
gradientTransform="matrix(1.0033963,-0.00853162,0.00155275,0.18261755,-0.31483228,15.390226)"
r="9.9786386"
fy="18.71875"
fx="10.531251"
cy="18.71875"
cx="10.531251"
id="radialGradient919"
xlink:href="#linearGradient928" />
</defs>
<sodipodi:namedview
inkscape:window-y="25"
inkscape:window-x="0"
inkscape:window-height="949"
inkscape:window-width="1280"
inkscape:document-units="px"
inkscape:grid-bbox="true"
showgrid="false"
inkscape:current-layer="layer1"
inkscape:cy="10.249014"
inkscape:cx="16.435231"
inkscape:zoom="15.999999"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="0.08235294"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
showguides="true"
inkscape:guide-bbox="true"
inkscape:showpageshadow="false"
stroke="#888a85" />
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Draw Rectangle</dc:title>
<dc:date>2005-10-10</dc:date>
<dc:creator>
<cc:Agent>
<dc:title>Andreas Nilsson</dc:title>
</cc:Agent>
</dc:creator>
<dc:subject>
<rdf:Bag>
<rdf:li>draw</rdf:li>
<rdf:li>rectangle</rdf:li>
<rdf:li>square</rdf:li>
</rdf:Bag>
</dc:subject>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
<cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" />
<cc:permits
rdf:resource="http://web.resource.org/cc/Distribution" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Notice" />
<cc:requires
rdf:resource="http://web.resource.org/cc/Attribution" />
<cc:permits
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
<cc:requires
rdf:resource="http://web.resource.org/cc/ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
inkscape:label="Layer 1"
id="layer1">
<path
sodipodi:type="arc"
style="opacity:0.60000000;color:#000000;fill:url(#radialGradient3947);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
id="path2193"
sodipodi:cx="2.2500000"
sodipodi:cy="16.000000"
sodipodi:rx="16.875000"
sodipodi:ry="5.6250000"
d="M 19.125000 16.000000 A 16.875000 5.6250000 0 1 1 -14.625000,16.000000 A 16.875000 5.6250000 0 1 1 19.125000 16.000000 z"
transform="matrix(0.503704,0.000000,0.000000,0.349014,9.366667,12.45257)" />
id="path911"
style="opacity:1;fill:url(#radialGradient919);fill-opacity:1;stroke:none;stroke-width:0.98000002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:304.81887817;stroke-opacity:1"
ry="1.9786382"
rx="9.9786386"
cy="18.71875"
cx="10.281251" />
<path
style="fill:url(#linearGradient2405);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#888a85;stroke-width:1.0000002px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M 10.376363,3.6237647 L 18.439333,9.5822222 L 15.644242,18.503298 L 5.3933717,18.503298 L 2.5694122,9.5814367 L 10.376363,3.6237647 z "
id="path1661"
sodipodi:nodetypes="cccccc" />
<path
style="fill:url(#linearGradient2403);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#fdfdfb;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
d="M 10.383801,4.6223366 L 17.428917,9.8682235 L 14.894231,17.502140 L 6.1335005,17.494329 L 3.6135882,9.9131875 L 10.383801,4.6223366 z "
id="path2401"
sodipodi:nodetypes="cccccc" />
d="M 10.312501,3.499999 18.198468,9.2294899 15.186297,18.5 5.438705,18.5 2.4265338,9.2294894 Z"
id="path909"
style="opacity:1;fill:#ffffda;fill-opacity:1;stroke:#000000;stroke-width:1.00000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:304.81887817;stroke-opacity:1" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -14,7 +14,6 @@
"(MIT OR GPL-2.0)": ["editor/jquery-ui/jquery-ui-1.8.17.custom.min.js", "editor/jquerybbq/jquery.bbq.min.js", "editor/js-hotkeys/jquery.hotkeys.min.js"],
"(MIT OR GPL-2.0-or-later)": ["editor/contextmenu/jQuery.contextMenu.js", "editor/extensions/ext-server_moinsave.js"],
"Apache-2.0": ["editor/contextmenu.js", "editor/extensions/ext-foreignobject.js", "editor/extensions/ext-grid.js", "editor/extensions/ext-markers.js", "screencasts/svgopen2010/index.html", "editor/jgraduate/jQuery.jGraduate.js", "editor/extensions/mathjax/MathJax.min.js", "editor/extensions/mathjax/TeX-AMS-MML_SVG.js"],
"CC-BY-SA-2.0": ["editor/images/polygon.svg"],
"ISC": ["editor/external/query-result/esm/index.js"],
"LGPL-3.0-or-later": ["editor/jspdf/jspdf.plugin.svgToPdf.js"],
"X11": ["editor/jspdf/jspdf.min.js"]

View File

@ -114,7 +114,7 @@
"Brett Zamir",
"Fabien Jacq"
],
"license": "(MIT AND Apache-2.0 AND CC-BY-SA-2.0 AND ISC AND LGPL-3.0-or-later AND X11)",
"license": "(MIT AND Apache-2.0 AND ISC AND LGPL-3.0-or-later AND X11)",
"bugs": {
"url": "https://github.com/SVG-Edit/svgedit/issues"
},