X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fdocs%2Flicense.html;h=620a3e68e6be2fd5aa5a46d5ea8c4b4ba08210f2;hb=9acb9e7dea89da6d54617c54a1a3e958a84cba61;hp=fc3da6913cf67b4dfd6b42167c49eaec4c7549f3;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index fc3da6913..620a3e68e 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -6,7 +6,7 @@
 
 <P>
 
-Copyright &copy; 2005-2009 Freeside Internet Services, Inc.<BR>
+Copyright &copy; 2005-2017 Freeside Internet Services, Inc.<BR>
 Copyright &copy; 2000-2005 Ivan Kohler<BR>
 Copyright &copy; 1999 Silicon Interactive Software Design<BR>
 All rights reserved<BR>
@@ -30,10 +30,10 @@ All rights reserved<BR>
 
 <P>
     At your option, you may also redistribute and/or modify the files in the
-    fs_selfservice/ directory (but not the rest of the software) under the
-    terms of the GNU General Public License as published by the Free Software
-    Foundation, either version 3 of the License, or (at your option) any later
-    version.
+    fs_selfservice/ and ng_selfservice/ directories (but not the rest of the
+    software) under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
 
 <P>
     At your option, you may also redistribute and/or modify the
@@ -42,6 +42,7 @@ All rights reserved<BR>
     published by the Free Software Foundation, either version 3 of the License,
     or (at your option) any later version.
 
+
 <!--entire other packages-->
 
 <P>
@@ -52,12 +53,17 @@ Request Tracker software in this case to be "merely aggregated" with Freeside,
 and not a "combined work", and as such Request Tracker is distributed only
 under the original GPLv2 license.
 
+<P>
+Contains "Torrus" <http://www.torrus.org/> from Stanislav Sinyagin / K-Open
+GmbH, licensed under the terms of the GNU GPL.
+
+
 <!--important widgets or other "whole" bits-->
 
 <P>
 Latex invoice template based on a template from eBills
 <http://ebills.sourceforge.net/> by Mark Asplen-Taylor <mark@asplen.co.uk>,
-licensed under the terms fo the GNU GPL.
+licensed under the terms of the GNU GPL.
 
 <P>
 Contains "JS Calendar" <http://dynarch.com/mishoo/calendar.epl>
@@ -71,6 +77,7 @@ the GNU GPL.
 Contains XMenu <http://webfx.eae.net/dhtml/xmenu/xmenu.html>
 by Erik Arvidsson, licensed under the terms of the GNU GPL.
 
+
 <!--RT add-ons-->
 
 <P>
@@ -82,6 +89,7 @@ Contains "RTx::Statistics Package"
 Contains "RTx::WebCronTool" <http://search.cpan.org/dist/RTx-WebCronTool/> from
 Audrey Tang, licensed under the same terms as Perl (GPL/Artistic).
 
+
 <!--libraries-->
 
 <P>
@@ -104,6 +112,43 @@ Perl backend version &copy; 2005 Nathan Schmidt
 Contains code derived from eps2png by Johan Vromans, licensed under the same
 terms as Perl (GPL/Artistic).
 
+<P>
+Contains code derived from HTML::GoogleMapsV3 by David Peters, licensed under
+the same terms as Perl (GPL/Artistic).
+
+<P>
+Contains the Masked Input JavaScript library by Kendall Conrad, licensed under
+a <a href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons 
+Attribution-ShareAlike 3.0 United States</a> license.
+
+<P>
+Contains the jQuery library <http://jquery.com/> by the jQuery Foundation and
+other contributors, licensed under the terms of the MIT license.
+
+<P>
+Contains the Spectrum No Hassle jQuery Colorpicker by Brian Grinstead, licensed
+under the terms of the MIT license.
+
+<P>
+Contains the XRegExp library by Steven Levithan, licensed under the terms
+of the MIT license.
+
+<<<<<<< HEAD
+=======
+<P>
+Contains the Google Maps Longitude and Latitude Picker, by Richard Dancsi,
+licensed under the terms of the MIT license.
+
+<P>
+Contains js-cookie by Klaus Hartl, Fagner Brack and contributors, licensed
+under the terms of the MIT license.
+
+<P>
+Contains the form validation Jquery plugin jquery-validation 
+<a href="https://github.com/jquery-validation/jquery-validation/blob/master/LICENSE.md"> by Jörn Zaefferer, 
+licensed under the terms of MIT License.</a>
+
+>>>>>>> f650b4e... RT# 21110, Updated files to use jquery-validate jquery plugin.  This allows for field validation instead of just form validation.  Also updated footer so it does not use experimental keys on scalar.  Dereferenced hash ref prior to using keys.
 <!-- artwork -->
 
 <P>
@@ -116,5 +161,11 @@ Contains icons from
 by Mark James, licensed under the terms of the Creative Commons Attribution
 2.5 License.
 
+<P>
+Includes icon from 
+http://www.iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-document-edit-icon.html
+licensed under GNU Lesser General Public License
+</P>
+
 </BODY>
 </HTML>