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/05/31 20:59:35 UTC

[24/52] [abbrv] incubator-trafficcontrol git commit: updates main TC license file

updates main TC license file

(cherry picked from commit d82c665902239764b9819fd5f9763fe250db9492)


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0d978471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0d978471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0d978471

Branch: refs/heads/1.8.x
Commit: 0d978471df89837723ba625ed4af9eb777cd8268
Parents: 0b7ba51
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Jan 24 11:52:52 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 11:57:31 2017 -0700

----------------------------------------------------------------------
 LICENSE | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0d978471/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 1a16fc8..0625f9f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -334,6 +334,31 @@ For the ng-map component:
  * Copyright (c) 2014, 2015, 1016 Allen Kim
  */
 
+For the angular-loading-bar component:
+@traffic_ops/experimental/ui/app/src/styles/loading.scss
+@traffic_portal/app/src/styles/loading.scss
+
+/**
+ * angular-loading-bar v0.4.2
+ * https://chieffancypants.github.io/angular-loading-bar
+ * Copyright (c) 2014 Wes Cruver
+ * License: MIT
+ */
+
+https://github.com/chieffancypants/angular-loading-bar/blob/master/LICENSE
+
+For the gentella admin theme:
+@traffic_ops/experimental/ui/app/src/styles/theme.scss
+
+/**
+ * gentelella v1.3.0
+ * https://colorlib.com/polygon/gentelella/index.html
+ * Copyright (c) 2016 Aigars Silkalns & Colorlib
+ * License: MIT
+ */
+
+https://github.com/puikinsh/gentelella/blob/master/LICENSE.txt
+
 For the underscore component:
 @traffic_ops/experimental/ui/app/src/assets/js/underscore-min_1.8.3.js
 
@@ -529,13 +554,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 */
 
-    For the angular-loading-bar component:
-
-    /*!
-     * angular-loading-bar v0.4.2
-     * https://chieffancypants.github.io/angular-loading-bar
-     * Copyright (c) 2014 Wes Cruver
-     * License: MIT
-     */
-
-    https://github.com/chieffancypants/angular-loading-bar/blob/master/LICENSE