diff options
| author | Federico Ceratto <federico.ceratto@gmail.com> | 2016-11-23 15:49:14 +0000 |
|---|---|---|
| committer | Federico Ceratto <federico.ceratto@gmail.com> | 2016-11-23 15:49:14 +0000 |
| commit | 68141d9dac0c08e51d257feef16a79086dd8a2df (patch) | |
| tree | f4a0f5d31ed2194b5991130754b297b9c8c076e6 /web/Makefile.am | |
| parent | Release v. 1.3.0+dfsg-1 to Unstable (diff) | |
| parent | New upstream version 1.4.0+dfsg (diff) | |
| download | netdata-68141d9dac0c08e51d257feef16a79086dd8a2df.tar.xz netdata-68141d9dac0c08e51d257feef16a79086dd8a2df.zip | |
Merge tag 'upstream/1.4.0+dfsg'
Upstream version 1.4.0+dfsg
Diffstat (limited to 'web/Makefile.am')
| -rw-r--r-- | web/Makefile.am | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/web/Makefile.am b/web/Makefile.am index 0432f8a58..d0795c059 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -9,9 +9,11 @@ dist_web_DATA = \ demosites.html \ dashboard.html \ dashboard.js \ + dashboard_info.js \ dashboard.css \ dashboard.slate.css \ favicon.ico \ + goto-host-from-alarm.html \ index.html \ netdata-swagger.yaml \ netdata-swagger.json \ @@ -32,33 +34,34 @@ dist_webold_DATA = \ weblibdir=$(webdir)/lib dist_weblib_DATA = \ - lib/dygraph-combined.js \ - lib/dygraph-smooth-plotter.js \ - lib/jquery-1.12.0.min.js \ - lib/jquery.peity.min.js \ - lib/jquery.sparkline.min.js \ - lib/morris.min.js \ - lib/raphael-min.js \ - lib/jquery.easypiechart.min.js \ - lib/jquery.nanoscroller.min.js \ - lib/bootstrap.min.js \ - lib/ElementQueries.js \ - lib/ResizeSensor.js \ - lib/bootstrap-toggle.min.js \ - lib/c3.min.js \ - lib/d3.min.js \ - lib/gauge.min.js \ + lib/bootstrap-3.3.7.min.js \ + lib/bootstrap-table-1.11.0.min.js \ + lib/bootstrap-table-export-1.11.0.min.js \ + lib/bootstrap-toggle-2.2.2.min.js \ + lib/c3-0.4.11.min.js \ + lib/d3-3.5.17.min.js \ + lib/dygraph-combined-dd74404.js \ + lib/dygraph-smooth-plotter-dd74404.js \ + lib/gauge-d5260c3.min.js \ + lib/jquery-2.2.4.min.js \ + lib/jquery.easypiechart-97b5824.min.js \ + lib/jquery.nanoscroller-0.8.7.min.js \ + lib/jquery.peity-3.2.0.min.js \ + lib/jquery.sparkline-2.1.2.min.js \ + lib/morris-0.5.1.min.js \ + lib/raphael-2.2.4-min.js \ + lib/tableExport-1.6.0.min.js \ $(NULL) webcssdir=$(webdir)/css dist_webcss_DATA = \ - css/morris.css \ - css/bootstrap.min.css \ - css/bootstrap-theme.min.css \ + css/morris-0.5.1.css \ + css/bootstrap-3.3.7.min.css \ + css/bootstrap-theme-3.3.7.min.css \ css/bootstrap.slate.min.css \ + css/bootstrap-toggle-2.2.2.min.css \ css/font-awesome.min.css \ - css/bootstrap-toggle.min.css \ - css/c3.min.css \ + css/c3-0.4.11.min.css \ $(NULL) webfontsdir=$(webdir)/fonts @@ -78,7 +81,13 @@ dist_webfonts_DATA = \ webimagesdir=$(webdir)/images dist_webimages_DATA = \ + images/alert-128-orange.png \ + images/alert-128-red.png \ + images/alert-multi-size-orange.ico \ + images/alert-multi-size-red.ico \ images/animated.gif \ + images/check-mark-2-128-green.png \ + images/check-mark-2-multi-size-green.ico \ images/post.png \ images/seo-performance-16.png \ images/seo-performance-24.png \ |