You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2021/02/04 00:50:37 UTC
[trafficcontrol] branch master updated: Update flot libraries to
earliest stable version (#5132)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new d26391d Update flot libraries to earliest stable version (#5132)
d26391d is described below
commit d26391deaf9d759376579acbae2fc8662a5a06f8
Author: Steve Hamrick <sh...@users.noreply.github.com>
AuthorDate: Wed Feb 3 17:50:18 2021 -0700
Update flot libraries to earliest stable version (#5132)
* Update flot
* Dont commit these
* Forgot file
* Add changelog
---
CHANGELOG.md | 1 +
traffic_portal/bower.json | 4 ++--
traffic_portal/grunt/browserify.js | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c13daaa..66f18fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
### Changed
- Refactored the Traffic Ops Go client internals so that all public methods have a consistent behavior/implementation
- Pinned external actions used by Documentation Build and TR Unit Tests workflows to commit SHA-1 and the Docker image used by the Weasel workflow to a SHA-256 digest
+- Updated Flot libraries to supported versions
- [apache/trafficcontrol](https://github.com/apache/trafficcontrol) is now a Go module
## [5.0.0] - 2020-10-20
diff --git a/traffic_portal/bower.json b/traffic_portal/bower.json
index c4d7716..21d84b8 100644
--- a/traffic_portal/bower.json
+++ b/traffic_portal/bower.json
@@ -13,8 +13,8 @@
"angular-jwt": "0.0.9",
"bootstrap-sass-official": "3.3.6",
"es5-shim": "4.5.6",
- "flot": "0.8.3",
- "flot.tooltip": "0.8.7",
+ "flot": "2.1.2",
+ "flot.tooltip": "0.9.0",
"flot-axislabels": "release-2.0.1",
"font-awesome": "4.5.0",
"jquery": "2.0.0",
diff --git a/traffic_portal/grunt/browserify.js b/traffic_portal/grunt/browserify.js
index 6fc67d7..0c0dc08 100644
--- a/traffic_portal/grunt/browserify.js
+++ b/traffic_portal/grunt/browserify.js
@@ -38,10 +38,10 @@ module.exports = {
"es5-shim": './<%= globalConfig.app %>/bower_components/es5-shim/es5-shim.min.js',
"jquery": './<%= globalConfig.app %>/bower_components/jquery/jquery.min.js',
"json3": './<%= globalConfig.app %>/bower_components/json3/lib/json3.min.js',
- 'jquery-flot': './<%= globalConfig.app %>/bower_components/flot/jquery.flot.js',
- 'jquery-flot-pie': './<%= globalConfig.app %>/bower_components/flot/jquery.flot.pie.js',
- 'jquery-flot-stack': './<%= globalConfig.app %>/bower_components/flot/jquery.flot.stack.js',
- 'jquery-flot-time': './<%= globalConfig.app %>/bower_components/flot/jquery.flot.time.js',
+ 'jquery-flot': './<%= globalConfig.app %>/bower_components/flot/source/jquery.flot.js',
+ 'jquery-flot-pie': './<%= globalConfig.app %>/bower_components/flot/source/jquery.flot.pie.js',
+ 'jquery-flot-stack': './<%= globalConfig.app %>/bower_components/flot/source/jquery.flot.stack.js',
+ 'jquery-flot-time': './<%= globalConfig.app %>/bower_components/flot/source/jquery.flot.time.js',
'jquery-flot-tooltip': './<%= globalConfig.app %>/bower_components/flot.tooltip/js/jquery.flot.tooltip.min.js',
'jquery-flot-axislabels': './<%= globalConfig.app %>/bower_components/flot-axislabels/jquery.flot.axislabels.js',
},