Author: kwright
Date: Fri Mar 24 12:41:00 2017
New Revision: 1788431
URL: http://svn.apache.org/viewvc?rev=1788431&view=rev
Log:
Add slimscroll
Modified:
manifoldcf/branches/CONNECTORS-1196-3/LICENSE.txt
manifoldcf/branches/CONNECTORS-1196-3/dist-license/LICENSE.txt
Modified: manifoldcf/branches/CONNECTORS-1196-3/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/LICENSE.txt?rev=1788431&r1=1788430&r2=1788431&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-3/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1196-3/LICENSE.txt Fri Mar 24 12:41:00 2017
@@ -279,4 +279,34 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
-the terms above.
\ No newline at end of file
+the terms above.
+
+==========================================================================
+The ManifoldCF UI contains files from the "jQuery-slimScroll" project.
+A dual license (MIT and GPL) applies to jQuery
(https://github.com/rochal/jQuery-slimScroll);
+we distribute under the terms of the MIT license:
+--------------------------------------------------------------------------
+
+The MIT License (MIT)
+
+Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+
+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.
+
Modified: manifoldcf/branches/CONNECTORS-1196-3/dist-license/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/dist-license/LICENSE.txt?rev=1788431&r1=1788430&r2=1788431&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-3/dist-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1196-3/dist-license/LICENSE.txt Fri Mar 24
12:41:00 2017
@@ -2419,4 +2419,34 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
-the terms above.
\ No newline at end of file
+the terms above.
+
+==========================================================================
+The ManifoldCF UI uses components distributed by the "jQuery-slimScroll"
project.
+A dual license (MIT and GPL) applies to jQuery
(https://github.com/rochal/jQuery-slimScroll);
+we distribute under the terms of the MIT license:
+--------------------------------------------------------------------------
+
+The MIT License (MIT)
+
+Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+
+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.
+
