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 18:57:00 UTC
[1/2] incubator-trafficcontrol git commit: updates main TC license
file
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 9fd1da9c7 -> fe1f251be
updates main TC license file
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d82c6659
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d82c6659
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d82c6659
Branch: refs/heads/master
Commit: d82c665902239764b9819fd5f9763fe250db9492
Parents: 9fd1da9
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:56:00 2017 -0700
----------------------------------------------------------------------
LICENSE | 35 +++++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d82c6659/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
[2/2] incubator-trafficcontrol git commit: This closes #217.
Posted by da...@apache.org.
This closes #217.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fe1f251b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fe1f251b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fe1f251b
Branch: refs/heads/master
Commit: fe1f251bea8d9b5d8343faeb972ceded4689d6fc
Parents: d82c665
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Jan 24 11:56:18 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 11:56:18 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------