Merge branch 'highcharts_to_d3'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/004272b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/004272b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/004272b1 Branch: refs/heads/master Commit: 004272b1513bedc5e399e439b9391b73a9b86268 Parents: 7c0f837 0a46008 Author: Bolke de Bruin <bo...@xs4all.nl> Authored: Mon Jun 20 15:37:10 2016 +0200 Committer: Bolke de Bruin <bo...@xs4all.nl> Committed: Mon Jun 20 15:37:10 2016 +0200 ---------------------------------------------------------------------- ` | 2347 ++++ airflow/bin/airflow | 13 + airflow/executors/base_executor.py | 14 + airflow/executors/celery_executor.py | 14 + airflow/hooks/__init__.py | 2 +- airflow/hooks/dbapi_hook.py | 1 - airflow/hooks/jdbc_hook.py | 3 +- airflow/hooks/oracle_hook.py | 1 + airflow/www/app.py | 4 +- airflow/www/blueprints.py | 6 - airflow/www/static/d3.tip.v0.6.3.js | 280 + airflow/www/static/d3.v3.min.js | 10 +- airflow/www/static/gantt-chart-d3v2.js | 247 + airflow/www/static/gantt.css | 38 + airflow/www/static/highcharts-more.js | 53 - airflow/www/static/highcharts.js | 308 - airflow/www/static/nv.d3.css | 769 ++ airflow/www/static/nv.d3.js | 14241 ++++++++++++++++++++ airflow/www/static/nvd3.tar.gz | Bin 0 -> 328377 bytes airflow/www/templates/airflow/chart.html | 37 +- airflow/www/templates/airflow/dag.html | 4 +- airflow/www/templates/airflow/gantt.html | 86 +- airflow/www/templates/airflow/highchart.html | 183 - airflow/www/templates/airflow/nvd3.html | 175 + airflow/www/utils.py | 11 +- airflow/www/views.py | 352 +- setup.py | 23 +- tests/core.py | 19 - 28 files changed, 18315 insertions(+), 926 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/004272b1/tests/core.py ----------------------------------------------------------------------
