You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/01/24 20:08:46 UTC
[1/2] incubator-trafficcontrol git commit: Minor license fix for the
jquery.tree component.
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master fe1f251be -> e524bce53
Minor license fix for the jquery.tree component.
Also contains text fix to remove lines with @ at the beginning, as they look like links.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/631d2b30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/631d2b30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/631d2b30
Branch: refs/heads/master
Commit: 631d2b309bf86d1168efc8c4e6b834b71e973d27
Parents: fe1f251
Author: Chris Lemmons <al...@gmail.com>
Authored: Tue Jan 24 13:03:55 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 13:07:24 2017 -0700
----------------------------------------------------------------------
LICENSE | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/631d2b30/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 0625f9f..a9fd3df 100644
--- a/LICENSE
+++ b/LICENSE
@@ -292,12 +292,12 @@ For the jMenu component:
/************************************************************************
*************************************************************************
-@Name : jMenu - jQuery Plugin
-@Revison : 2.0
-@Date : 08/2013
-@Author : ALPIXEL - (www.myjqueryplugins.com - www.alpixel.fr)
-@Support : FF, IE7, IE8, MAC Firefox, MAC Safari
-@License : Open Source - MIT License : http://www.opensource.org/licenses/mit-license.php
+Name : jMenu - jQuery Plugin
+Revison : 2.0
+Date : 08/2013
+Author : ALPIXEL - (www.myjqueryplugins.com - www.alpixel.fr)
+Support : FF, IE7, IE8, MAC Firefox, MAC Safari
+License : Open Source - MIT License : http://www.opensource.org/licenses/mit-license.php
**************************************************************************
*************************************************************************/
@@ -323,6 +323,17 @@ For the DataTables component:
* For details please refer to: http://www.datatables.net
*/
+For the jquery.tree component:
+@traffic_ops/app/public/*/jquery.tree.min.*
+
+/*
+ * Tree - jQuery Tree Widget
+ * @author Valerio Galano <v....@daredevel.com>
+ * @license MIT
+ * @see https://github.com/daredevel/jquery-tree
+ * @version 0.1
+ */
+
For the ng-map component:
@traffic_ops/experimental/ui/app/src/assets/js/ng-map_1.17.6.min.js
@@ -553,4 +564,3 @@ Several subsections of main.css are under the MIT license, as noted in the file:
For the bootstrap-progressbar component:
/*! bootstrap-progressbar v0.8.4 | Copyright (c) 2012-2014 Stephan Gro� | MIT license | http://www.minddust.com */
-
[2/2] incubator-trafficcontrol git commit: This closes #218.
Posted by da...@apache.org.
This closes #218.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e524bce5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e524bce5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e524bce5
Branch: refs/heads/master
Commit: e524bce53c48a13e1953bcf2b379fd1d2cb4c21e
Parents: 631d2b3
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Jan 24 13:07:46 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 13:07:46 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------