allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [4/6] allura git commit: [#8027] correct licenses on some CSS & JS files that were incorrect
Date Mon, 30 Nov 2015 17:29:49 GMT
[#8027] correct licenses on some CSS & JS files that were incorrect


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/08832d27
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/08832d27
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/08832d27

Branch: refs/heads/master
Commit: 08832d270c430adea36e63767cd7a91c07aee8ce
Parents: f06421b
Author: Dave Brondsema <dave@brondsema.net>
Authored: Mon Nov 23 13:11:44 2015 -0500
Committer: Heith Seewald <heiths@gmail.com>
Committed: Mon Nov 30 12:29:22 2015 -0500

----------------------------------------------------------------------
 Allura/LICENSE                                  |  6 +++
 .../lib/widgets/resources/css/colorPicker.css   | 43 ++++++++++++--------
 .../widgets/resources/css/jqfontselector.css    | 25 ++++--------
 .../widgets/resources/css/jquery.tagsinput.css  | 26 ++++++------
 Allura/allura/public/nf/css/forge/hilite.css    |  6 +++
 .../allura/public/nf/js/pb.transformie.min.js   | 32 ++++++++-------
 LICENSE                                         |  6 +++
 rat-excludes.txt                                |  2 +
 8 files changed, 84 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/08832d27/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index cda6b5a..19b6233 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -225,9 +225,12 @@ under the MIT license.  For details, see the individual files:
     allura/lib/widgets/resources/css/autocomplete.css
     allura/public/nf/css/forge/accordion.css
     allura/lib/widgets/resources/js/jqfontselector.js
+    Allura/allura/lib/widgets/resources/css/jqfontselector.css
     allura/lib/widgets/resources/js/jquery.autosize-min.js
     allura/lib/widgets/resources/js/jquery.colorPicker.js
+    Allura/allura/lib/widgets/resources/css/jquery.colorPicker.css
     allura/lib/widgets/resources/js/jquery.tagsinput.js
+    Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
     allura/public/nf/js/jquery.flot.js
     allura/public/nf/js/jquery.maxlength.min.js
     allura/public/nf/js/jquery.viewport.js
@@ -235,6 +238,9 @@ under the MIT license.  For details, see the individual files:
     allura/public/nf/css/forge/tooltipster.css
     allura/public/nf/js/jquery.tooltipster.js
 
+Transformie, which is available under the MIT license.
+For details, see allura/public/nf/js/pb.transformie.min.js
+
 Blueprint, which is available under the MIT license.
 For details, see allura/public/nf/css/blueprint/
 

http://git-wip-us.apache.org/repos/asf/allura/blob/08832d27/Allura/allura/lib/widgets/resources/css/colorPicker.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/colorPicker.css b/Allura/allura/lib/widgets/resources/css/colorPicker.css
index 3518917..5f4df22 100644
--- a/Allura/allura/lib/widgets/resources/css/colorPicker.css
+++ b/Allura/allura/lib/widgets/resources/css/colorPicker.css
@@ -1,21 +1,30 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you 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
+/**
+ * Really Simple Color Picker in jQuery
+ *
+ * Licensed under the MIT (MIT-LICENSE.txt) licenses.
+ *
+ * Copyright (c) 2008 Lakshan Perera (www.laktek.com)
+ *                    Daniel Lacy (daniellacy.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * 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.
+ */
 
-         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.
-*/
 div.colorPicker-picker {
   height: 16px;
   width: 16px;

http://git-wip-us.apache.org/repos/asf/allura/blob/08832d27/Allura/allura/lib/widgets/resources/css/jqfontselector.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/jqfontselector.css b/Allura/allura/lib/widgets/resources/css/jqfontselector.css
index eb7be7c..d4f9c20 100644
--- a/Allura/allura/lib/widgets/resources/css/jqfontselector.css
+++ b/Allura/allura/lib/widgets/resources/css/jqfontselector.css
@@ -1,20 +1,11 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you 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.
+/**
+* Font selector plugin
+* turns an ordinary input field into a list of web-safe fonts
+* Usage: $('select').fontSelector();
+*
+* Author     : James Carmichael
+* Website    : www.siteclick.co.uk
+* License    : MIT
 */
 ul.fontselector {
   background: white;

http://git-wip-us.apache.org/repos/asf/allura/blob/08832d27/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css b/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
index ad836f6..a07129d 100644
--- a/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
+++ b/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
@@ -1,21 +1,19 @@
 /*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you 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
+	jQuery Tags Input Plugin 1.3.3
+
+	Copyright (c) 2011 XOXCO, Inc
+
+	Documentation for this plugin lives here:
+	http://xoxco.com/clickable/jquery-tags-input
+
+	Licensed under the MIT license:
+	http://www.opensource.org/licenses/mit-license.php
+
+	ben@xoxco.com
 
-       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.
 */
+
 div.tagsinput { padding:5px; width:300px; height:100px; overflow-y: auto;}
 div.tagsinput span.tag { border: 1px solid #0077AA; -moz-border-radius:2px; -webkit-border-radius:2px;
display: block; float: left; padding: 5px; text-decoration:none; background: #eeeeff; margin-right:
5px; margin-bottom:5px;font-family: helvetica;  font-size:13px;}
 div.tagsinput span.tag:hover { background-color: #ebebeb; }

http://git-wip-us.apache.org/repos/asf/allura/blob/08832d27/Allura/allura/public/nf/css/forge/hilite.css
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/forge/hilite.css b/Allura/allura/public/nf/css/forge/hilite.css
index edd7f49..679cfe0 100644
--- a/Allura/allura/public/nf/css/forge/hilite.css
+++ b/Allura/allura/public/nf/css/forge/hilite.css
@@ -19,6 +19,11 @@
 
 .linenodiv pre, code { font-size:127% }
 .linenodiv pre { color: gray }
+
+
+/* this section generated with:
+     `pygmentize -f html -S default -a .codehilite`
+*/
 .codehilite .hll { background-color: #ffffcc }
 .codehilite  { background: #f8f8f8; }
 .codehilite .c { color: #408080; font-style: italic } /* Comment */
@@ -81,6 +86,7 @@
 .codehilite .vi { color: #19177C } /* Name.Variable.Instance */
 .codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
 
+
 .codehilite { overflow: auto; }
 .codehilite pre { margin:0; word-wrap: normal; }
 .codehilite div { margin:0; padding: 0; }

http://git-wip-us.apache.org/repos/asf/allura/blob/08832d27/Allura/allura/public/nf/js/pb.transformie.min.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/pb.transformie.min.js b/Allura/allura/public/nf/js/pb.transformie.min.js
index 9759054..b912d94 100755
--- a/Allura/allura/public/nf/js/pb.transformie.min.js
+++ b/Allura/allura/public/nf/js/pb.transformie.min.js
@@ -1,20 +1,24 @@
 /*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you 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
+Copyright (c) 2007 Paul Bakaus, http://paulbakaus.com/
 
-         http://www.apache.org/licenses/LICENSE-2.0
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-       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.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
 */
 
 jQuery(function(){if(!jQuery.browser.msie)return;if(Number(jQuery.browser.version)>=9)return;if(Transformie.stylesheets)

http://git-wip-us.apache.org/repos/asf/allura/blob/08832d27/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 276495f..4e5a5ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -226,9 +226,12 @@ under the MIT license.  For details, see the individual files:
     Allura/allura/lib/widgets/resources/css/autocomplete.css
     Allura/allura/public/nf/css/forge/accordion.css
     Allura/allura/lib/widgets/resources/js/jqfontselector.js
+    Allura/allura/lib/widgets/resources/css/jqfontselector.css
     Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
     Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
+    Allura/allura/lib/widgets/resources/css/jquery.colorPicker.css
     Allura/allura/lib/widgets/resources/js/jquery.tagsinput.js
+    Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
     Allura/allura/public/nf/js/jquery.flot.js
     Allura/allura/public/nf/js/jquery.maxlength.min.js
     allura/public/nf/js/jquery.viewport.js
@@ -238,6 +241,9 @@ under the MIT license.  For details, see the individual files:
     Allura/allura/public/nf/css/forge/tooltipster.css
     Allura/allura/public/nf/js/jquery.tooltipster.js
 
+Transformie (https://github.com/pbakaus/transformie/), which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/pb.transformie.min.js
+
 Blueprint, which is available under the MIT license.
 For details, see Allura/allura/public/nf/css/blueprint/
 

http://git-wip-us.apache.org/repos/asf/allura/blob/08832d27/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 6fbe5bb..f90669f 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -9,6 +9,8 @@
 Allura/allura/etc/mime.types
 Allura/allura/lib/AsciiDammit.py
 Allura/allura/lib/widgets/resources/css/autocomplete.css
+Allura/allura/lib/widgets/resources/css/jqfontselector.css
+Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
 Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
 Allura/allura/lib/widgets/resources/css/simplemde.min.css
 Allura/allura/lib/widgets/resources/js/jqfontselector.js


Mime
View raw message