Update v8 branch to v8-beta.2 (#4149 )

* Migrate Parameters component to React (#4006) * Start Parameters Migration * Add dirtyCount * Use workaround with setState * Apply Changes * Add EditSettingsDialog * Add Cmd/Ctrl + Enter behavior * Remove isApplying * Delete Angular version of parameters * Update tests * Remove angular stuff * Update jest * Drag placeholder * Update events * Use old button styling and move css * Reviewing code * Add parameter rearrange test * Add Parameter Settings title change test * Update Parameter Settings button styling * Move parameter url logic back to Parameters * Disable url update when query is new * Styling changes (#4019) * Ran's title width styling * Update drag test * Improve sizing for Number inputs Co-Authored-By: Ran Byron <ranbena@gmail.com> * Fix issue with dragged parameter wrapping Co-Authored-By: Ran Byron <ranbena@gmail.com> * Don't reevaluate dirtyParamCount * Allow multiple values :) * Fix parameter alignments * Fix Select width on search * Update client/app/components/Parameters.less Co-Authored-By: Ran Byron <ranbena@gmail.com> * Humanize param.name * Make sure angular updates Execute disabled status * Add more flake8 tests and fail build if any test fails (#4055) * Add more flake8 tests and fail build if any test fails Run all flake8 E9xx + F63x + F7xx + F82x tests. * long = long in Python 2 * Fix: MySQL connections without SSL are failing (#4090) * Move connection logic into a single method & make sure not to pass ssl value if not used. * Remove wildcard import and format file. * Removed redash-newstyle.less (#4017) * Make sure we always pass a list to _get_column_lists (#4095) (some data sources might return None as the columns list) * [Data Sources] Add: Azure Data Explorer (Kusto) query runner (#4091) * [Data Sources] Add: Azure Data Explorer (Kusto) query runner * CodeClimate fixes * Remove TODO * Fixed configuration properties names for Azure Kusto * Azure Kusto: get_schema in one query * azure-kusto-data update to 0.0.32 * Add Kusto to the default query runners list * [Qubole] - Adding support to process Quantum query types. (#4066) * [Qubole] - Adding support to process Quantum query types. Quantum is a serverless interactive service that offers direct SQL access to user's data lake. Changes are made to accept `quantum` query type from user which makes `Cluster Label` as optional. * -Making quantum as defult query. -Dictionary safe access to connection parmeters * keeping pep8 standards * Maintainig pep8 std * Use latest version of qds-sdk * Use qds-sdk v1.13.0 * Use qds-sdk v1.12.0 * Use qds-sdk v1.13.0 * Updating SDK with verified version * hive as default query type * qds-sdk : Locking most recent release version * qds-sdk : Locking recent release version * falling back to original version of qds-sdk * Dashboard: when updating parameters, run only relevant queries (#3804) * refresh only affected queries in dashboard when parameters are changed * rename pendingParameters to updatedParameters * select which widgets to update according to their mapping as a dashboard-level parameter * use lodash's include * Migrate with SQL statements. (#4105) * Update badge in README.md to link to CircleCI (#4104) * Update README.md * Update README.md * Update README.md Co-Authored-By: Ran Byron <ranbena@gmail.com> * Update README.md * Fix widget bottom element alignment (#4110) * Fix: allow users with view only acces to use the queries in Query Results (#4112) * Fix: allow users with view only acces to access the queries * Add tests * Update error message * Update error message. Take 2 * Fix Dropdown parameter options appearing behind Dialog (#4109) * Add ability to use Ant's Table loading property when using ItemsTable (#4117) * Display data source icon in query editor (#4119) * Move annotation logic into Query Runner (#4113) * Code formatting * Move annotation logic into query runner, so it can be overriden in the query runner. * Add mixin to __all__ * Switch to flag instead of mixin * Feature (Redshift): option to set query group for adhoc/scheduled queries (#4114) * Add scheduled status to query job metadata. * Add: option to set query group for adhoc/scheduled Redshift queries * Scheduled might not be set for already enqueued queries. * Fix number param value normlization (#4116) * Use ng-src for data source icons (#4123) * hive_ds: show a user friendly error message when possible (#4121) * Update botocore, to get pass pip warning (#4122) * Widget table scroll-x visible (#4101) * Table viz horizontal scroll made visible * Added tests * Fixed snapshot pre-condition * Perhaps this would trigger percy * Upgrade Sentry-SDK and enable additional integratoins (#4127) * Update sentry-sdk version * Add additional Sentry integrations * Migrate Counter visualization to React (#4106) * Migrate Counter to React: Renderer * Migrate Counter to React: Editor * Cleanup * Review and fix rows indexing algorithm * Counter not properly scaled in editor * Fix wrong label for/input id pair * Tests * Tests * Fix vendor prefixes * Remove unnecessary useEffect dependencies * Update tests * Fix Percy snapshot names * Sync botocor eversions across requirements files. (#4128) * Decrease size of widget pagination (#4120) * Added tests * Perhaps this would trigger percy * Decrease size of widget pagination * Removed unused attr * Updated tests * Allow the user to decide how to handle null values in charts (#4071) * getredash/redash#2629 Refactor Chart visualization, add option for handling NULL values (keep/convert to 0.0) * Handle null values in line/area stacking code; some cleanup * Handle edge case: line/area stacking when last value of one of series is missing * Mjnor update to line/area stacking code * Fix line/area normalize to percents feature * Unit tests * Refine tests; add tests for prepareLayout function * Tests for prepareData (heatmap) function * Tests for prepareData (pie) function * Tests for prepareData (bar, line, area) function * Tests for prepareData (scatter, bubble) function * Tests for prepareData (box) function * Remove unused file * Alerts: Add more condition comparison options (#4134) * getredash/redash#4132 Add more condition comparison options * Add arguments to fallback lambda * Remove duplicate messages method (#4131) * Migrate Chart visualization to React Part 1: Renderer (#4130) * Migrate Chart visualization: Renderer * Refine PlotlyChart component; move stylesheets to visualization's folder * Migrate Custom JS Chart to React * Cleanup * Add jsconfig settings with '@' webpack alias (#4135) * Counter Editor: move components to own files (#4138) * Allow users to share aggregated usage information with us (#4108) * Initial commit of BeaconConsent component * Add comment about being able to change setting * Use <Text> correctly * Final version of consent screen * Show beacon consent message on homepage only if it wasn't enabled already. * Add consent setting to organization settings screen. * Add support for custom message in OrgSetting.save. * Implmenet consent saving. * If consent given, send extra data * Add HelpTrigger * Make CodeClimate happy * Wrap everything with DynamicComponent * CHANGELOG for V8-beta. (#4057) * CHANGELOG for V8-beta. * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Bug fix: Query view doesn't sync parameters when selecting and deleting (#4146) * Query Snippets: Use onClick instead of link for 'Click here' option (#4144) * Snippets: Don't change url when not needed * Revert "Snippets: Don't change url when not needed" This reverts commit 2f346f3bb4. * Query Snippets: use onClick instead of link * Color picker component (#4136) * Widget filters overlapped by visualization (#4137) * Fix: widget filters overlapped by visualization * Fix tests * Fix tests * CHANGELOG for v8.0.0-beta.2 (#4145) * Stop building tarballs. * Update version reference. * CHANGELOG for 8.0.0-beta.2
Fix clickhouse password leak (#4078 )
2025-12-19 17:37:19 -05:00 · 2019-09-18 12:33:45 +03:00 · 2019-08-18 11:05:41 +03:00 · 2019-08-16 19:27:24 +03:00 · 2019-08-15 15:54:32 +03:00 · 2019-08-15 15:18:40 +03:00
798 changed files with 47136 additions and 23174 deletions
--- a/.circleci/Dockerfile.cypress
+++ b/.circleci/Dockerfile.cypress
@@ -3,9 +3,10 @@ FROM cypress/browsers:chrome67
 ENV APP /usr/src/app
 WORKDIR $APP

-RUN npm install --no-save cypress @percy/cypress > /dev/null
+COPY package.json $APP/package.json
+RUN npm run cypress:install > /dev/null

-COPY cypress $APP/cypress
+COPY client/cypress $APP/client/cypress
 COPY cypress.json $APP/cypress.json

 RUN ./node_modules/.bin/cypress verify
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,20 +45,34 @@ jobs:
          path: /tmp/test-results
      - store_artifacts:
          path: coverage.xml
+  frontend-lint:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - run: mkdir -p /tmp/test-results/eslint
+      - run: npm install
+      - run: npm run lint:ci
+      - store_test_results:
+          path: /tmp/test-results
  frontend-unit-tests:
    docker:
      - image: circleci/node:8
    steps:
      - checkout
      - run: sudo apt install python-pip
+      - run: sudo pip install -r requirements_bundles.txt
      - run: npm install
      - run: npm run bundle
      - run: npm test
+      - run: npm run lint
  frontend-e2e-tests:
    environment:
      COMPOSE_FILE: .circleci/docker-compose.cypress.yml
      COMPOSE_PROJECT_NAME: cypress
-      PERCY_TOKEN_ENCODED: MWM3OGUzNzk4ZWQ2NTE4YTBhMDAwZDNiNWE1Nzc4ZjEzZjYyMzY1MjE0NjY0NDRiOGE5ODc5ZGYzYTU4ZmE4NQ==
+      PERCY_TOKEN_ENCODED: ZGRiY2ZmZDQ0OTdjMzM5ZWE0ZGQzNTZiOWNkMDRjOTk4Zjg0ZjMxMWRmMDZiM2RjOTYxNDZhOGExMjI4ZDE3MA==
+      CYPRESS_PROJECT_ID_ENCODED: OTI0Y2th
+      CYPRESS_RECORD_KEY_ENCODED: YzA1OTIxMTUtYTA1Yy00NzQ2LWEyMDMtZmZjMDgwZGI2ODgx
    docker:
      - image: circleci/node:8
    steps:
@@ -72,33 +86,21 @@ jobs:
          name: Setup Redash server
          command: |
            npm run cypress start
-            docker-compose run cypress node ./cypress/cypress.js db-seed
+            docker-compose run cypress npm run cypress db-seed
      - run:
          name: Execute Cypress tests
          command: npm run cypress run-ci
-  build-tarball:
+  build-docker-image:
    docker:
      - image: circleci/node:8
-    steps:
-      - checkout
-      - run: sudo apt install python-pip
-      - run: npm install
-      - run: .circleci/update_version
-      - run: npm run bundle
-      - run: npm run build
-      - run: .circleci/pack
-      - store_artifacts:
-          path: /tmp/artifacts/
-  build-docker-image:
-    docker:
-      - image: circleci/buildpack-deps:xenial
    steps:
      - setup_remote_docker
      - checkout
+      - run: sudo apt install python-pip
+      - run: sudo pip install -r requirements_bundles.txt
      - run: .circleci/update_version
-      - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
-      - run: docker build -t redash/redash:$(.circleci/docker_tag) .
-      - run: docker push redash/redash:$(.circleci/docker_tag)
+      - run: npm run bundle
+      - run: .circleci/docker_build
 workflows:
  version: 2
  build:
@@ -106,24 +108,21 @@ workflows:
      - python-flake8-tests
      - legacy-python-flake8-tests
      - backend-unit-tests
-      - frontend-unit-tests
-      - frontend-e2e-tests
-      - build-tarball:
+      - frontend-lint
+      - frontend-unit-tests:
          requires:
-             - backend-unit-tests
-           filters:
-             tags:
-               only: /v[0-9]+(\.[0-9\-a-z]+)*/
-             branches:
-               only:
-                 - master
-                 - /release\/.*/
+            - frontend-lint
+      - frontend-e2e-tests:
+          requires:
+            - frontend-lint
      - build-docker-image:
          requires:
            - backend-unit-tests
+            - frontend-unit-tests
+            - frontend-e2e-tests
          filters:
            branches:
              only:
                - master
-                 - preview-build
+                - preview-image
                - /release\/.*/
--- a/.circleci/docker-compose.cypress.yml
+++ b/.circleci/docker-compose.cypress.yml
@@ -13,6 +13,7 @@ services:
      REDASH_LOG_LEVEL: "INFO"
      REDASH_REDIS_URL: "redis://redis:6379/0"
      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+      REDASH_RATELIMIT_ENABLED: "false"
  worker:
    build: ../
    command: scheduler
@@ -23,12 +24,12 @@ services:
      REDASH_LOG_LEVEL: "INFO"
      REDASH_REDIS_URL: "redis://redis:6379/0"
      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
-      QUEUES: "queries,scheduled_queries,celery"
+      QUEUES: "queries,scheduled_queries,celery,schemas"
      WORKERS_COUNT: 2
  cypress:
    build:
      context: ../
-      dockerfile: Dockerfile.cypress
+      dockerfile: .circleci/Dockerfile.cypress
    depends_on:
      - server
      - worker
@@ -38,6 +39,12 @@ services:
      PERCY_BRANCH: ${CIRCLE_BRANCH}
      PERCY_COMMIT: ${CIRCLE_SHA1}
      PERCY_PULL_REQUEST: ${CIRCLE_PR_NUMBER}
+      COMMIT_INFO_BRANCH: ${CIRCLE_BRANCH}
+      COMMIT_INFO_AUTHOR: ${CIRCLE_USERNAME}
+      COMMIT_INFO_SHA: ${CIRCLE_SHA1}
+      COMMIT_INFO_REMOTE: ${CIRCLE_REPOSITORY_URL}
+      CYPRESS_PROJECT_ID: ${CYPRESS_PROJECT_ID}
+      CYPRESS_RECORD_KEY: ${CYPRESS_RECORD_KEY}
  redis:
    image: redis:3.0-alpine
    restart: unless-stopped
--- a/.circleci/docker_build
+++ b/.circleci/docker_build
@@ -0,0 +1,17 @@
+#!/bin/bash
+VERSION=$(jq -r .version package.json)
+VERSION_TAG=$VERSION.b$CIRCLE_BUILD_NUM
+
+docker login -u $DOCKER_USER -p $DOCKER_PASS
+
+if [ $CIRCLE_BRANCH = master ] || [ $CIRCLE_BRANCH = preview-image ]
+then
+    docker build -t redash/redash:preview -t redash/preview:$VERSION_TAG .
+    docker push redash/redash:preview
+    docker push redash/preview:$VERSION_TAG
+else
+    docker build -t redash/redash:$VERSION_TAG .
+    docker push redash/redash:$VERSION_TAG
+fi
+
+echo "Built: $VERSION_TAG"
--- a/.circleci/docker_tag
+++ b/.circleci/docker_tag
@@ -1,10 +0,0 @@
-#!/bin/bash
-if [ $CIRCLE_BRANCH = master ] || [ $CIRCLE_BRANCH = preview-build ]
-then
-    FULL_VERSION='preview'
-else
-    VERSION=$(jq -r .version package.json)
-    FULL_VERSION=$VERSION.b$CIRCLE_BUILD_NUM
-fi
-
-echo $FULL_VERSION
--- a/.circleci/pack
+++ b/.circleci/pack
@@ -6,4 +6,4 @@ FILENAME=$NAME.$FULL_VERSION.tar.gz

 mkdir -p /tmp/artifacts/

-tar -zcv -f /tmp/artifacts/$FILENAME --exclude="optipng*" --exclude=".git*" --exclude="*.pyc" --exclude="*.pyo" --exclude="venv" --exclude="node_modules" *
+tar -zcv -f /tmp/artifacts/$FILENAME --exclude=".git" --exclude="optipng*" --exclude="cypress" --exclude="*.pyc" --exclude="*.pyo" --exclude="venv" *
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,22 +1,32 @@
-engines:
+version: "2"
+checks:
+  complex-logic:
+    enabled: false
+  file-lines:
+    enabled: false
+  method-complexity:
+    enabled: false
+  method-count:
+    enabled: false
+  method-lines:
+    config:
+      threshold: 100
+  nested-control-flow:
+    enabled: false
+  identical-code:
+    enabled: false
+  similar-code:
+    enabled: false
+plugins:
  pep8:
    enabled: true
  eslint:
-    enabled: true
-    channel: "eslint-3"
-    config:
-      config: client/.eslintrc.js
-    checks:
-      import/no-unresolved:
    enabled: false
-ratings:
-  paths:
-  - "redash/**/*.py"
-  - "client/**/*.js"
-exclude_paths:
- tests/**/*.py
- migrations/**/*.py
- old_migrations/**/*.py
- setup/**/*
- bin/**/*
-
+exclude_patterns:
+  - "tests/**/*.py"
+  - "migrations/**/*.py"
+  - "setup/**/*"
+  - "bin/**/*"
+  - "**/node_modules/"
+  - "client/dist/"
+  - "**/*.pyc"
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,12 @@ client/dist/
 node_modules/
 .tmp/
 .venv/
+venv/
 .git/
+/.codeclimate.yml
+/.coverage
+/coverage.xml
+/.circleci/
+/.github/
+/netlify.toml
+/setup/
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,6 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4

-[*.{js,css,html}]
+[*.{js,jsx,css,less,html}]
 indent_style = space
 indent_size = 2
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+## What type of PR is this? (check all applicable)
+<!-- Please leave only what's applicable -->
+
+- [ ] Refactor
+- [ ] Feature
+- [ ] Bug Fix
+- [ ] New Query Runner (Data Source)
+- [ ] New Alert Destination
+- [ ] Other
+
+## Description
+
+## Related Tickets & Documents
+
+## Mobile & Desktop Screenshots/Recordings (if there are UI changes)
--- a/.github/support.yml
+++ b/.github/support.yml
@@ -0,0 +1,23 @@
+# Configuration for Support Requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: Support Question
+
+# Comment to post on issues marked as support requests, `{issue-author}` is an
+# optional placeholder. Set to `false` to disable
+supportComment: >
+  :wave: @{issue-author}, we use the issue tracker exclusively for bug reports
+  and planned work. However, this issue appears to be a support request.
+  Please use [our forum](https://discuss.redash.io) to get help.
+
+# Close issues marked as support requests
+close: true
+
+# Lock issues marked as support requests
+lock: false
+
+# Assign `off-topic` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Repository to extend settings from
+# _extends: repo
--- a/.github/weekly-digest.yml
+++ b/.github/weekly-digest.yml
@@ -0,0 +1,7 @@
+# Configuration for weekly-digest - https://github.com/apps/weekly-digest
+publishDay: mon
+canPublishIssues: true
+canPublishPullRequests: true
+canPublishContributors: true
+canPublishStargazers: true
+canPublishCommits: true
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,5 @@ node_modules
 .sass-cache
 npm-debug.log

-cypress/screenshots
-cypress/videos
+client/cypress/screenshots
+client/cypress/videos
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,196 @@
 # Change Log

+## v8.0.0-beta.2 - 2019-09-16
+
+This is an update to the previous beta release, which includes:
+
+* Add options for users to share anonymous usage information with us (see [docs](https://redash.io/help/open-source/admin-guide/usage-data) for details).
+* Visualizations:
+    - Allow the user to decide how to handle null values in charts.
+* Upgrade Sentry-SDK to latest version.
+* Make horizontal table scroll visible in dashboard widgets without scrolling.
+* Data Sources:
+    * Add support for Azure Data Explorer (Kusto).
+    * MySQL: fix connections without SSL configuration failing.
+    * Amazon Redshift: option to set query group for adhoc/scheduled queries.
+    * Hive: make error message more friendly.
+    * Qubole: add support to run Quantum queries.
+* Display data source icon in query editor.
+* Fix: allow users with view only acces to use the queries in Query Results
+* Dashboard: when updating parameters refersh only widgets that use those parameters.
+
+This release had contributions from 12 people: @arikfr, @cclauss, @gabrieldutra, @justinclift, @kravets-levko, @ranbena, @rauchy, @sandeepV2, @shinsuke-nara, @spacentropy, @sphenlee, @swfz.
+
+
+## v8.0.0-beta - 2019-08-18
+
+After months of being heads down with hard work, it's finally time to wrap up the V8 release 🤩 This release includes many long awaited improvements to parameters, UX improvements, further React migration and other changes, fixes and improvements.
+
+While this version is already running on the hosted platform to make sure it's stable, we're excited to put this in the hands of our Open Source users.
+
+Starting from this release we will no longer build a tarball distribution of the codebase and recommend everyone to switch over to using our Docker images. We're planning on dropping Python 2 support towards its EOL this year and switching over to the Docker image will make this transition much simpler.
+
+This release was made possible by contributions from over 40 people: @aidarbek, @AntonZarutsky, @ariarijp, @arikfr, @combineads, @deecay, @fmy, @gabrieldutra, @guwenqing, @guyco33, @ialeinikov, @Jakdaw, @jezdez, @justinclift, @k-tomoyasu, @katty0324, @koooge, @kravets-levko, @ktmud, @KumanoTanaka, @kyoshidajp, @nason, @oldPadavan, @openjck, @osule, @otsaloma, @ranbena, @rauchy, @rueian, @sekiyama58, @shinsuke-nara, @taminif, @The-Alchemist, @vv-p, @washort, @wudi-ayuan, @ygrishaev, @yoavbls, @yoshiken, @yusukegoto and the support of over 500 organizations who subscribed to our hosted version and by that sponsor the team's work.
+
+### Parameters
+
+- Parameter UI improvements:
+    - Support for multi-select in dropdown (and query dropdown) parameters.
+    - Support for dynamic values in date and date-range parameters.
+    - Search dropdown parameter values.
+    - New UX for applying parameter changes in queries and dashboards.
+- Allow using Safe Parameters in visualization embeds and public dashboards. Safe Parameters are any parameter type except for the a text parameter (dropdowns are safe).
+
+### Data Sources
+
+- New Data Sources: Couchbase, Phoenix and Dgraph.
+- New JSON data source (and deprecated old URL data source).
+- Snowflake: update connector to latest version.
+- PostgreSQL: show only accessible tables in schema.
+- BigQuery:
+    - Correctly handle NaN values.
+    - Treat repeated fields as rrays.
+    - [BigQuery] Fix: in some queries there is no mode field
+- DynamoDB:
+    - Support for Unicode in queries.
+    - Safe loading of schema.
+- Rockset: better handling of query errors.
+- Google Sheets:
+    - Support for Team Drive.
+    - Friendlier error message in case of an API error and more reliable test connection.
+- MySQL: 
+    - Support for calling Stored Procedures and better handling of query cancellation.
+    - Switch to using `mysqlclient` (a maintained fork of `Python-MySQL`).
+- MongoDB: Support serializing Decimal128 values.
+- Presto: support for passwords in connection settings.
+- Amazon Athena: allow to specify custom work group.
+- Query Results: querying a column with a dictionary or array fails
+- Clickhouse: make sure we don't show password in error messages.
+- Enable Cassandra support by default.
+
+### Visualizations
+
+- Charts:
+    - Fix: legend overlapping chart on small screens.
+    - Fix: Pie chart not rendering when series doesn't exist in options.
+    - Pie Chart: add option to set direction of slices.
+- WordCloud: rewritten to support new options (provide frequency in query, limits), scale when resizing, handle long words and more.
+- Pivot Table: support hiding totals.
+- Counters: apply formatting to target value.
+- Maps:
+    - Ability to customize marker icon and color.
+    - Customization options for Choropleth maps.
+- New Visualization: Details View.
+
+### **UX**
+
+- Replace blank screen with a loading indicator when the application is doing its first load.
+- Multiple improvements to dashboards editing: auto-save, grid markings and better refresh indicator.
+- Admin can now edit user's groups from the user page.
+- Add keyboard shortcut (Ctrl/Cmd+Shift+F) to trigger query formatting.
+
+### API
+
+- Query Result API response minimized to only required fields when called with a non user API key.
+- Prefer API key over cookies in authentication.
+- User can now regenerate Query API Key.
+
+### Other Changes
+
+- Sends CSP headers to prevent various kinds of security attacks via the browser. Might break unusual usages and embeds of Redash.
+- New Failed Scheduled Queries email report (can be enabled from organization settings screen).
+- Deprecated HipChat Alert Destination.
+- Add options to hide different parts of a Visualization embed UI (parameters, title, link to query).
+- Support multi-byte search for query names and descriptions (needs to be enabled in Organization settings screen).
+- CSV query results download: correctly serialize booleans and date values.
+- Dashboard filters now collect values from all widgets with the same filter.
+- Support for custom message and description in alert notifications (currently disabled behind a feature flag until we improve the alert UX).
+
+### Bug Fixes
+
+- Fix: adding widget to dashboard from a query page is broken.
+- Fix: default time format option was wrong.
+- Fix: when too many errors of a scheduled queries occur it causes an OverflowError.
+- Fix: when forking a query maintain the same visualizations order.
+
+## v7.0.0 - 2019-03-17
+
+We're trying a new format for the CHANGELOG in this release. Focusing on the bigger changes, but for whoever interested, you can see all the changes [here](https://github.com/getredash/redash/compare/v6.0.0...master).
+
+Besides all the features, bug fixes and improvements listed below we managed to convert a large portion of Redash's frontend code from Angular.js to React. You can see status in [#3071](https://github.com/getredash/redash/issues/3071).
+
+This release was made possible with the help of 34 contributors. 🙇‍♂️
+
+### Data Sources
+
+- **All data source options are now encrypted in the database.** By default the encryption uses the `REDASH_COOKIE_SECRET` value (`redash.settings.COOKIE_SECRET`), but you can specify a different value by setting the `REDASH_SECRET_KEY` environment variable value. Note that you need to set this _before_ doing the upgrade.
+- New Data Sources: Uptycs and Apache Drill.
+- Snowplow: is now enabled by default & supports region setting.
+- Elasticsearch: add support for Amazon Elasticsearch IAM authentication (with IAM profile or key/secret pair).
+- PostgreSQL: add support for serializing range values.
+- Redshift: remove duplicate column information for late-binding views.
+- Athena: load all databases (using pagination).
+- BigQuery: correctly handle temp tables with no schema field.
+- Jira (JQL): support for fetching all records with pagination.
+- Prometheus: fix schema loading and add support for query range.
+
+### In-app Help
+
+You can now open the [Knowledge Base](https://redash.io/help) inside the application. We also added a few "help triggers" in the app, that will open the Knowledge Base in context of what you're currently doing.
+
+### Parameters
+
+- **Dashboard Parameters**: We improved the flow of adding queries with parameters to dashboards and now give you full control over how parameters are mapped. You no longer have to make sure all parameters have the same name or use the `Global` checkbox. We also added new options, like keeping the parameter local to the widget or setting a static value. [Read more in our Knowledge Base →](https://redash.io/help/user-guide/querying/query-parameters#Parameter-Mapping-on-Dashboards)
+- We added server side validation of parameter values for all parameter types, except for parameters of `text` type. All validated parameter types are considered safe. When a query is using safe parameters (or no parameters at all), View Only users can refresh it.
+- Refreshing safe queries is done using the new results API endpoint, which takes only a query ID (and optionally parameter values) and does not need the query text.
+
+### Query Editor Improvements
+
+- Run only the highlighted query text: hit Execute after highlighting a portion of your query and only the selected portion will be sent to the database. This is useful for testing sub-SELECT statements and CTE's.
+- Improved auto complete: add a dot . after a table name in the query editor and auto complete will only suggest columns on that table.
+- Autosave parameter configuration changes.
+- YAML syntax support (for data sources like Yandex Metrica).
+
+### Improved Query Scheduler
+
+The Query Scheduler got a face lift and some new options: you can pick a day for a weekly schedule to run on and also set an end date after which the query will no longer execute on schedule.
+
+### Data Sources
+
+We added Apache Drill, Uptycs and a new JSON data source. Also fixed a few bugs in Athena's query runner and others.
+
+### User Management
+
+The users page got revamped with a new look and feel and few new features:
+
+- An indication when a user was last active.
+- Show if an invited user hasn't finished the setup process yet (Pending Invitations section).
+- You can now generate a new API key for users, if there's a concern it was compromised.
+
+### Admin
+
+- New Celery queues status screens, replacing the old Queries Status and better reflecting the status of running queries.
+- Make the queue name for schema refresh job configurable. The default used to be hard coded `schemas`, which is not available on all setups. Now it's `celery`.
+- The `gevent` library is installed by default, and you can now setup gunicorn to use `gevent` based workers.
+- New Docker entrypoint command to do a health check for a worker process.
+- Flask-Admin is no longer setup or supported.
+
+### Other Changes
+
+- New Alert destination: Google Hangouts Chat.
+- When downloading results from the results API it will set a user friendly filename for the downloaded file.
+- Archived Queries section added to the queries list.
+
+### Bug Fixes
+
+- Fixed: fork query does not fork tables but instead adds default table.
+- Fixed: when deleting a visualization, any widget using it was left empty on the dashboard.
+- Fixed: issues with Query Editor resizing on new versions of Chrome.
+- Fixed: issues with exporting dictionaries to Excel.
+- Fixed: Cohort visualization gets stuck when passing string values.
+- Fixed: use series name for Pie chart label.
+- Make sure Flask app created in Celery's worker process (could cause some query runners to get stuck while running queries).
+
 ## v6.0.0 - 2018-12-16

 v6.0.0 release version. Mainly includes fixes for regressions from the beta version.
@@ -8,48 +199,47 @@ This release had contributions from 5 people: @rauchy, @denisov-vlad, @arikfr, @

 ### Changed

-* #3183 Make refresh_queries less noisey in logs. @arikfr
+- #3183 Make refresh_queries less noisey in logs. @arikfr

 ### Fixed

-* #3163 Include correct version in production builds. @rauchy
-* #3161 Clickhouse: fix int() conversion error. @denisov-vlad
-* #3166 Directly using record_event task requires timestamp. @arikfr
-* #3167 Alert.evaluate failing when the column is missing. @arikfr
-* ##3162 Remove API permissions for users who have been disabled. @rauchy
-* #3171 Reject empty query name. @ariarijp
-* #3175, #3186 Fix disable error message. @rauchy, @gabrieldutra
-* #3182 [Redshift] support for schema names with dots. @arikfr
-* #3187 Safely create_app in Celery code (try to fetch current_app first). @arikfr
+- #3163 Include correct version in production builds. @rauchy
+- #3161 Clickhouse: fix int() conversion error. @denisov-vlad
+- #3166 Directly using record_event task requires timestamp. @arikfr
+- #3167 Alert.evaluate failing when the column is missing. @arikfr
+- ##3162 Remove API permissions for users who have been disabled. @rauchy
+- #3171 Reject empty query name. @ariarijp
+- #3175, #3186 Fix disable error message. @rauchy, @gabrieldutra
+- #3182 [Redshift] support for schema names with dots. @arikfr
+- #3187 Safely create_app in Celery code (try to fetch current_app first). @arikfr

 ### Other

-* #3155 Add DB Seed to Cypress and setup Percy. @gabrieldutra
-* #3180 Remove coverage from pytest terminal output. @rauchy
-
+- #3155 Add DB Seed to Cypress and setup Percy. @gabrieldutra
+- #3180 Remove coverage from pytest terminal output. @rauchy

 ## v6.0.0-beta - 2018-12-03

 This release was 2 months in the making and it is full with good stuff!

-* We have 5 new data sources: Databricks, IBM DB2, Kylin, Druid and Rockset. ⌗
-* There are fixes and improvements to 11 existing data sources (MySQL, Redshift, Postgres, MongoDB, Google BigQuery, Vertica, TreasureData, Presto, ClickHouse, Google Sheets and Google Analytics).
-* The Query Results data source can now load cached results, just use the `cached_query_` prefix instead of `query_`.
-* On the visualizations front we added a Heatmap visualization and did updated the table and counter visualizations.
-* Alerts got some fixes and a new destination: PagerDuty.
-* If the live autocomplete in the code editor annoys you, you can disable it now (although we're working to make it better, see #3092).
-* Fast queries will now load faster. 🏃‍♂️
-* We improved the layout of visualizations and content on smaller screen sizes. 📱
-* For those of you who like sharing, you can now enable the ability to share ownership of queries and dashboards and let others to edit them. Check the Settings page to enable this feature.
+- We have 5 new data sources: Databricks, IBM DB2, Kylin, Druid and Rockset. ⌗
+- There are fixes and improvements to 11 existing data sources (MySQL, Redshift, Postgres, MongoDB, Google BigQuery, Vertica, TreasureData, Presto, ClickHouse, Google Sheets and Google Analytics).
+- The Query Results data source can now load cached results, just use the `cached_query_` prefix instead of `query_`.
+- On the visualizations front we added a Heatmap visualization and did updated the table and counter visualizations.
+- Alerts got some fixes and a new destination: PagerDuty.
+- If the live autocomplete in the code editor annoys you, you can disable it now (although we're working to make it better, see #3092).
+- Fast queries will now load faster. 🏃‍♂️
+- We improved the layout of visualizations and content on smaller screen sizes. 📱
+- For those of you who like sharing, you can now enable the ability to share ownership of queries and dashboards and let others to edit them. Check the Settings page to enable this feature.

 There were also important changes to the code and infrastructure:

-* More components moved to React.
-* We switched to Webpack 4 with the help of @dmonego.
-* We upgraded to Celery 4 with the help of @emtwo, @jezdez, @mashrikt and @atharvai.
-* We started moving towards Python 3 for our backend. The first step was to make sure our code pass basic sanity tests with Flake 8, which was implemented by @cclauss.
-* We improved our testing on the frontend by adding setup for Jest tests and E2E testing using Cypress (@gabrieldutra).
-* Each pull request now gets a deploy preview using Netlify to easily test frontend changes.
+- More components moved to React.
+- We switched to Webpack 4 with the help of @dmonego.
+- We upgraded to Celery 4 with the help of @emtwo, @jezdez, @mashrikt and @atharvai.
+- We started moving towards Python 3 for our backend. The first step was to make sure our code pass basic sanity tests with Flake 8, which was implemented by @cclauss.
+- We improved our testing on the frontend by adding setup for Jest tests and E2E testing using Cypress (@gabrieldutra).
+- Each pull request now gets a deploy preview using Netlify to easily test frontend changes.

 This is just a summary, you're welcome to review the full list below. ⬇

@@ -57,226 +247,220 @@ This release had contributions from 38 people: @arikfr, @kravets-levko, @jezdez,

 ### Added

-* #2747, #3143 Add a new Databricks query runner. @alison985, @jezdez, @arikfr
-* #2767 Add ability to add viz to dashboard from query edit page. @alison985, @jezdez
-* #2780 Add a query autocomplete toggle. @alison985, @jezdez, @arikfr
-* #2768 Add authentication via JWT providers. @SakuradaJun
-* #2790 Add the ability to sort favorited queries, paginate the dashboard list and improve UI inconsistencies. @jezdez
-* #2681 Add ability to search table column names in schema browser. @alison985
-* #2855 Add option to query cached results. @yoavbls
-* #2740 Add ability for extensions to add periodic tasks. @emtwo
-* #2924 Google Spreadsheets: Add support for opening by URL. @alexanderlz
-* #2903 Add PagerDuty as an Alert Destination. @alexanderlz
-* #2824 Add support for expanding dashboard visualizations. @sjakthol
-* #2900 Add ability to specify a counter label. @ralphilius
-* #2565 Add frontend extension capabilities. @emtwo
-* #2848 Add IBM Db2 as a data source using the ibm-db Python package. @nicof38
-* #2959 Add option to auto reload widget data in shared dashboards. @arikfr
-* #2993 Add page size settings. @kyoshidajp
-* #2080 New Heatmap chart visualization with Plotly. @deecay
-* #2991 Show users in CLI group list. @GitSumito
-* #2342 New SQLPARSE_FORMAT_OPTIONS setting to configure query formatter. @ariarijp
-* #3031 Add some tests for Query Results. @ariarijp
-* #2936 Add Kylin data source. @Trigl
-* #3047 Add Druid data source. @rauchy
-* #3077 New user interface for the feature flag of the share edit permissions feature. @arikfr
-* #3007 Add permissions to the result of "manage.py groups list" command. @Udomomo
-* #3088 Add get_current_user() fuction for the Python query runner. @kyoshidajp
-* #3114 Add event tracking to autocomplete toggle. @arikfr
-* #3068 Add Rockset query runner. @igorcanadi, @arikfr
-* #3105 Display frontend version. @rauchy
+- #2747, #3143 Add a new Databricks query runner. @alison985, @jezdez, @arikfr
+- #2767 Add ability to add viz to dashboard from query edit page. @alison985, @jezdez
+- #2780 Add a query autocomplete toggle. @alison985, @jezdez, @arikfr
+- #2768 Add authentication via JWT providers. @SakuradaJun
+- #2790 Add the ability to sort favorited queries, paginate the dashboard list and improve UI inconsistencies. @jezdez
+- #2681 Add ability to search table column names in schema browser. @alison985
+- #2855 Add option to query cached results. @yoavbls
+- #2740 Add ability for extensions to add periodic tasks. @emtwo
+- #2924 Google Spreadsheets: Add support for opening by URL. @alexanderlz
+- #2903 Add PagerDuty as an Alert Destination. @alexanderlz
+- #2824 Add support for expanding dashboard visualizations. @sjakthol
+- #2900 Add ability to specify a counter label. @ralphilius
+- #2565 Add frontend extension capabilities. @emtwo
+- #2848 Add IBM Db2 as a data source using the ibm-db Python package. @nicof38
+- #2959 Add option to auto reload widget data in shared dashboards. @arikfr
+- #2993 Add page size settings. @kyoshidajp
+- #2080 New Heatmap chart visualization with Plotly. @deecay
+- #2991 Show users in CLI group list. @GitSumito
+- #2342 New SQLPARSE_FORMAT_OPTIONS setting to configure query formatter. @ariarijp
+- #3031 Add some tests for Query Results. @ariarijp
+- #2936 Add Kylin data source. @Trigl
+- #3047 Add Druid data source. @rauchy
+- #3077 New user interface for the feature flag of the share edit permissions feature. @arikfr
+- #3007 Add permissions to the result of "manage.py groups list" command. @Udomomo
+- #3088 Add get_current_user() fuction for the Python query runner. @kyoshidajp
+- #3114 Add event tracking to autocomplete toggle. @arikfr
+- #3068 Add Rockset query runner. @igorcanadi, @arikfr
+- #3105 Display frontend version. @rauchy

 ### Changed

-* #2636 Rewrite query editor with React. @washort, @arikfr
-* #2637 Convert edit-in-place component to React. @washort, @arikfr
-* #2766 Suitable events are now being recorded server side instead of in the frontend. @alison985, @jezdez
-* #2796 Change placement (right/bottom) of chart legend depending on chart width. @kravets-levko
-* #2833 Uses server side sort order for tag list and show count of tagged items. @jezdez
-* #2318 Support authentication for the URL data source. @jezdez
-* #2884 Rename Yandex Metrika to Metrica. @jezdez
-* #2909 MySQL: hide sys tables. @arikfr
-* #2817 Consistently use simplejson for loading and dumping JSON. @jezdez
-* #2872 Use Plotly's function to clean y-values (x may be category or date/time). @kravets-levko
-* #2938 Auto focus tag input. @kyoshidajp
-* #2927 Design refinements for queries pages. @kocsmy
-* #2950 Show activity status in CLI user list. @GitSumito
-* #2968 Presto data source: setting protocol (http/https), safe loading of error messages. @arikfr
-* #2967 Show groups in CLI user list. @GitSumito
-* #2603 MongoDB: Update requirements to support srv. @arikfr
-* #2961 MongoDB: Skip system collections when loading schema. @arikfr
-* #2960 Add timeout to various HTTP requests. @arikfr
-* #2983 Databricks: New logo, updated name and enabled by default. @arikfr
-* #2982 Table visualization: change default size to 25 and add more size options. @arikfr
-* #2866 Redshift: Hide tables the configured user cannot access. @sjakthol
-* #3058 Mustache: don't html-escape query parameters values. @kravets-levko
-* #3079 Always use basic autocomplete, as well as the live autocomplete. @arikfr
-* #3084 Support tel://, sms://, mailto:// links in query results. @zhujunsan
-* #3083 Clickhouse: Add WITH TOTALS option support. @denisov-vlad
-* #3063 Allow setting colors for bubble charts. @toph
-* #3085 BigQuery: Switch to Standard SQL as the default. @kyoshidajp
-* #3094 Tags autocomplete: Show note when creating a new label. @kravets-levko
-* #2984 Autocomplete toggle improvements. @arikfr
-* #3089 Open new tab when forking a query. @kyoshidajp
-* #3126 MongoDB: add support for sorting columns. @arikfr
-* #3128 Improve backoff algorithm of query results polling to speed it up. @arikfr
-* #3125 Vertica: update driver & add support for connection timeout. @arikfr
-* #3124 Support unicode in Postgres/Redshift schema. @arikfr
-* #3138 Migrate all tags components to React. @kravets-levko
-* #3139 Better manage permissions modal. @kocsmy
-* #3149 Improve tag link colors and fix group tags on Users page. @kocsmy
-* #3146 Update, replace and fix new alert destination logos so it fits better. @kocsmy
-* #3147 Add and improve recent db logos that didn't fit in size properly. @kocsmy
-* #3148 Fix label positioning on no found screen. @kocsmy
-* #3156 json_dumps: add support for serializing buffer objects. @arikfr
+- #2636 Rewrite query editor with React. @washort, @arikfr
+- #2637 Convert edit-in-place component to React. @washort, @arikfr
+- #2766 Suitable events are now being recorded server side instead of in the frontend. @alison985, @jezdez
+- #2796 Change placement (right/bottom) of chart legend depending on chart width. @kravets-levko
+- #2833 Uses server side sort order for tag list and show count of tagged items. @jezdez
+- #2318 Support authentication for the URL data source. @jezdez
+- #2884 Rename Yandex Metrika to Metrica. @jezdez
+- #2909 MySQL: hide sys tables. @arikfr
+- #2817 Consistently use simplejson for loading and dumping JSON. @jezdez
+- #2872 Use Plotly's function to clean y-values (x may be category or date/time). @kravets-levko
+- #2938 Auto focus tag input. @kyoshidajp
+- #2927 Design refinements for queries pages. @kocsmy
+- #2950 Show activity status in CLI user list. @GitSumito
+- #2968 Presto data source: setting protocol (http/https), safe loading of error messages. @arikfr
+- #2967 Show groups in CLI user list. @GitSumito
+- #2603 MongoDB: Update requirements to support srv. @arikfr
+- #2961 MongoDB: Skip system collections when loading schema. @arikfr
+- #2960 Add timeout to various HTTP requests. @arikfr
+- #2983 Databricks: New logo, updated name and enabled by default. @arikfr
+- #2982 Table visualization: change default size to 25 and add more size options. @arikfr
+- #2866 Redshift: Hide tables the configured user cannot access. @sjakthol
+- #3058 Mustache: don't html-escape query parameters values. @kravets-levko
+- #3079 Always use basic autocomplete, as well as the live autocomplete. @arikfr
+- #3084 Support tel://, sms://, mailto:// links in query results. @zhujunsan
+- #3083 Clickhouse: Add WITH TOTALS option support. @denisov-vlad
+- #3063 Allow setting colors for bubble charts. @toph
+- #3085 BigQuery: Switch to Standard SQL as the default. @kyoshidajp
+- #3094 Tags autocomplete: Show note when creating a new label. @kravets-levko
+- #2984 Autocomplete toggle improvements. @arikfr
+- #3089 Open new tab when forking a query. @kyoshidajp
+- #3126 MongoDB: add support for sorting columns. @arikfr
+- #3128 Improve backoff algorithm of query results polling to speed it up. @arikfr
+- #3125 Vertica: update driver & add support for connection timeout. @arikfr
+- #3124 Support unicode in Postgres/Redshift schema. @arikfr
+- #3138 Migrate all tags components to React. @kravets-levko
+- #3139 Better manage permissions modal. @kocsmy
+- #3149 Improve tag link colors and fix group tags on Users page. @kocsmy
+- #3146 Update, replace and fix new alert destination logos so it fits better. @kocsmy
+- #3147 Add and improve recent db logos that didn't fit in size properly. @kocsmy
+- #3148 Fix label positioning on no found screen. @kocsmy
+- #3156 json_dumps: add support for serializing buffer objects. @arikfr

 ### Fixed

-* #2849 Fix invalid reference to alert.to_dict() in webhook. @wankdanker
-* #2840 Improve counter visualization text scaling. @kravets-levko
-* #2854 Widget titles are no longer rendered wrong on public dashboards. @kravets-levko
-* #2318 Removed redundant exception handling in data sources since that's handled in the query backend. @jezdez
-* #2886 Fix Javascript build that broke because registerAll tried to run EditInPlace component. @arikfr
-* #2911 Don’t show “Add to dashboard” in dropdown to unsaved queries. @jezdez
-* #2916 Fix export query results output file name. @gabrieldutra
-* #2917 Fix output file name not changing after rename query. @gabrieldutra
-* #2868 Address edge case when retrieving Glue schemas for Athena data source. @kadrach
-* #2929 Fix: date value in a filter is duplicated. @combineads
-* #2875 Unbreak charts with long legend break in horizontal mode. Update plotly.js. @kravets-levko
-* #2937 Fix event recording in admin API backend. @kyoshidajp
-* #2953 Minor fixes for the Clickhouse data source. @denisov-vlad
-* #2941 Bring back fix to Box plot hover. @arikfr
-* #2957 Apply missing CSS classes to EditInPlace component. @arikfr
-* #2897 Show "Add description" only after saving the query. @arikfr
-* #2922 Query page layout improvements for small screens. @kravets-levko
-* #2956 Clickhouse: move timeout to params. @denisov-vlad
-* #2964 Fix no tags shown when having empty set. @gabrieldutra
-* #2757 Use full text search ranking when searching in list views. @jezdez
-* #2969 Query Results data source: improved errors, quoted column names. @arikfr
-* #2906 Preventing open redirection in loging process. @kyoshidajp
-* #2867 TreasureData: Deduplicate column names. @zaimy
-* #2994 Fix scheme of various URLs from http to https. @kyoshidajp
-* #2992 Fix an invalid prop type warning in new version notifier. @kyoshidajp
-* #3022 Fix Toolbox covering part of a chart. @kravets-levko
-* #2998 Fix charts losing responsive features after refreshing the dashboard. @kravets-levko
-* #3034 Postgres: handle NaN/Infinity values. @kravets-levko
-* #2745 Sort columns with undefined values. @Yossi-a
-* #3041 Sort CLI output of lists. @GitSumito
-* #2803, #3006 Address various tag display issues on query list page. @kocsmy, @alison985
-* #3049 Fix edit-in-place component which ignored isEditable flag and didn't work on Groups page. @kravets-levko
-* #2965 Google Analytics: Fix crash when no results are returned. @alexanderlz
-* #3061 Fix table visualization so that the horizontal scrollbar is not be always visible. @kravets-levko
-* #3076 Add white-space padding to separators in the footer. @burnash
-* #2919 Fix URL data source to not require a URL. @arikfr
-* #3098 Force AngularJS to update query editor properly. @washort
-* #3100 Delete redundant regex segment in query result frontend. @zhujunsan
-* #2978 Prevent the query update timestamp from changing when it is linked to new query results. @rauchy
-* #3046 Fix query page header. @kravets-levko
-* #3097 Mongo: Fix collection fields retreival bug when Views are present. @jodevsa
-* #3107 Keep query text in local state for now. @washort
-* #3111 Fix mobile padding issues on Query results. @kocsmy
-* #3122 Show menu divider only if query is archived. @jezdez
-* #3120 Fix tag counts for dashboards and queries. @jezdez
-* #3141 Fix schema refresh to work on MySQL 8. @hoangphuoc25
-* #3142 Fix: editing dashboard title results in the visualizations being replaced by the loading markers. @kravets-levko
+- #2849 Fix invalid reference to alert.to_dict() in webhook. @wankdanker
+- #2840 Improve counter visualization text scaling. @kravets-levko
+- #2854 Widget titles are no longer rendered wrong on public dashboards. @kravets-levko
+- #2318 Removed redundant exception handling in data sources since that's handled in the query backend. @jezdez
+- #2886 Fix Javascript build that broke because registerAll tried to run EditInPlace component. @arikfr
+- #2911 Don’t show “Add to dashboard” in dropdown to unsaved queries. @jezdez
+- #2916 Fix export query results output file name. @gabrieldutra
+- #2917 Fix output file name not changing after rename query. @gabrieldutra
+- #2868 Address edge case when retrieving Glue schemas for Athena data source. @kadrach
+- #2929 Fix: date value in a filter is duplicated. @combineads
+- #2875 Unbreak charts with long legend break in horizontal mode. Update plotly.js. @kravets-levko
+- #2937 Fix event recording in admin API backend. @kyoshidajp
+- #2953 Minor fixes for the Clickhouse data source. @denisov-vlad
+- #2941 Bring back fix to Box plot hover. @arikfr
+- #2957 Apply missing CSS classes to EditInPlace component. @arikfr
+- #2897 Show "Add description" only after saving the query. @arikfr
+- #2922 Query page layout improvements for small screens. @kravets-levko
+- #2956 Clickhouse: move timeout to params. @denisov-vlad
+- #2964 Fix no tags shown when having empty set. @gabrieldutra
+- #2757 Use full text search ranking when searching in list views. @jezdez
+- #2969 Query Results data source: improved errors, quoted column names. @arikfr
+- #2906 Preventing open redirection in loging process. @kyoshidajp
+- #2867 TreasureData: Deduplicate column names. @zaimy
+- #2994 Fix scheme of various URLs from http to https. @kyoshidajp
+- #2992 Fix an invalid prop type warning in new version notifier. @kyoshidajp
+- #3022 Fix Toolbox covering part of a chart. @kravets-levko
+- #2998 Fix charts losing responsive features after refreshing the dashboard. @kravets-levko
+- #3034 Postgres: handle NaN/Infinity values. @kravets-levko
+- #2745 Sort columns with undefined values. @Yossi-a
+- #3041 Sort CLI output of lists. @GitSumito
+- #2803, #3006 Address various tag display issues on query list page. @kocsmy, @alison985
+- #3049 Fix edit-in-place component which ignored isEditable flag and didn't work on Groups page. @kravets-levko
+- #2965 Google Analytics: Fix crash when no results are returned. @alexanderlz
+- #3061 Fix table visualization so that the horizontal scrollbar is not be always visible. @kravets-levko
+- #3076 Add white-space padding to separators in the footer. @burnash
+- #2919 Fix URL data source to not require a URL. @arikfr
+- #3098 Force AngularJS to update query editor properly. @washort
+- #3100 Delete redundant regex segment in query result frontend. @zhujunsan
+- #2978 Prevent the query update timestamp from changing when it is linked to new query results. @rauchy
+- #3046 Fix query page header. @kravets-levko
+- #3097 Mongo: Fix collection fields retreival bug when Views are present. @jodevsa
+- #3107 Keep query text in local state for now. @washort
+- #3111 Fix mobile padding issues on Query results. @kocsmy
+- #3122 Show menu divider only if query is archived. @jezdez
+- #3120 Fix tag counts for dashboards and queries. @jezdez
+- #3141 Fix schema refresh to work on MySQL 8. @hoangphuoc25
+- #3142 Fix: editing dashboard title results in the visualizations being replaced by the loading markers. @kravets-levko

 ### Other

-* #2850 The setup scripts are now based on Ubuntu 18.04 LTS and Docker. @pashaxp, @arikfr
-* #2985 Add Jest based tests to our stack. @arikfr
-* #2999 Add netlify configuration. @arikfr
-* #3000 Initial Cypress based E2E test infrastructure. @gabrieldutra
-* #2898 Move Ant styles into a central location. @arikfr
-* #2910 Fix webpack build error about BigMessage. @jezdez
-* #2928 Speed up builds by skipping installing requirements_all_ds.txt in CI unit tests. @arikfr
-* #2963 Fix tarball build failure. @emtwo
-* #2996 Fix setup.sh failures when run as root. @arikfr
-* #2989 Rearrange make targets. @koooge
-* #3036 Update Flask-Admin to 1.5.2. @yoavbls
-* #2901 Fix documentation links. @kravets-levko
-* #3073 Remove only Redash containers in clean Make task. @ariarijp
-* #3048 Remove pytest-watch dependency to workaround an issue with watchdog. @rauchy
-* #2905 Update development docker-compose.yml file to use latest Redis and Postgres servers and specify working volume explictly. @Rovel
-* #3032 Makefile: Add make targets for test. @koooge
-* #2933 Switch to Webpack 4. @dmonego
-* #2908 Update setup files. @arikfr
-* #2946 Update snowflake_connector_python version. @arikfr
-* #2773 Upgrade to Celery 4.2.1. @emtwo, @jezdez
-* #2881 CircleCI: Make flake8 tests pass on Legacy Python and Python 3. @cclauss
-* #2907 Remove unused dependencies (honcho, wsgiref). @arikfr
-* #3039 Build docker image on master branch. @arikfr
-* #3106 Fix registerAll failures after minification. @arikfr
-
+- #2850 The setup scripts are now based on Ubuntu 18.04 LTS and Docker. @pashaxp, @arikfr
+- #2985 Add Jest based tests to our stack. @arikfr
+- #2999 Add netlify configuration. @arikfr
+- #3000 Initial Cypress based E2E test infrastructure. @gabrieldutra
+- #2898 Move Ant styles into a central location. @arikfr
+- #2910 Fix webpack build error about BigMessage. @jezdez
+- #2928 Speed up builds by skipping installing requirements_all_ds.txt in CI unit tests. @arikfr
+- #2963 Fix tarball build failure. @emtwo
+- #2996 Fix setup.sh failures when run as root. @arikfr
+- #2989 Rearrange make targets. @koooge
+- #3036 Update Flask-Admin to 1.5.2. @yoavbls
+- #2901 Fix documentation links. @kravets-levko
+- #3073 Remove only Redash containers in clean Make task. @ariarijp
+- #3048 Remove pytest-watch dependency to workaround an issue with watchdog. @rauchy
+- #2905 Update development docker-compose.yml file to use latest Redis and Postgres servers and specify working volume explictly. @Rovel
+- #3032 Makefile: Add make targets for test. @koooge
+- #2933 Switch to Webpack 4. @dmonego
+- #2908 Update setup files. @arikfr
+- #2946 Update snowflake_connector_python version. @arikfr
+- #2773 Upgrade to Celery 4.2.1. @emtwo, @jezdez
+- #2881 CircleCI: Make flake8 tests pass on Legacy Python and Python 3. @cclauss
+- #2907 Remove unused dependencies (honcho, wsgiref). @arikfr
+- #3039 Build docker image on master branch. @arikfr
+- #3106 Fix registerAll failures after minification. @arikfr

 ## v5.0.2 - 2018-10-18

 ### Security

-* Fix: prevent Open Redirect vulnerability.
-
+- Fix: prevent Open Redirect vulnerability.

 ## v5.0.1 - 2018-09-27

 ### Added

-* Added support for JWT authentication (for services like Cloudflare Access or Google IAP).
+- Added support for JWT authentication (for services like Cloudflare Access or Google IAP).

 ### Changed

-* Upgraded Celery version to 3.1.26 to make upgrade to Celery 4 easier.
-
+- Upgraded Celery version to 3.1.26 to make upgrade to Celery 4 easier.

 ## v5.0.0 - 2018-09-21

 Final release for V5. Most of the changes were already in the beta release of V5, but this includes several fixes along
 with UI improvements.

-
 🙏 Thanks to @arikfr, @jezdez, @kravets-levko, @alison985, @kocsmy, @yossi-a, @tdsmith, @nasmithan, @jrbenny35, @sjakthol, @ariarijp and @combineads who contributed to this release.

-
 ### Security

-* Fix: don't expose Google OAuth client secret. @arikfr
+- Fix: don't expose Google OAuth client secret. @arikfr

 ### Changed

-* Improve mobile rendering of dashboards and queries. @kocsmy
-* UI improvements for favorites and empty state. @arikfr
-* Remove unnecessary X at the end of the query search. @kocsmy
-* Add server-side sorting to dashboard list. @jezdez
-* Sort queries in descending order. @jezdez
-* Throw error when non-owner tries to add a user to dashboard permissions. @alison985
-* Propagate query execution errors from Celery tasks properly. @alison985
-* Reload the route when using the app header search input. @jezdez
+- Improve mobile rendering of dashboards and queries. @kocsmy
+- UI improvements for favorites and empty state. @arikfr
+- Remove unnecessary X at the end of the query search. @kocsmy
+- Add server-side sorting to dashboard list. @jezdez
+- Sort queries in descending order. @jezdez
+- Throw error when non-owner tries to add a user to dashboard permissions. @alison985
+- Propagate query execution errors from Celery tasks properly. @alison985
+- Reload the route when using the app header search input. @jezdez

 ### Fixed

-* Fix: BigQuery default location is null and not US. @arikfr
-* Fix: query embeds are broken. @arikfr
-* Fix: typo in Celery log foramt. @ariarijp
-* Use QuerySerializer in outdated queries list. @jezdez
-* Fix: sometimes widgets are getting zero height. @kravets-levko
-* Athena: Switch to simple_json to serialize NaN/Infinity values as nulls. @kravets-levko, @jezdez
-* Fix: queries with parameters with no value breaking the scheduler. @arikfr
-* Fix: MongoDB query results parser didn't support unicode keys. @arikfr
-* Fix: Google Analytics schema wasn't loading in some cases. @arikfr
-* Fix: date/time parameters not working as global param @kravets-levko.
-* Fix: Widgets crumble when trying to move / resize a widget. @kravets-levko
-* Fix: handling rows with "length" field with forOwn method. @yossi-a
-* Fix: query selection not working on alert page. @sjakthol
-* Fix: query_results for Embedded Parameters (removed deprecated to_dict function). @nasmithan
-* Fix: unicode not supported in dashboard search. @combineads
-* Fix: unicode not supported in users search. @arikfr
+- Fix: BigQuery default location is null and not US. @arikfr
+- Fix: query embeds are broken. @arikfr
+- Fix: typo in Celery log foramt. @ariarijp
+- Use QuerySerializer in outdated queries list. @jezdez
+- Fix: sometimes widgets are getting zero height. @kravets-levko
+- Athena: Switch to simple_json to serialize NaN/Infinity values as nulls. @kravets-levko, @jezdez
+- Fix: queries with parameters with no value breaking the scheduler. @arikfr
+- Fix: MongoDB query results parser didn't support unicode keys. @arikfr
+- Fix: Google Analytics schema wasn't loading in some cases. @arikfr
+- Fix: date/time parameters not working as global param @kravets-levko.
+- Fix: Widgets crumble when trying to move / resize a widget. @kravets-levko
+- Fix: handling rows with "length" field with forOwn method. @yossi-a
+- Fix: query selection not working on alert page. @sjakthol
+- Fix: query_results for Embedded Parameters (removed deprecated to_dict function). @nasmithan
+- Fix: unicode not supported in dashboard search. @combineads
+- Fix: unicode not supported in users search. @arikfr

 ### Other

-* Add test for using saved parameters in scheduled queries. @alison985
-* Minor code smell cleanup. @jezdez
-* Update QueryResultListResource docstring. @tdsmith
-* Switch to CirlceCI 2.0 @jrbenny35, @arikfr
-* Remove unnecessary init methods. @jezdez
-
+- Add test for using saved parameters in scheduled queries. @alison985
+- Minor code smell cleanup. @jezdez
+- Update QueryResultListResource docstring. @tdsmith
+- Switch to CirlceCI 2.0 @jrbenny35, @arikfr
+- Remove unnecessary init methods. @jezdez

 ## v5.0.0-Beta - 2018-08-06

@@ -284,19 +468,19 @@ This is the first beta of the V5 release (and hopefully the last one). This vers

 Some notable changes:

-* Extensive work on parameters UI:
-  * New Date Range parameter type.
-  * UI for creating new parameters.
-  * Support for Now/Today as default value of date/time parameter.
-* Tagging and favorites ⭐️ support for queries and dashboards.
-* Users list page was improved (search, additional information) and you can now disable users.
-* Query editor improvements: additional keyboard shortcuts and support for searching in query text.
-* Visualizations improvements: option to select colors of pie chart sectors, X Axis type auto detect and option to format values, labels and tooltips.
-* Data Sources:
-  * Support for Yandex Metrika and AppMetrika.
-  * BigQuery: location property support and schema will load all tables now.
-  * Elasticsearch: stop sending source_content_type parameter which wasn't supported in older versions.
-* Started migrating the frontend codebase to React.
+- Extensive work on parameters UI:
+  - New Date Range parameter type.
+  - UI for creating new parameters.
+  - Support for Now/Today as default value of date/time parameter.
+- Tagging and favorites ⭐️ support for queries and dashboards.
+- Users list page was improved (search, additional information) and you can now disable users.
+- Query editor improvements: additional keyboard shortcuts and support for searching in query text.
+- Visualizations improvements: option to select colors of pie chart sectors, X Axis type auto detect and option to format values, labels and tooltips.
+- Data Sources:
+  - Support for Yandex Metrika and AppMetrika.
+  - BigQuery: location property support and schema will load all tables now.
+  - Elasticsearch: stop sending source_content_type parameter which wasn't supported in older versions.
+- Started migrating the frontend codebase to React.

 And much more!

@@ -304,82 +488,82 @@ And much more!

 ### Added

-* #2712: Date/Time Range parameter type (@kravets-levko)
-* #2482: Add support for ChatWork Alert Destination. (@matsumo)
-* #2678: Explicit "Add Parameter" Button in Query Editor. (@kravets-levko)
-* #2513: Add location property to BigQuery data source settings. (@kyoshidajp)
-* #2616: Pie chart: support setting pie chart sector colors. (@kravets-levko)
-* #2697: Date/Time parameters: support for "Now" as default value. (@kravets-levko)
-* #2693: Enable search function in Query Editor. (@arikfr)
-* #2573: Tagging and favorites for Queries and Dashboards (@arikfr)
-* #2640: Keyboard shortcut to collapse query editor/schema browser (@kravets-levko)
-* #2674: Add support for the Chrome Logger extension (@arikfr)
-* #2653: Add redash db size to status page (@alison985)
-* #2669: Store Athena query id with result metadata (@tdawber)
-* #2546: Configuration for incorporating React components (@washort)
-* #2533: New datasource: Yandex Metrika & AppMetrika (@denisov-vlad)
-* #2536: Chart: formats for values, labels and tooltips (@kravets-levko)
-* #2560: Introduce Policy object (@arikfr)
-* #2380: Admin should be able to disable a user (@kravets-levko)
-* #2509: Show custom date format on settings page (@kyoshidajp)
+- #2712: Date/Time Range parameter type (@kravets-levko)
+- #2482: Add support for ChatWork Alert Destination. (@matsumo)
+- #2678: Explicit "Add Parameter" Button in Query Editor. (@kravets-levko)
+- #2513: Add location property to BigQuery data source settings. (@kyoshidajp)
+- #2616: Pie chart: support setting pie chart sector colors. (@kravets-levko)
+- #2697: Date/Time parameters: support for "Now" as default value. (@kravets-levko)
+- #2693: Enable search function in Query Editor. (@arikfr)
+- #2573: Tagging and favorites for Queries and Dashboards (@arikfr)
+- #2640: Keyboard shortcut to collapse query editor/schema browser (@kravets-levko)
+- #2674: Add support for the Chrome Logger extension (@arikfr)
+- #2653: Add redash db size to status page (@alison985)
+- #2669: Store Athena query id with result metadata (@tdawber)
+- #2546: Configuration for incorporating React components (@washort)
+- #2533: New datasource: Yandex Metrika & AppMetrika (@denisov-vlad)
+- #2536: Chart: formats for values, labels and tooltips (@kravets-levko)
+- #2560: Introduce Policy object (@arikfr)
+- #2380: Admin should be able to disable a user (@kravets-levko)
+- #2509: Show custom date format on settings page (@kyoshidajp)

 ### Changed

-* #2715: Improve users list page (@arikfr)
-* #2710: Update Ant variables to fit Redash's style (@kocsmy)
-* #2709: Move format button next Add New Param button. (@arikfr)
-* #2664: Dashboard shows a spinner when query failed to load (@kravets-levko)
-* #2626: Show real status when loading cached query result (@kravets-levko)
-* #2663: Set column name implicitly when column name is blank (@ariarijp)
-* #2695: Improve Date/DateTime type parameters (@kravets-levko)
-* #2694: Block users with disposable email addresses (@arikfr)
-* #2687: YAML: changed load to safe_load (@denisov-vlad)
-* #2514: Update value parsing for google spreadsheets source (@atharvai)
-* #2570: fixes query pagination alignment (@alison985)
-* #2584: keep query result pagination out of scroll (@alison985)
-* #2647: Improve Script Query Runner (@ariarijp)
-* #2583: Query header improvements on widgets (@kocsmy)
-* #2671: Save some space (@kocsmy)
-* #2658: delaying schema filtering to improve responsiveness (@alison985)
-* #2648: Update datasource documentation links (@Pablohn26)
-* #2613: Improve Script Query Runner (@ariarijp)
-* #2619: data source sort case insensitive (@alison985)
-* #2604: Improve Google Spreadsheets Query Runner (@ariarijp)
-* #2542: Closes #2541: x-axis improvements. (@emtwo)
-* #2590: Remove redundant variables (@ariarijp)
-* #2585: Show data only mode: allow to add and delete visualizations (@kravets-levko)
-* #2549: Allow get_tables to see views and v10-style partitioned tables (@coreyhuinker)
-* #2568: sort datasources alphabetically (@alison985)
-* #2444: feat: show error if saml response cannot be parsed (@sjakthol)
-* #2554: Display name to be delete (@kyoshidajp)
-* #2510: Display confirmation dialog when deleting a item (@kyoshidajp)
-* #2518: Design improvements (@kocsmy)
-* #2520: Filter data sources in a data source input area (@kyoshidajp)
+- #2715: Improve users list page (@arikfr)
+- #2710: Update Ant variables to fit Redash's style (@kocsmy)
+- #2709: Move format button next Add New Param button. (@arikfr)
+- #2664: Dashboard shows a spinner when query failed to load (@kravets-levko)
+- #2626: Show real status when loading cached query result (@kravets-levko)
+- #2663: Set column name implicitly when column name is blank (@ariarijp)
+- #2695: Improve Date/DateTime type parameters (@kravets-levko)
+- #2694: Block users with disposable email addresses (@arikfr)
+- #2687: YAML: changed load to safe_load (@denisov-vlad)
+- #2514: Update value parsing for google spreadsheets source (@atharvai)
+- #2570: fixes query pagination alignment (@alison985)
+- #2584: keep query result pagination out of scroll (@alison985)
+- #2647: Improve Script Query Runner (@ariarijp)
+- #2583: Query header improvements on widgets (@kocsmy)
+- #2671: Save some space (@kocsmy)
+- #2658: delaying schema filtering to improve responsiveness (@alison985)
+- #2648: Update datasource documentation links (@Pablohn26)
+- #2613: Improve Script Query Runner (@ariarijp)
+- #2619: data source sort case insensitive (@alison985)
+- #2604: Improve Google Spreadsheets Query Runner (@ariarijp)
+- #2542: Closes #2541: x-axis improvements. (@emtwo)
+- #2590: Remove redundant variables (@ariarijp)
+- #2585: Show data only mode: allow to add and delete visualizations (@kravets-levko)
+- #2549: Allow get_tables to see views and v10-style partitioned tables (@coreyhuinker)
+- #2568: sort datasources alphabetically (@alison985)
+- #2444: feat: show error if saml response cannot be parsed (@sjakthol)
+- #2554: Display name to be delete (@kyoshidajp)
+- #2510: Display confirmation dialog when deleting a item (@kyoshidajp)
+- #2518: Design improvements (@kocsmy)
+- #2520: Filter data sources in a data source input area (@kyoshidajp)

 ### Fixed

-* #2722: Elasticsearch: Don't send source_content_type parameter. (@arikfr)
-* #2719: Remove closing input tags (@maxv)
-* #2458: Get all tables in the BigQuery (@kyoshidajp)
-* #2698: Make sure we return distinct data source values (@arikfr)
-* #2315: Fix: pyHive type matches (@yuua)
-* #2638: Dashboard stops rendering when adding widget with empty query (@kravets-levko)
-* #2610: Fix export query results output file name (@gabrieldutra)
-* #2574: commit query result to db before evaluating alerts (@mtrbean)
-* #2580: add break-word wrap to add/edit text box on dashboard (@alison985)
-* #2578: Fix connection error when you run "create_tables" (@ariarijp)
-* #2572: remove extra menu line if query is archived (@alison985)
-* #2526: Fix pivot hide control in dashboards (@deecay)
-* #2511: Fixing signed_out.html template (@kocsmy)
-* #2523: Frontend: fix boolean field with null value display as null. (@innovia)
+- #2722: Elasticsearch: Don't send source_content_type parameter. (@arikfr)
+- #2719: Remove closing input tags (@maxv)
+- #2458: Get all tables in the BigQuery (@kyoshidajp)
+- #2698: Make sure we return distinct data source values (@arikfr)
+- #2315: Fix: pyHive type matches (@yuua)
+- #2638: Dashboard stops rendering when adding widget with empty query (@kravets-levko)
+- #2610: Fix export query results output file name (@gabrieldutra)
+- #2574: commit query result to db before evaluating alerts (@mtrbean)
+- #2580: add break-word wrap to add/edit text box on dashboard (@alison985)
+- #2578: Fix connection error when you run "create_tables" (@ariarijp)
+- #2572: remove extra menu line if query is archived (@alison985)
+- #2526: Fix pivot hide control in dashboards (@deecay)
+- #2511: Fixing signed_out.html template (@kocsmy)
+- #2523: Frontend: fix boolean field with null value display as null. (@innovia)

 ### Other

-* #2682: Add Zeit's now support to have preview builds for every PR (@arikfr)
-* #2668: Upgrade bootstrap script to Redash 4.0.1 (@ariarijp)
-* #2639: Add tests for SpreadSheets (@ariarijp)
-* #2635: Add tests for Query Results (@ariarijp)
-* #2537: Remove trailing semicolon (@sieben)
+- #2682: Add Zeit's now support to have preview builds for every PR (@arikfr)
+- #2668: Upgrade bootstrap script to Redash 4.0.1 (@ariarijp)
+- #2639: Add tests for SpreadSheets (@ariarijp)
+- #2635: Add tests for Query Results (@ariarijp)
+- #2537: Remove trailing semicolon (@sieben)

 ## v4.0.1 - 2018-05-02

@@ -571,7 +755,6 @@ And much more!
 - Handling whitespace characters in Query Results data source. @ariarijp
 - [MySQL] Close cursor when cancellig the query. @jasonsmithj

-
 ## v3.0.0 - 2017-11-13

 ### Added
@@ -617,7 +800,7 @@ And much more!
 - Salesforce: improve error messages we receive from the API. @akiray03
 - Custom JS code visualization improvements. @deecay
 - DQL: Update version to 0.5.24. @aterreno
- Cassandra: get_schema support for both C* 2.x and 3.x, support for SortedSet type serialization. (@mfouilleul))
+- Cassandra: get_schema support for both C\* 2.x and 3.x, support for SortedSet type serialization. (@mfouilleul))
 - Replace deprecated ng-annotate with babel plugin. @44px
 - Update Python dependencies to recent versions. @alison985
 - Bootstrap script: create /opt/redash directory only if it doesn't exist. @isomura
@@ -653,7 +836,6 @@ And much more!

 This is a patch release, that adds support for Redshift ACM certificates (see #2044 for details).

-
 ## v2.0.0 - 2017-08-08

 ### Added
@@ -663,7 +845,7 @@ This is a patch release, that adds support for Redshift ACM certificates (see #2
 - Add the propertyOrder field to specify order of data source settings. @rmakulov
 - Add Plotly based Boxplot visualization. @deecay
 - [Presto] Add: query cancellation support. @fbertsch
- [MongoDB] add $oids JSON extension.
+- [MongoDB] add \$oids JSON extension.
 - [PostgreSQL] support for loading materialized views in schema.
 - [MySQL] Add option to hide SSL settings.
 - [MySQL] support for RDS MySQL and SSL.
@@ -733,7 +915,7 @@ This is a patch release, that adds support for Redshift ACM certificates (see #2
 - [Google Spreadsheets] handle distant future dates.
 - [SQLite] better handle utf-8 error messages.
 - Fix: don't remove locks for queries with task status of PENDING.
- Only split columns with __/:: that end with filter/MultiFilter.
+- Only split columns with \_\_/:: that end with filter/MultiFilter.
 - Alert notifications fail (sometime) with a SQLAlchemy error.
 - Safeguard against empty query results when checking alert status. @danielerapati
 - Delete data source doesn't work when query results referenced by queries.
@@ -752,7 +934,6 @@ This is a patch release, that adds support for Redshift ACM certificates (see #2
 - PostgreSQL passwords with spaces were not supported. (#1056)
 - PivotTable wasn't updating after first save.

-
 ## v1.0.3 - 2017-04-18

 ### Fixed
@@ -799,7 +980,7 @@ This is a patch release, that adds support for Redshift ACM certificates (see #2
 - Fix: query embed dialog close button wasn't working @r0fls
 - Fix: make errors from Presto runner JSON-serializable @washort
 - Fix: race condition in query task status reporting @washort
- Fix: remove $$hashKey from Pivot table
+- Fix: remove \$\$hashKey from Pivot table
 - Fix: map visualization had severe performance issue.
 - Fix: pemrission dialog wasn't rendering.
 - Fix: word cloud visualization didn't show column names.
@@ -816,7 +997,7 @@ This is a patch release, that adds support for Redshift ACM certificates (see #2
 ### Changed

 - [#1563](https://github.com/getredash/redash/pull/1563) Send events to webhook as JSON with a schema.
- [#1601] [Presto] friendlier error messages. (@aslotnick)
+- [#1601][presto] friendlier error messages. (@aslotnick)
 - Move the query runner unavailable log message to be DEBUG level instead of WARNING, as it was mainly confusing people.
 - Remove "Send to Cloud" button from Plotly based visualizations.
 - Change Plotly's default hover mode to "Compare".
@@ -825,7 +1006,7 @@ This is a patch release, that adds support for Redshift ACM certificates (see #2
 ### Fixed

 - [#1564] Fix: map visualization column picker wasn't populated. (@janusd)
- [#1597] [SQL Server] Fix: schema wasn't loading on case sensitive servers. (@deecay)
+- [#1597][sql server] Fix: schema wasn't loading on case sensitive servers. (@deecay)
 - Fix: dashbonard owner couldn't edit his dashboard.
 - Fix: toggle_publish event wasn't logged properly.
 - Fix: events with API keys were not logged.
@@ -840,7 +1021,7 @@ This is a patch release, that adds support for Redshift ACM certificates (see #2
 - Fix: extra whitespace created by the filters component.
 - Fix: query results cleanup task was trying to delete query objects.
 - Fix: alert subscriptions were not triggered.
- [DynamoDB] Fix: count(*) queries were broken. (@kopanitsa))
+- [DynamoDB] Fix: count(\*) queries were broken. (@kopanitsa))
 - Fix: Redash is using too many database connections.
 - Fix: download links were not working in dashboards.
 - Fix: the first selection in multi filters was broken in dashboards.
@@ -857,9 +1038,9 @@ This is a patch release, that adds support for Redshift ACM certificates (see #2

 This version has two big changes behind the scenes:

-* Refactor the frontend to use latest (at the time) Angular version (1.5) along with better frontend pipeline based on)
+- Refactor the frontend to use latest (at the time) Angular version (1.5) along with better frontend pipeline based on)
  WebPack.
-* Refactor the backend code to use SQLAlchemy and Alembic, for easier migrations/upgrades.)
+- Refactor the backend code to use SQLAlchemy and Alembic, for easier migrations/upgrades.)

 Along with that we have many fixes, additions, new data sources (Google Analytics, ClickHouse, Amazon Athena, Snowflake)
 and fixes to the existing ones (mainly ElasticSearch and Cassandra).
@@ -942,7 +1123,7 @@ We're releasing a new upgrade script -- see [here](https://redash.io/help-onprem

 ### Added

- 61fe16e #1374: Add: allow '*' in REDASH_CORS_ACCESS_CONTROL_ALLOW_ORIGIN (Allen Short)
+- 61fe16e #1374: Add: allow '\*' in REDASH_CORS_ACCESS_CONTROL_ALLOW_ORIGIN (Allen Short)
 - 2f09043 #1113: Add: share modify/access permissions for queries and dashboard (whummer)
 - 3db0eea #1341: Add: support for specifying SAML nameid-format (zoetrope)
 - b0ecd0e #1343: Add: support for local SAML metadata file (zoetrope)
@@ -1006,7 +1187,6 @@ We're releasing a new upgrade script -- see [here](https://redash.io/help-onprem
 - 5d43cbe #1198: Change: add support for Standard SQL in BigQuery query runner (mystelynx)
 - 84d0c22 #1193: Change: modify the argument order of moment.add function call (Kenya Yamaguchi)

-
 ### Fixed

 - d6febb0 #1375: Fix: Download Dataset does not work when not logged in (Joshua Dechant)
@@ -1121,7 +1301,7 @@ A big thank you goes to all who contributed code and documentation in this relea
 - e10ecd2 #1058: Bring back filters if dashboard filters are enabled (@AntoineAugusti)
 - 701035f #1059: Fix: DynamoDB having issues when setting host (@arikfr)
 - 2924d4f #1040: Small fixes to visualizations view (@arikfr)
- fec0d5f #1037: Fix: multi filter wasn't working with __ syntax (@dheerajrav)
+- fec0d5f #1037: Fix: multi filter wasn't working with \_\_ syntax (@dheerajrav)
 - b066ce4 #1033: Fix: only ask for notification permissions if wasn't denied (@arikfr)
 - 960c416 #1032: Fix: make sure we return dashboards only for current org only (@arikfr)
 - b3844d3 #1029: Hive: close connection only if it exists (@arikfr)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,6 @@ The following is a set of guidelines for contributing to Redash. These are guide

 ## Quick Links:

- [Feature Roadmap](https://trello.com/b/b2LUHU7A/redash-roadmap)
 - [Feature Requests](https://discuss.redash.io/c/feature-requests)
 - [Documentation](https://redash.io/help/)
 - [Blog](https://blog.redash.io/)
@@ -61,7 +60,7 @@ If you would like to suggest an enhancement or ask for a new feature:

 ### Documentation

-The project's documentation can be found at [https://redash.io/help/](https://redash.io/help/). The [documentation sources](https://github.com/getredash/website/tree/master/website/_kb) are hosted on GitHub. To contribute edits / new pages, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.
+The project's documentation can be found at [https://redash.io/help/](https://redash.io/help/). The [documentation sources](https://github.com/getredash/website/tree/master/src/pages/kb) are hosted on GitHub. To contribute edits / new pages, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.

 ## Additional Notes

--- a/18
+++ b/18
@@ -1,16 +1,26 @@
-FROM redash/base:latest
+FROM node:10 as frontend-builder
+
+WORKDIR /frontend
+COPY package.json package-lock.json /frontend/
+RUN npm install
+
+COPY client /frontend/client
+COPY webpack.config.js /frontend/
+RUN npm run build
+
+FROM redash/base:debian

 # Controls whether to install extra dependencies needed for all data sources.
 ARG skip_ds_deps

 # We first copy only the requirements file, to avoid rebuilding on every file
 # change.
-COPY requirements.txt requirements_dev.txt requirements_all_ds.txt ./
+COPY requirements.txt requirements_bundles.txt requirements_dev.txt requirements_all_ds.txt ./
 RUN pip install -r requirements.txt -r requirements_dev.txt
 RUN if [ "x$skip_ds_deps" = "x" ] ; then pip install -r requirements_all_ds.txt ; else echo "Skipping pip install -r requirements_all_ds.txt" ; fi

-COPY . ./
-RUN npm install && npm run bundle && npm run build && rm -rf node_modules
+COPY . /app
+COPY --from=frontend-builder /frontend/client/dist /app/client/dist
 RUN chown -R redash /app
 USER redash

--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018, Arik Fraimovich.
+Copyright (c) 2013-2019, Arik Fraimovich.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification, 
--- a/8
+++ b/8
@@ -1,4 +1,4 @@
-.PHONY: compose_build up test_db create_database clean down bundle tests lint backend-unit-tests frontend-unit-tests test build watch start
+.PHONY: compose_build up test_db create_database clean down bundle tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash

 compose_build:
 	docker-compose build
@@ -49,3 +49,9 @@ watch: bundle

 start: bundle
 	npm run start
+
+redis-cli:
+	docker-compose run --rm redis redis-cli -h redis
+
+bash:
+	docker-compose run --rm server bash
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
 <p align="center">
  <img title="Redash" src='https://redash.io/assets/images/logo.png' width="200px"/>
 </p>
-<p align="center">
-    <img title="Build Status" src='https://circleci.com/gh/getredash/redash.png?circle-token=8a695aa5ec2cbfa89b48c275aea298318016f040'/>
-</p>

 [![Documentation](https://img.shields.io/badge/docs-redash.io/help-brightgreen.svg)](https://redash.io/help/)
+[![Datree](https://s3.amazonaws.com/catalog.static.datree.io/datree-badge-20px.svg)](https://datree.io/?src=badge)
+[![Build Status](https://circleci.com/gh/getredash/redash.png?style=shield&circle-token=8a695aa5ec2cbfa89b48c275aea298318016f040)](https://circleci.com/gh/getredash/redash/tree/master)

 **_Redash_** is our take on freeing the data within our company in a way that will better fit our culture and usage patterns.

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please email security@redash.io to report any security vulnerabilities. We will acknowledge receipt of your vulnerability and strive to send you regular updates about our progress. If you're curious about the status of your disclosure please feel free to email us again. If you want to encrypt your disclosure email, you can use [this PGP key](https://keybase.io/arikfr/key.asc).
--- a/bin/bundle-extensions
+++ b/bin/bundle-extensions
@@ -1,39 +1,118 @@
 #!/usr/bin/env python
-
+# -*- coding: utf-8 -*-
+"""Copy bundle extension files to the client/app/extension directory"""
+import logging
 import os
-from subprocess import call
-from distutils.dir_util import copy_tree
+from pathlib2 import Path
+from shutil import copy
+from collections import OrderedDict as odict

-from pkg_resources import iter_entry_points, resource_filename, resource_isdir
+from importlib_metadata import entry_points
+from importlib_resources import contents, is_resource, path

+# Name of the subdirectory
+BUNDLE_DIRECTORY = "bundle"
+
+logger = logging.getLogger(__name__)


 # Make a directory for extensions and set it as an environment variable
 # to be picked up by webpack.
-EXTENSIONS_RELATIVE_PATH = os.path.join('client', 'app', 'extensions')
-EXTENSIONS_DIRECTORY = os.path.join(
-    os.path.dirname(os.path.dirname(__file__)),
-    EXTENSIONS_RELATIVE_PATH)
+extensions_relative_path = Path('client', 'app', 'extensions')
+extensions_directory = Path(__file__).parent.parent / extensions_relative_path

-if not os.path.exists(EXTENSIONS_DIRECTORY):
-    os.makedirs(EXTENSIONS_DIRECTORY)
-os.environ["EXTENSIONS_DIRECTORY"] = EXTENSIONS_RELATIVE_PATH
+if not extensions_directory.exists():
+    extensions_directory.mkdir()
+os.environ["EXTENSIONS_DIRECTORY"] = str(extensions_relative_path)

-for entry_point in iter_entry_points('redash.extensions'):
-    # This is where the frontend code for an extension lives
-    # inside of its package.
-    content_folder_relative = os.path.join(
-        entry_point.name, 'bundle')
-    (root_module, _) = os.path.splitext(entry_point.module_name)

-    if not resource_isdir(root_module, content_folder_relative):
+def resource_isdir(module, resource):
+    """Whether a given resource is a directory in the given module
+
+    https://importlib-resources.readthedocs.io/en/latest/migration.html#pkg-resources-resource-isdir
+    """
+    try:
+        return resource in contents(module) and not is_resource(module, resource)
+    except (ImportError, TypeError):
+        # module isn't a package, so can't have a subdirectory/-package
+        return False
+
+
+def entry_point_module(entry_point):
+    """Returns the dotted module path for the given entry point"""
+    return entry_point.pattern.match(entry_point.value).group("module")
+
+
+def load_bundles():
+    """"Load bundles as defined in Redash extensions.
+
+    The bundle entry point can be defined as a dotted path to a module
+    or a callable, but it won't be called but just used as a means
+    to find the files under its file system path.
+
+    The name of the directory it looks for files in is "bundle".
+
+    So a Python package with an extension bundle could look like this::
+
+        my_extensions/
+        ├── __init__.py
+        └── wide_footer
+            ├── __init__.py
+            └── bundle
+                ├── extension.js
+                └── styles.css
+
+    and would then need to register the bundle with an entry point
+    under the "redash.bundles" group, e.g. in your setup.py::
+
+        setup(
+            # ...
+            entry_points={
+                "redash.bundles": [
+                    "wide_footer = my_extensions.wide_footer",
+                ]
+                # ...
+            },
+            # ...
+        )
+
+    """
+    bundles = odict()
+    for entry_point in entry_points().get("redash.bundles", []):
+        logger.info('Loading Redash bundle "%s".', entry_point.name)
+        module = entry_point_module(entry_point)
+        # Try to get a list of bundle files
+        if not resource_isdir(module, BUNDLE_DIRECTORY):
+            logger.error(
+                'Redash bundle directory "%s" could not be found.', entry_point.name
+            )
+            continue
+        with path(module, BUNDLE_DIRECTORY) as bundle_dir:
+            bundles[entry_point.name] = list(bundle_dir.rglob("*"))
+
+    return bundles
+
+
+bundles = load_bundles().items()
+if bundles:
+    print('Number of extension bundles found: {}'.format(len(bundles)))
+else:
+    print('No extension bundles found.')
+
+for bundle_name, paths in bundles:
+    # Shortcut in case not paths were found for the bundle
+    if not paths:
+        print('No paths found for bundle "{}".'.format(bundle_name))
        continue

-    content_folder = resource_filename(root_module, content_folder_relative)
+    # The destination for the bundle files with the entry point name as the subdirectory
+    destination = Path(extensions_directory, bundle_name)
+    if not destination.exists():
+        destination.mkdir()

-    # This is where we place our extensions folder.
-    destination = os.path.join(
-        EXTENSIONS_DIRECTORY,
-        entry_point.name)
-
-    copy_tree(content_folder, destination)
+    # Copy the bundle directory from the module to its destination.
+    print('Copying "{}" bundle to {}:'.format(bundle_name, destination.resolve()))
+    for src_path in paths:
+        dest_path = destination / src_path.name
+        print(" - {} -> {}".format(src_path, dest_path))
+        copy(str(src_path), str(dest_path))
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -3,29 +3,48 @@ set -e

 worker() {
  WORKERS_COUNT=${WORKERS_COUNT:-2}
-  QUEUES=${QUEUES:-queries,scheduled_queries,celery}
+  QUEUES=${QUEUES:-queries,scheduled_queries,celery,schemas}
+  WORKER_EXTRA_OPTIONS=${WORKER_EXTRA_OPTIONS:-}

  echo "Starting $WORKERS_COUNT workers for queues: $QUEUES..."
-  exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+  exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --max-tasks-per-child=10 -Ofair $WORKER_EXTRA_OPTIONS
 }

 scheduler() {
  WORKERS_COUNT=${WORKERS_COUNT:-1}
  QUEUES=${QUEUES:-celery}
+  SCHEDULE_DB=${SCHEDULE_DB:-celerybeat-schedule}

  echo "Starting scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."

-  exec /usr/local/bin/celery worker --app=redash.worker --beat -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+  exec /usr/local/bin/celery worker --app=redash.worker --beat -s$SCHEDULE_DB -c$WORKERS_COUNT -Q$QUEUES -linfo --max-tasks-per-child=10 -Ofair
+}
+
+dev_worker() {
+  WORKERS_COUNT=${WORKERS_COUNT:-2}
+  QUEUES=${QUEUES:-queries,scheduled_queries,celery,schemas}
+  SCHEDULE_DB=${SCHEDULE_DB:-celerybeat-schedule}
+
+  echo "Starting dev scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."
+
+  exec watchmedo auto-restart --directory=./redash/ --pattern=*.py --recursive -- /usr/local/bin/celery worker --app=redash.worker --beat -s$SCHEDULE_DB -c$WORKERS_COUNT -Q$QUEUES -linfo --max-tasks-per-child=10 -Ofair
 }

 server() {
-  exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app
+  # Recycle gunicorn workers every n-th request. See http://docs.gunicorn.org/en/stable/settings.html#max-requests for more details.
+  MAX_REQUESTS=${MAX_REQUESTS:-1000}
+  MAX_REQUESTS_JITTER=${MAX_REQUESTS_JITTER:-100}
+  exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app --max-requests $MAX_REQUESTS --max-requests-jitter $MAX_REQUESTS_JITTER
 }

 create_db() {
  exec /app/manage.py database create_tables
 }

+celery_healthcheck() {
+  exec /usr/local/bin/celery inspect ping --app=redash.worker -d celery@$HOSTNAME
+}
+
 help() {
  echo "Redash Docker."
  echo ""
@@ -35,9 +54,12 @@ help() {
  echo "server -- start Redash server (with gunicorn)"
  echo "worker -- start Celery worker"
  echo "scheduler -- start Celery worker with a beat (scheduler) process"
+  echo "dev_worker  -- start Celery worker with a beat (scheduler) process which picks up code changes and reloads"
+  echo "celery_healthcheck -- runs a Celery healthcheck. Useful for Docker's HEALTHCHECK mechanism."
  echo ""
  echo "shell -- open shell"
  echo "dev_server -- start Flask development server with debugger and auto reload"
+  echo "debug -- start Flask development server with remote debugger via ptvsd"
  echo "create_db -- create database tables"
  echo "manage -- CLI to manage redash"
  echo "tests -- run tests"
@@ -67,10 +89,19 @@ case "$1" in
    shift
    scheduler
    ;;
+  dev_worker)
+    shift
+    dev_worker
+    ;;
  dev_server)
    export FLASK_DEBUG=1
    exec /app/manage.py runserver --debugger --reload -h 0.0.0.0
    ;;
+  debug)
+    export FLASK_DEBUG=1
+    export REMOTE_DEBUG=1
+    exec /app/manage.py runserver --debugger --no-reload -h 0.0.0.0
+    ;;
  shell)
    exec /app/manage.py shell
    ;;
--- a/bin/flake8_tests.sh
+++ b/bin/flake8_tests.sh
@@ -1,7 +1,9 @@
 #!/bin/sh

+set -o errexit  # fail the build if any task fails
+
 flake8 --version ; pip --version
 # stop the build if there are Python syntax errors or undefined names
-flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
 # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide      
 flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
--- a/bin/pack
+++ b/bin/pack
@@ -1,8 +0,0 @@
-#!/bin/bash
-NAME=redash
-VERSION=$(python ./manage.py version)
-FULL_VERSION=$VERSION+b$CIRCLE_BUILD_NUM
-FILENAME=$NAME.$FULL_VERSION.tar.gz
-
-sed -ri "s/^__version__ = '([A-Za-z0-9.-]*)'/__version__ = '$FULL_VERSION'/" redash/__init__.py
-tar -zcv -f $FILENAME --exclude="optipng*" --exclude=".git*" --exclude="*.pyc" --exclude="*.pyo" --exclude="venv" --exclude="node_modules" *
--- a/client/.babelrc
+++ b/client/.babelrc
@@ -1,8 +1,18 @@
 {
-  "presets": ["env", "react", "stage-2"],
+  "presets": [
+    ["@babel/preset-env", {
+      "exclude": [
+        "@babel/plugin-transform-async-to-generator",
+        "@babel/plugin-transform-arrow-functions"
+      ],
+      "useBuiltIns": "usage"
+    }],
+    "@babel/preset-react"
+  ],
  "plugins": [
    "angularjs-annotate",
-    "transform-object-assign",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-transform-object-assign",
    ["babel-plugin-transform-builtin-extend", {
      "globals": ["Error"]
    }]
--- a/client/.eslintignore
+++ b/client/.eslintignore
@@ -1,3 +1,3 @@
 build/*.js
 config/*.js
-node_modules
+client/dist
--- a/client/.eslintrc.js
+++ b/client/.eslintrc.js
@@ -1,23 +1,22 @@
 module.exports = {
  root: true,
-  extends: ["airbnb", "plugin:jest/recommended"],
-  plugins: ["jest", "cypress"],
+  extends: ["airbnb", "plugin:compat/recommended"],
+  plugins: ["jest", "compat", "no-only-tests"],
  settings: {
    "import/resolver": "webpack"
  },
  parser: "babel-eslint",
  env: {
-    "jest/globals": true,
-    "cypress/globals": true,
-    "browser": true,
-    "node": true
+    browser: true,
+    node: true
  },
  rules: {
    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'no-param-reassign': 0,
-    'no-mixed-operators': 0,
-    'no-underscore-dangle': 0,
+    "no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
+    "no-param-reassign": 0,
+    "no-mixed-operators": 0,
+    "no-underscore-dangle": 0,
+    "no-use-before-define": ["error", "nofunc"],
    "prefer-destructuring": "off",
    "prefer-template": "off",
    "no-restricted-properties": "off",
@@ -26,19 +25,42 @@ module.exports = {
    "no-lonely-if": "off",
    "consistent-return": "off",
    "no-control-regex": "off",
+    "no-multiple-empty-lines": "warn",
+    "no-only-tests/no-only-tests": "error",
+    "operator-linebreak": "off",
+    "react/destructuring-assignment": "off",
    "react/jsx-filename-extension": "off",
+    "react/jsx-one-expression-per-line": "off",
    "react/jsx-uses-react": "error",
    "react/jsx-uses-vars": "error",
+    "react/jsx-wrap-multilines": "warn",
+    "react/no-access-state-in-setstate": "warn",
    "react/prefer-stateless-function": "warn",
    "react/forbid-prop-types": "warn",
    "react/prop-types": "warn",
    "jsx-a11y/anchor-is-valid": "off",
-    "max-len": ['error', 120, 2, {
+    "jsx-a11y/click-events-have-key-events": "off",
+    "jsx-a11y/label-has-associated-control": [
+      "warn",
+      {
+        controlComponents: true
+      }
+    ],
+    "jsx-a11y/label-has-for": "off",
+    "jsx-a11y/no-static-element-interactions": "off",
+    "max-len": [
+      "error",
+      120,
+      2,
+      {
        ignoreUrls: true,
        ignoreComments: false,
        ignoreRegExpLiterals: true,
        ignoreStrings: true,
-      ignoreTemplateLiterals: true,
-    }]
+        ignoreTemplateLiterals: true
+      }
+    ],
+    "no-else-return": ["error", { allowElseIf: true }],
+    "object-curly-newline": ["error", { consistent: true }]
  }
 };
--- a/client/app/.eslintrc.js
+++ b/client/app/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+  extends: ["plugin:jest/recommended"],
+  plugins: ["jest"],
+  env: {
+    "jest/globals": true,
+  },
+  rules: {
+    "jest/no-focused-tests": "off",
+  },
+};
--- a/client/app/tests/enzyme_setup.js
+++ b/client/app/tests/enzyme_setup.js
@@ -0,0 +1,4 @@
+import { configure } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+configure({ adapter: new Adapter() });
--- a/client/app/tests/mocks.js
+++ b/client/app/tests/mocks.js
@@ -0,0 +1,5 @@
+import MockDate from 'mockdate';
+
+const date = new Date('2000-01-01T02:00:00.000');
+
+MockDate.set(date);
--- a/client/app/assets/images/db-logos/aws_es.png
+++ b/client/app/assets/images/db-logos/aws_es.png
--- a/client/app/assets/images/db-logos/azure_kusto.png
+++ b/client/app/assets/images/db-logos/azure_kusto.png
--- a/client/app/assets/images/db-logos/bigquery_gce.png
+++ b/client/app/assets/images/db-logos/bigquery_gce.png
--- a/client/app/assets/images/db-logos/couchbase.png
+++ b/client/app/assets/images/db-logos/couchbase.png
--- a/client/app/assets/images/db-logos/dgraph.png
+++ b/client/app/assets/images/db-logos/dgraph.png
--- a/client/app/assets/images/db-logos/drill.png
+++ b/client/app/assets/images/db-logos/drill.png
--- a/client/app/assets/images/db-logos/json.png
+++ b/client/app/assets/images/db-logos/json.png
--- a/client/app/assets/images/db-logos/phoenix.png
+++ b/client/app/assets/images/db-logos/phoenix.png
--- a/client/app/assets/images/db-logos/uptycs.png
+++ b/client/app/assets/images/db-logos/uptycs.png
--- a/client/app/assets/images/destinations/hangouts_chat.png
+++ b/client/app/assets/images/destinations/hangouts_chat.png
--- a/client/app/assets/images/destinations/slack.png
+++ b/client/app/assets/images/destinations/slack.png
--- a/client/app/assets/less/ant.less
+++ b/client/app/assets/less/ant.less
@@ -0,0 +1,365 @@
+@import '~antd/lib/style/core/iconfont';
+@import '~antd/lib/style/core/motion';
+@import '~antd/lib/alert/style/index';
+@import '~antd/lib/input/style/index';
+@import '~antd/lib/input-number/style/index';
+@import '~antd/lib/date-picker/style/index';
+@import '~antd/lib/modal/style/index';
+@import '~antd/lib/tooltip/style/index';
+@import '~antd/lib/select/style/index';
+@import '~antd/lib/checkbox/style/index';
+@import '~antd/lib/upload/style/index';
+@import '~antd/lib/form/style/index';
+@import '~antd/lib/button/style/index';
+@import '~antd/lib/radio/style/index';
+@import '~antd/lib/time-picker/style/index';
+@import '~antd/lib/pagination/style/index';
+@import '~antd/lib/table/style/index';
+@import '~antd/lib/popover/style/index';
+@import '~antd/lib/icon/style/index';
+@import '~antd/lib/tag/style/index';
+@import '~antd/lib/grid/style/index';
+@import '~antd/lib/switch/style/index';
+@import '~antd/lib/empty/style/index';
+@import '~antd/lib/drawer/style/index';
+@import '~antd/lib/card/style/index';
+@import '~antd/lib/steps/style/index';
+@import '~antd/lib/divider/style/index';
+@import '~antd/lib/dropdown/style/index';
+@import '~antd/lib/menu/style/index';
+@import '~antd/lib/list/style/index';
+@import "~antd/lib/badge/style/index";
+@import "~antd/lib/card/style/index";
+@import "~antd/lib/spin/style/index";
+@import "~antd/lib/tabs/style/index";
+@import "~antd/lib/notification/style/index";
+@import "~antd/lib/collapse/style/index";
+@import "~antd/lib/progress/style/index";
+@import "~antd/lib/typography/style/index";
+@import 'inc/ant-variables';
+
+// Increase z-indexes to avoid conflicts with some other libraries (e.g. Plotly)
+@zindex-modal: 2000;
+@zindex-modal-mask: 2000;
+@zindex-message: 2010;
+@zindex-notification: 2010;
+@zindex-popover: 2030;
+@zindex-dropdown: 2050;
+@zindex-picker: 2050;
+@zindex-tooltip: 2060;
+
+.@{drawer-prefix-cls} {
+  &.help-drawer {
+    z-index: @zindex-tooltip; // help drawer should be topmost
+  }
+}
+
+// Remove bold in labels for Ant checkboxes and radio buttons
+.ant-checkbox-wrapper,
+.ant-radio-wrapper {
+  font-weight: normal;
+}
+
+// Fix for disabled button styles inside Tooltip component.
+// Tooltip wraps disabled buttons with `<span>` and moves all styles
+// and classes to that `<span>`. This resets all button styles and
+// turns it into simple inline element (because now it's wrapper is a button)
+.btn {
+  button[disabled] {
+    -moz-appearance: none !important;
+    -webkit-appearance: none !important;
+    appearance: none !important;
+    border: 0 !important;
+    outline: none !important;
+    background: transparent !important;
+    margin: 0 !important;
+    padding: 0 !important;
+  }
+}
+
+// Button overrides
+.@{btn-prefix-cls} {
+  transition-duration: 150ms;
+}
+
+// Fix ant input number showing duplicate arrows
+.ant-input-number-input::-webkit-outer-spin-button,
+.ant-input-number-input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+// Pagination overrides (based on existing Bootstrap overrides)
+.@{pagination-prefix-cls} {
+  display: inline-block;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  vertical-align: top;
+
+  &-item {
+    background-color: @pagination-bg;
+    border-color: transparent;
+    color: @pagination-color;
+    font-size: 14px;
+    margin-right: 5px;
+
+    a {
+      color: inherit;
+    }
+
+    &:focus,
+    &:hover {
+      background-color: @pagination-hover-bg;
+      border-color: transparent;
+      color: @pagination-hover-color;
+      a {
+        color: inherit;
+      }
+    }
+
+    &-active {
+      &,
+      &:hover,
+      &:focus {
+        background-color: @pagination-active-bg;
+        color: @pagination-active-color;
+        border-color: transparent;
+        pointer-events: none;
+        cursor: default;
+
+        a {
+          color: inherit;
+        }
+      }
+    }
+  }
+
+  &-disabled {
+    &,
+    &:hover,
+    &:focus {
+      opacity: 0.5;
+      pointer-events: none;
+    }
+  }
+
+  &-prev,
+  &-next {
+    .@{pagination-prefix-cls}-item-link {
+      background-color: @pagination-bg;
+      border-color: transparent;
+      color: @pagination-color;
+      line-height: @pagination-item-size - 2px;
+
+      .@{pagination-prefix-cls}.mini & {
+        line-height: @pagination-item-size-sm - 2px;
+      }
+    }
+
+    &:focus .@{pagination-prefix-cls}-item-link,
+    &:hover .@{pagination-prefix-cls}-item-link {
+      background-color: @pagination-hover-bg;
+      border-color: transparent;
+      color: @pagination-hover-color;
+    }
+  }
+
+  &-prev,
+  &-jump-prev,
+  &-jump-next {
+    margin-right: 5px;
+  }
+
+  &-jump-prev,
+  &-jump-next {
+    .@{pagination-prefix-cls}-item-container {
+      .@{pagination-prefix-cls}-item-link-icon {
+        color: @pagination-color;
+      }
+    }
+  }
+}
+
+// Table
+
+.@{table-prefix-cls} {
+  color: inherit;
+
+  tr,
+  th,
+  td {
+    transition: none !important;
+  }
+
+  &-thead > tr > th {
+    padding: @table-padding-vertical * 2 @table-padding-horizontal;
+  }
+
+  .@{table-prefix-cls}-column-sorters {
+    &:before,
+    &:hover:before {
+      content: none;
+    }
+  }
+
+  &-thead > tr > th {
+    .@{table-prefix-cls}-column-sorter {
+      &-up,
+      &-down {
+        &.on {
+          color: @table-header-icon-active-color;
+        }
+      }
+    }
+  }
+
+  // Custom styles
+
+  &-headerless &-tbody > tr:first-child > td {
+    border-top: @border-width-base @border-style-base @border-color-split;
+  }
+}
+
+// List
+
+.@{list-prefix-cls} {
+  &-item {
+    // custom rule
+    &.selected {
+      background-color: #F6F8F9;
+    }
+
+    &.disabled {
+      background-color: fade(#F6F8F9, 40%);
+
+      & > * {
+        opacity: 0.4;
+      }
+    }
+  }
+}
+
+.@{dialog-prefix-cls} {
+  // styling for short modals (no lines)
+  &.shortModal {
+    .@{dialog-prefix-cls} {
+      &-header,
+      &-footer {
+        border: none;
+        padding: 16px;
+      }
+
+      &-body {
+        padding: 10px 16px;
+      }
+
+      &-close-x {
+        width: 46px;
+        height: 46px;
+        line-height: 46px;
+      }
+    }
+  }
+
+  // fullscreen modals
+  &-fullscreen {
+    .@{dialog-prefix-cls} {
+      position: absolute;
+      left: 15px;
+      top: 15px;
+      right: 15px;
+      bottom: 15px;
+      width: auto !important;
+      height: auto !important;
+      max-width: none;
+      max-height: none;
+      margin: 0;
+      padding: 0;
+
+      .@{dialog-prefix-cls}-content {
+        position: absolute;
+        left: 0;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        width: auto;
+        height: auto;
+        margin: 0;
+        padding: 0;
+        display: flex;
+        flex-direction: column;
+      }
+
+      .@{dialog-prefix-cls}-body {
+        flex: 1 1 auto;
+        overflow: auto;
+      }
+    }
+  }
+}
+
+// description in modal header
+.modal-header-desc {
+  font-size: @font-size-base;
+  color: @text-color-secondary;
+  font-weight: normal;
+  margin-top: 4px;
+}
+
+// Notification overrides
+.@{notification-prefix-cls} {
+  // vertical centering
+  &-notice-close {
+    top: 20px;
+    right: 20px;
+  }
+
+  &-notice-description {
+    max-width: 484px;
+  }
+}
+
+.@{btn-prefix-cls} .@{iconfont-css-prefix}-ellipsis {
+  margin: 0 -7px;
+}
+
+// Collapse
+
+.@{collapse-prefix-cls} {
+  &&-headerless {
+    border: 0;
+    background: none;
+
+    .@{collapse-prefix-cls}-header {
+      display: none;
+    }
+
+    .@{collapse-prefix-cls}-item,
+    .@{collapse-prefix-cls}-content {
+      border: 0;
+    }
+
+    .@{collapse-prefix-cls}-content-box {
+      padding: 0;
+    }
+  }
+}
+
+// overrides for tall form components such as ace editor
+.@{form-prefix-cls}-item {
+  &-children {
+    display: block; // so feeback icon positions correctly
+  }
+
+  // no change for short components, sticks to body for tall ones
+  &-children-icon {
+    top: auto !important;
+    bottom: 8px;
+
+     // makes the icon white instead of see-through
+    & svg {
+      background: white;
+      border-radius: 50%;
+    }
+  }
+}
--- a/client/app/assets/less/inc/alert.less
+++ b/client/app/assets/less/inc/alert.less
@@ -1,6 +1,5 @@
 .alert {
-    padding-left: 30px;
-    padding-right: 30px;
+    padding: 15px;
    
    span {
        cursor: pointer;
--- a/client/app/assets/less/inc/ant-variables.less
+++ b/client/app/assets/less/inc/ant-variables.less
@@ -0,0 +1,86 @@
+/* --------------------------------------------------------
+    Colors
+-----------------------------------------------------------*/
+@lightblue:                             #03A9F4;
+@primary-color:                        #2196F3;
+
+@redash-gray: rgba(102, 136, 153, 1);
+@redash-orange: rgba(255, 120, 100, 1);
+@redash-black: rgba(0, 0, 0, 1);
+@redash-yellow: rgba(252, 252, 161, 0.75);
+
+/* --------------------------------------------------------
+    Font
+-----------------------------------------------------------*/
+@redash-font:                          -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@font-family-no-number:                @redash-font;
+@font-family:                          @redash-font;
+@code-family:                          @redash-font;
+@font-size-base:                       13px;
+
+
+/* --------------------------------------------------------
+    Borders
+-----------------------------------------------------------*/
+@border-color-split:                   #f0f0f0;
+
+
+/* --------------------------------------------------------
+    Typograpgy
+-----------------------------------------------------------*/
+@text-color:                           #595959;
+
+
+/* --------------------------------------------------------
+    Form
+-----------------------------------------------------------*/
+@input-height-base:                    35px;
+@input-color:                          #595959;
+@border-radius-base: 2px;
+@border-color-base:                    #E8E8E8;
+
+
+/* --------------------------------------------------------
+    Button
+-----------------------------------------------------------*/
+@btn-danger-bg: fade(@redash-gray, 10%);
+@btn-danger-border: fade(@redash-gray, 15%);
+
+
+/* --------------------------------------------------------
+    Pagination
+-----------------------------------------------------------*/
+@pagination-item-size: 33px;
+@pagination-font-family: @redash-font;
+@pagination-font-weight-active: normal;
+
+@pagination-bg:                         fade(@redash-gray, 15%);
+@pagination-color:                      #7E7E7E;
+@pagination-active-bg:                  @lightblue;
+@pagination-active-color:               #FFF;
+@pagination-disabled-bg:                fade(@redash-gray, 15%);
+@pagination-hover-color:                #333;
+@pagination-hover-bg:                   fade(@redash-gray, 25%);
+
+
+/* --------------------------------------------------------
+    Table
+-----------------------------------------------------------*/
+@table-border-radius-base: 0;
+@table-header-color: #333;
+@table-header-bg: fade(@redash-gray, 3%);
+@table-header-icon-color: fade(@text-color, 20%);
+@table-header-icon-active-color: @text-color;
+@table-header-sort-bg: @table-header-bg;
+@table-header-sort-active-bg: @table-header-bg;
+@table-header-filter-active-bg: @table-header-bg;
+@table-body-sort-bg: transparent;
+@table-row-hover-bg: fade(@redash-gray, 5%);
+@table-padding-vertical: 7px;
+@table-padding-horizontal: 10px;
+
+/* --------------------------------------------------------
+    Notification
+-----------------------------------------------------------*/
+@notification-padding: @notification-padding-vertical 48px @notification-padding-vertical 17px;
+@notification-width: auto;
--- a/client/app/assets/less/inc/base.less
+++ b/client/app/assets/less/inc/base.less
@@ -19,21 +19,30 @@ html, body {
 }

 body {
-    padding-top: @header-height;
-    position: relative;
-    padding-bottom: @footer-height;
-    &.headless {
    padding-top: 0;
-        padding-bottom: 0;
-        .nav.app-header {
-            display: none;
-        }
-        div#footer {
+    background: #F6F8F9;
+    font-family: @redash-font;
+    position: relative;
+    
+    &.headless {
+        padding-top: 10px;
+        
+        .nav.app-header, .navbar {
            display: none;
        }
    }
 }

+app-view {
+    min-height: 100vh;
+}
+
+app-view, #app-content {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+}
+
 strong {
    font-weight: 500;
 }
@@ -67,10 +76,38 @@ strong {
    }
 }

+// Fixed width layout for specific pages
+@media (min-width: 768px) {
+    settings-screen, home-page, page-dashboard-list, page-queries-list, page-alerts-list, alert-page, queries-search-results-page, .fixed-container {
+        .container {
+            width: 750px;
+        }
+    }
+}
+
+@media (min-width: 992px) {
+    settings-screen, home-page, page-dashboard-list, page-queries-list, page-alerts-list, alert-page, queries-search-results-page, .fixed-container {
+        .container {
+            width: 970px;
+        }
+    }
+}
+
+@media (min-width: 1200px) {
+    settings-screen, home-page, page-dashboard-list, page-queries-list, page-alerts-list, alert-page, queries-search-results-page, .fixed-container {
+        .container {
+            width: 1170px;
+        }
+    }
+}
+
 .scrollbox {
    overflow: auto;
    position: relative;
+}

+.clickable {
+    cursor: pointer;
 }

 .resize-vertical {
@@ -86,3 +123,150 @@ strong {
    resize: both !important;
    transition: height 0s, width 0s !important;
 }
+
+// Ace Editor
+.ace_editor {
+    border: 1px solid fade(@redash-gray, 15%) !important;
+}
+
+.ace-tm {
+    .ace_gutter {
+        background: #fff !important;
+    }
+    
+    .ace_gutter-active-line {
+        background-color: fade(@redash-gray, 20%) !important;
+    }
+    
+    .ace_marker-layer .ace_active-line {
+        background: fade(@redash-gray, 9%) !important;
+    }
+}
+
+.bg-ace {
+    background-color: fade(@redash-gray, 12%) !important;
+}
+
+// resizeable
+.rg-top span, .rg-bottom span {
+    height: 3px;
+    border-color: #b1c1ce; // TODO: variable
+}
+
+.rg-bottom {
+    bottom: 15px;
+    
+    span {
+        margin: 1.5px 0 0 -10px;
+    }
+}
+
+// Plotly
+text.slicetext {
+    text-shadow: 1px 1px 5px #333;
+}
+
+// markdown
+.markdown strong {
+    font-weight: bold;
+}
+
+.markdown img {
+    max-width: 100%;
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    background-color: fade(@redash-gray, 15%);
+    color: #111;
+}
+
+.profile__image--navbar {
+    border-radius: 100%;
+    margin-right: 3px;
+    margin-top: -2px;
+}
+
+.profile__image--settings {
+    border-radius: 100%;
+}
+
+.profile__image_thumb {
+    border-radius: 100%;
+    margin-right: 3px;
+    margin-top: -2px;
+    width: 20px;
+    height: 20px;
+}
+
+
+// Error state
+.error-state {
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    text-align: center;
+    margin-top: 25vh;
+    padding: 35px;
+    font-size: 14px;
+    line-height: 21px;
+    
+    .error-state__icon {
+        .zmdi {
+            font-size: 64px;
+            color: @redash-gray;
+        }
+    }
+    
+    @media (max-width: 767px) {
+        margin-top: 10vh;
+    }
+}
+
+// page
+.page-header--new .btn-favourite, .page-header--new .btn-archive {
+    font-size: 19px;
+  }
+  
+  .page-title {
+    display: flex;
+    align-items: center;
+  
+    h3 {
+      margin-right: 5px !important;
+    }
+  
+    .label {
+      margin-top: 3px;
+      display: inline-block;
+    }
+  
+    favorites-control {
+      margin-right: 5px;
+    }
+  
+    @media (max-width: 767px) {
+      display: block;
+  
+      favorites-control {
+        float: left;
+      }
+  
+      h3 {
+        width: 100%;
+        margin-bottom: 5px !important;
+        display: block !important;
+      }
+    }
+  }
+  
+  .page-header-wrapper, .page-header--new {
+    h3 {
+      margin: 0.2em 0;
+      line-height: 1.3;
+      font-weight: 500;
+    }
+  }
+
+  .select-option-divider {
+    margin: 10px 0 !important;
+  }
--- a/client/app/assets/less/inc/bootstrap-overrides.less
+++ b/client/app/assets/less/inc/bootstrap-overrides.less
@@ -31,7 +31,7 @@

 .collapsing,
 .collapse.in {
-    padding: 5px 10px;
+    padding: 0;
    transition: all 0.35s ease;
 }

--- a/client/app/assets/less/inc/button.less
+++ b/client/app/assets/less/inc/button.less
@@ -122,3 +122,21 @@
  top: 1px;
  position: relative;
 }
+
+
+.btn-default {
+    background-color: fade(@redash-gray, 15%);
+}
+
+.btn-transparent {
+    background-color: transparent !important;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default.focus, .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default {
+    background-color: fade(@redash-gray, 25%);
+}
+
+.btn-default:active:hover, .btn-default.active:hover, .open > .dropdown-toggle.btn-default:hover, .btn-default:active:focus, .btn-default.active:focus, .open > .dropdown-toggle.btn-default:focus, .btn-default:active.focus, .btn-default.active.focus, .open > .dropdown-toggle.btn-default.focus {
+    color: #333;
+    background-color: fade(@redash-gray, 45%);
+}
--- a/client/app/assets/less/inc/footer.less
+++ b/client/app/assets/less/inc/footer.less
@@ -1,48 +0,0 @@
-#footer {
-    position: absolute;
-    bottom: 0;
-    text-align: center;
-    width: 100%;
-    height: @footer-height;
-    color: #a2a2a2;
-    padding-top: 10px;
-    padding-bottom: 15px;
-
-    .f-menu {
-        display: block;
-        width: 100%;
-        .list-inline();
-        margin-top: 8px;
-
-        & > li > a {
-            color: #a2a2a2;
-
-            &:hover {
-                color: #777;
-            }
-        }
-    }
-
-    @media (min-width: (@screen-lg-min + 80px)) {
-        padding-left: (@sidebar-left-width + @grid-gutter-width);
-    }
-
-    @media (min-width: @screen-sm-min) and (max-width: (@screen-md-max + 80px)) {
-        padding-left: (@sidebar-left-mid-width + @grid-gutter-width);
-    }
-
-    @media (max-width: (@screen-sm-min)) {
-        padding-left: @grid-gutter-width/2;
-    }
-}
-
-.footer {
-  color: #818d9f;
-  padding-bottom: 30px;
-  a {
-    color: #818d9f;
-    margin-left: 20px;
-  }
-}
-
-
--- a/client/app/assets/less/inc/form.less
+++ b/client/app/assets/less/inc/form.less
@@ -55,14 +55,17 @@ textarea.v-resizable {
    .transition-duration(300ms);
    resize: none;
    box-shadow: 0 0 0 40px rgba(0, 0, 0, 0) !important;
-    border-radius: 0;
+    border-radius: @redash-input-radius;

    &:focus {
-        box-shadow: 0 0 1px -2px rgba(121,194,255,0.5) !important;
+        box-shadow: none !important;
+        border-color: @blue;
+    }
+    &:hover {
+        border-color: @blue;
    }
 }

-
 /* --------------------------------------------------------
    Custom Checkbox + Radio
 -----------------------------------------------------------*/
--- a/client/app/assets/less/inc/generics.less
+++ b/client/app/assets/less/inc/generics.less
@@ -146,9 +146,17 @@
    Width
 -----------------------------------------------------------*/
 .w-100 { width: 100% !important; }
+.w-50 { width: 50% !important; }
+.w-25 { width: 25% !important; }


 /* --------------------------------------------------------
    Border Radius
 -----------------------------------------------------------*/
 .brd-2 { border-radius: 2px; }
+
+
+/* --------------------------------------------------------
+    Alignment
+-----------------------------------------------------------*/
+.va-top { vertical-align: top; }
--- a/client/app/assets/less/inc/label.less
+++ b/client/app/assets/less/inc/label.less
@@ -1,14 +1,37 @@
-.label {
-    border-radius: 1px;
-    padding: 4px 5px 3px;
-}
-
-h1, h2, h3, h4, h5, h6 {
 .label {
    border-radius: 2px;
-    }
+    padding: 3px 6px 4px;
+    font-weight: 500;
+    font-size: 11px;
 }

 .badge {
    border-radius: 1px;
 }
+
+.label-default {
+    background: fade(@redash-gray, 85%);
+}
+
+.label-tag-unpublished {
+    background: fade(@redash-gray, 85%);
+}
+
+.label-tag-archived {
+    .label-warning();
+}
+
+.label-tag {
+    background: fade(@redash-gray, 10%);
+    color: fade(@redash-gray, 75%);
+}
+
+.label-tag-unpublished,
+.label-tag-archived,
+.label-tag {
+    margin-right: 3px;
+    display: inline;
+    margin-top: 2px;
+    max-width: 24ch;
+    .text-overflow();
+}
--- a/client/app/assets/less/inc/list-group.less
+++ b/client/app/assets/less/inc/list-group.less
@@ -31,6 +31,17 @@ tags-list {
  line-height: 1.3;
 }

+.tags-list {
+  .badge-light {
+    background: fade(@redash-gray, 10%);
+    color: fade(@redash-gray, 75%);
+  }
+  
+  a:hover {
+    cursor: pointer;
+  }
+}
+
 .max-character {
  .text-overflow();
 }
@@ -45,6 +56,11 @@ tags-list {
      line-height: 100%;
      margin-top: 2px;
  }
+
+  &.active, &.active:hover, &.active:focus {
+    background-color: #fff;
+    box-shadow: inset 3px 0px 0px @brand-primary;
+  }
 }

 .list-group-item-heading {
@@ -76,3 +92,18 @@ tags-list {
    height: 38px;
    border-radius: 2px;
 }
+
+.ui-select-choices-row.disabled > span {
+  background-color: inherit !important;
+}
+
+.list-group-item.inactive,
+.ui-select-choices-row.disabled {
+  background-color: #eee !important;
+  border-color: transparent;
+  opacity: 0.5;
+  box-shadow: none;
+  color: #333;
+  pointer-events: none;
+  cursor: not-allowed;
+}
--- a/client/app/assets/less/inc/misc.less
+++ b/client/app/assets/less/inc/misc.less
@@ -226,3 +226,12 @@
    border-radius: 2px;
    width: 37px;
 }
+
+/* --------------------------------------------------------
+    Percy
+-----------------------------------------------------------*/
+@media only percy {
+    .hide-in-percy, .pace {
+        visibility: hidden;
+    }
+}
--- a/client/app/assets/less/inc/navbar.less
+++ b/client/app/assets/less/inc/navbar.less
@@ -1,6 +1,5 @@
 a.navbar-brand {
  padding: 5px 5px 0px 0px;
-  margin-left: 0px !important;
 }

 .navbar .fa {
@@ -31,3 +30,266 @@ a.navbar-brand img {
  left: -9px;
  bottom: -11px;
 }
+
+.caret--nav {
+  border-top: none;
+}
+
+.caret--nav:after {
+  content: "";
+  position: absolute;
+  right: 5px;
+  top: 9px;
+  width: 13px;
+  height: 13px;
+  display: block;
+  background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='11px' height='6px' viewBox='0 0 11 6' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3C!-- Generator: Sketch 42 %2836781%29 - http://www.bohemiancoding.com/sketch --%3E%3Ctitle%3EShape%3C/title%3E%3Cdesc%3ECreated with Sketch.%3C/desc%3E%3Cdefs%3E%3C/defs%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M5.296,4.288 L9.382,0.2 C9.66086822,-0.0716916976 10.1065187,-0.068122925 10.381,0.208 C10.661,0.488 10.661,0.932 10.388,1.206 L5.792,5.803 C5.6602899,5.93388911 5.48167943,6.00662966 5.296,6.005 C5.10997499,6.00689786 4.93095449,5.93413702 4.799,5.803 L0.204,1.207 C0.072163111,1.07394937 -0.00121750401,0.893846387 9.62313189e-05,0.706545264 C0.00140996665,0.519244142 0.0773097323,0.340188219 0.211,0.209 C0.485365732,-0.0664648737 0.930253538,-0.0700311086 1.209,0.201 L5.296,4.288 L5.296,4.288 Z' id='Shape' fill='%23000000'%3E%3C/path%3E%3C/g%3E%3C/svg%3E");
+  background-size: 100% 100%;
+  transition: transform .2s cubic-bezier(.75,0,.25,1);
+}
+
+.navbar .caret--nav:after {
+  top: 19px;
+}
+
+.dropdown--profile .caret--nav:after {
+  right: 8px;
+}
+
+.btn--create {
+  padding-right: 20px;
+
+  .caret--nav:after {
+    top: 10px;
+    right: 10px;
+    background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='11px' height='6px' viewBox='0 0 11 6' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3C!-- Generator: Sketch 42 %2836781%29 - http://www.bohemiancoding.com/sketch --%3E%3Ctitle%3EShape%3C/title%3E%3Cdesc%3ECreated with Sketch.%3C/desc%3E%3Cdefs%3E%3C/defs%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M5.29592111,4.28945339 L9.38192111,0.201453387 C9.66078932,-0.0702383105 10.1064398,-0.0666695379 10.3809211,0.209453387 C10.6609211,0.489453387 10.6609211,0.933453387 10.3879211,1.20745339 L5.79192111,5.80445339 C5.66021101,5.9353425 5.48160054,6.00808305 5.29592111,6.00645339 C5.1098961,6.00835125 4.9308756,5.9355904 4.79892111,5.80445339 L0.203921109,1.20845339 C0.0720842204,1.07540275 -0.00129639464,0.895299774 1.73406884e-05,0.707998651 C0.00133107602,0.520697529 0.0772308417,0.341641606 0.210921109,0.210453387 C0.485286842,-0.0650114866 0.930174648,-0.0685777215 1.20892111,0.202453387 L5.29592111,4.28945339 L5.29592111,4.28945339 Z' id='Shape' fill='%23FCFCFC'%3E%3C/path%3E%3C/g%3E%3C/svg%3E");
+  }
+}
+
+.dropdown.open .caret--nav:after {
+  transform: rotate(180deg);
+}
+
+.navbar {
+  box-shadow: fade(@redash-gray, 15%) 0px 4px 9px -3px;
+
+  .navbar-collapse {
+    padding-left: 0;
+  }
+
+  a.dropdown--profile {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    line-height: 2.35;
+  }
+
+  .navbar-inverse {
+    background-color: @redash-gray;
+    border: none;
+  }
+}
+
+.navbar-btn {
+  margin-top: 10px;
+  margin-bottom: 9px;
+}
+
+.navbar-brand {
+  position: absolute;
+  left: 50%;
+  margin-left: -25px !important; // center
+  display: block;
+  zoom: 0.9;
+}
+
+.menu-search {
+  margin-top: 2px;
+}
+
+.dropdown-menu--profile {
+  li {
+    width: 200px;
+  }
+}
+
+.navbar .collapse.in {
+  background: #fff;
+  position: relative;
+  z-index: 999;
+  padding: 0 10px 0 10px;
+}
+.navbar {
+  min-height: initial;
+  height: 50px;
+  border: 1px solid #fff;
+  border-top: none;
+  border-radius: 0;
+  background: #fff;
+  margin-bottom: 10px;
+
+  .btn-group.open .dropdown-toggle {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+
+  .btn-group .btn:active {
+    box-shadow: none;
+  }
+}
+
+.navbar-link-ANGULAR_REMOVE_ME {
+  line-height: 18px;
+  padding: 10px 15px;
+  display: block;
+
+  @media (min-width: 768px) {
+    padding-top: 16px;
+    padding-bottom: 16px;
+  }
+}
+
+.navbar-link-ANGULAR_REMOVE_ME,
+.navbar-default .navbar-nav > li > a {
+  color: #000;
+  font-weight: 500;
+
+  &:active, &:hover, &:focus {
+    color: #000;
+  }
+}
+
+.navbar-default .btn__new button {
+  font-weight: 500;
+}
+
+.btn__new {
+  margin-left: 15px;
+}
+
+.navbar-default .navbar-nav > li > a:hover {
+  //background-color: fade(@redash-gray, 10%);
+  //text-decoration: underline;
+  //border-radius: 0;
+}
+
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+  background-color: fade(@redash-gray, 15%);
+  color: #111;
+}
+
+
+// Responsive fixes
+@media (max-width: 767px) {
+  .navbar-brand {
+    left: 2%;
+    margin-left: 0 !important;
+  }
+
+  //Fix navbar collapse
+  .navbar .collapse.in {
+    border: none;
+
+    .dropdown-menu--profile {
+      li {
+        width: auto;
+      }
+    }
+
+    .dropdown--profile {
+      .caret--nav:after {
+        right: initial !important;
+      }
+    }
+
+    .dropdown--profile__username {
+      display: inline-block;
+    }
+
+    .nav__main li a {
+      padding: 10px 15px;
+      display: block;
+      text-align: left;
+      float: none !important;
+    }
+
+    .navbar-form {
+      margin-bottom: 0;
+      margin-top: 0;
+    }
+
+    .navbar-right {
+      margin-bottom: 0;
+    }
+  }
+}
+
+@media (min-width: 768px) {
+  @media (max-width: 880px) {
+    .navbar-link-ANGULAR_REMOVE_ME,
+    .navbar-default .navbar-nav > li > a,
+    .navbar-form {
+      padding-left: 10px !important;
+      padding-right: 10px !important;
+    }
+
+    a.navbar-brand {
+      margin-left: -15px !important;
+    }
+  }
+
+  @media (max-width: 810px) {
+    .menu-search {
+      width: 175px;
+    }
+
+    a.navbar-brand {
+      margin-left: 13px !important;
+    }
+  }
+}
+
+@media (max-width: 1084px) {
+  .dropdown--profile__username {
+    display: none;
+  }
+}
+
+
+
+
+// Cross-browser fixes
+
+// Firefox
+@-moz-document url-prefix() {
+  .caret--nav::after {
+    height: 7px;
+  }
+
+  .navbar .caret--nav::after {
+    top: 22px;
+  }
+
+  .navbar .btn--create .caret--nav::after {
+    top: 12px;
+  }
+}
+
+// IE10+
+@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
+  .caret--nav::after {
+    height: 7px;
+  }
+
+  .navbar .caret--nav::after {
+    top: 22px;
+  }
+
+  .navbar .btn--create .caret--nav::after {
+    top: 12px;
+  }
+}
+
+
+.navbar li a .btn-favourite .fa, .navbar li a .btn-archive .fa {
+  font-size: 100%;
+}
--- a/client/app/assets/less/inc/pagination.less
+++ b/client/app/assets/less/inc/pagination.less
@@ -1,54 +0,0 @@
-.pagination {
-    border-radius: 0;
-    
-    & > li {
-        margin: 0 2px;
-        display: inline-block;
-        vertical-align: top;
-        
-        & > a,
-        & > span {
-            border-radius: 50% !important;
-            padding: 0;
-            width: 40px;
-            height: 40px;
-            line-height: 38px;
-            text-align: center;
-            font-size: 14px;
-            z-index: 1;
-            position: relative;
-            
-            & > .zmdi {
-                font-size: 22px;
-                line-height: 39px;
-            }
-        }
-        
-        &.disabled {
-            .opacity(0.5);
-        }  
-    }
-} 
-
-
-/* --------------------------------------------------------
-    Listview Pagination
-----------------------------------------------------------*/
-.lv-pagination {
-    width: 100%;
-    text-align: center;
-    padding: 40px 0;
-    border-top: 1px solid #F0F0F0;
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-
-/* --------------------------------------------------------
-    Pager
-----------------------------------------------------------*/
-.pager li > a, .pager li > span {
-    padding: 5px 10px 6px; 
-    color: @pagination-color;
-}
-
--- a/client/app/assets/less/inc/popover.less
+++ b/client/app/assets/less/inc/popover.less
@@ -1,5 +1,5 @@
 .popover {
-    box-shadow: 0 2px 30px rgba(0, 0, 0, 0.2);
+    box-shadow: fade(@redash-gray, 25%) 0px 0px 15px 0px;
 }

 .popover-title {
--- a/client/app/assets/less/inc/print.less
+++ b/client/app/assets/less/inc/print.less
@@ -12,7 +12,6 @@
    
    
    #header,
-    #footer,
    #sidebar,
    #chat,
    .growl-animated,
--- a/client/app/assets/less/inc/tab.less
+++ b/client/app/assets/less/inc/tab.less
@@ -132,9 +132,15 @@
 }

 .tab-nav {
+  margin-bottom: 0px;
+
  > li.rd-tab-btn {
    float: right;
    padding-right: 10px;
    padding-top: 10px;
  }
+  
+  > li > a {
+    text-transform: capitalize;
+  }
 }
--- a/client/app/assets/less/inc/table.less
+++ b/client/app/assets/less/inc/table.less
@@ -97,3 +97,53 @@
    background-color: #f4f4f4;
 }

+.table-data {
+    tbody > tr > td {
+        padding-top: 5px !important;
+    }
+    
+    .btn-favourite, .btn-archive {
+        font-size: 15px;
+    }
+}
+
+.table-main-title {
+    font-weight: 500;
+    line-height: 1.7 !important;
+}
+
+.btn-favourite {
+    color: #d4d4d4;
+    transition: all .25s ease-in-out;
+    
+    &:hover, &:focus {
+        color: @yellow-darker;
+        cursor: pointer;
+    }
+    
+    .fa-star {
+        color: @yellow-darker;
+    }
+}
+
+.btn-archive {
+    color: #d4d4d4;
+    transition: all .25s ease-in-out;
+    
+    &:hover, &:focus {
+        color: @gray-light;
+    }
+    
+    .fa-archive {
+        color: @gray-light;
+    }
+}
+
+.table > thead > tr > th {
+    text-transform: none;
+}
+
+.table-data .label-tag {
+    display: inline-block;
+    max-width: 135px;
+  }
--- a/client/app/assets/less/inc/tile.less
+++ b/client/app/assets/less/inc/tile.less
@@ -2,7 +2,8 @@
    background-color: #fff;
    margin-bottom: @grid-gutter-width;
    position: relative;
-    box-shadow: @tile-shadow;
+    border-radius: 3px;
+    box-shadow: fade(@redash-gray, 15%) 0px 4px 9px -3px;
    
    &[class*="bg-"] {
        color: #fff;
@@ -12,6 +13,10 @@
        margin-bottom: @grid-gutter-width/2;
    }
 }
+.tiled {
+    border-radius: 3px;
+    box-shadow: fade(@redash-gray, 15%) 0px 4px 9px -3px;
+}

 .t-header {
    .th-title {
@@ -74,6 +79,15 @@
    }
 }

+.t-header:not(.th-alt) {
+    padding: 15px;
+  
+    ul {
+      margin-bottom: 0;
+      line-height: 2.2;
+    }
+  }
+
 .tb-padding {
    padding: 20px 23px 30px;
 }
--- a/client/app/assets/less/inc/variables.less
+++ b/client/app/assets/less/inc/variables.less
@@ -17,13 +17,14 @@
    Template Variables
 -----------------------------------------------------------*/
@header-height:                         60px;
-@footer-height:                         95px;
@sidebar-left-width:                    240px;
@sidebar-left-mid-width:                64px;
@logo-width:                            @sidebar-left-width;
@logo-height:                           @header-height;
@boxed-width:                           1170px;
@body-bg:                               #edecec;
+@spacing:                               15px;
+@redash-radius:                         3px;


 /* --------------------------------------------------------
@@ -40,6 +41,7 @@
 -----------------------------------------------------------*/
@font-icon:                             'Material-Design-Iconic-Font';
@font-family-sans-serif:                'Roboto', sans-serif;
+@redash-font:                            -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@font-size-base:                        13px;


@@ -55,10 +57,12 @@
 /* --------------------------------------------------------
    Form
 -----------------------------------------------------------*/
+@input-color:                           #595959;
@input-color-placeholder:               #b4b4b4;
@input-border:                          #e8e8e8;
@input-border-radius:                   0;
@input-border-radius-large:             0px;
+@redash-input-radius:                   2px;
@input-height-large:                    40px;
@input-height-base:                     35px;
@input-height-small:                    30px;
@@ -94,11 +98,15 @@
@gray-light:                            #828282;
@ace:                                   #f8f8f8;

+@redash-gray: rgba(102, 136, 153, 1);
+@redash-orange: rgba(255, 120, 100, 1);
+@redash-black: rgba(0, 0, 0, 1);
+@redash-yellow: rgba(252, 252, 161, 0.75);
+
 /** Form States **/
@state-success-text:                    @green;
@state-info-text:                       @blue;
@state-danger-text:                     lighten(@red, 5%);
-@state-warning-text:                    @orange;


 /* --------------------------------------------------------
@@ -106,19 +114,16 @@
 -----------------------------------------------------------*/
@alert-success-border:                  transparent;
@alert-info-border:                     transparent;
-@alert-warning-border:		 	        transparent;
@alert-danger-border:		 	        transparent;
@alert-inverse-border:		 	        transparent;

@alert-success-bg:                      fade(@green, 70%);
@alert-info-bg:		 		            fade(@blue, 70%);
-@alert-warning-bg:                      fade(@amber, 70%);
@alert-danger-bg:                       fade(@red, 70%);
@alert-inverse-bg:                      #333;

@alert-success-text:                    #fff;
@alert-info-text:                       #fff;
-@alert-warning-text:                    #fff;
@alert-danger-text:                     #fff;
@alert-inverse-text:                    #fff;

@@ -196,7 +201,6 @@
@pagination-hover-color:                #333;
@pagination-hover-bg:                   #d7d7d7;
@pagination-hover-border:               @pagination-border;
-@pager-border-radius:                   5px;


 /* --------------------------------------------------------
--- a/client/app/assets/less/inc/visualizations/counter-render.less
+++ b/client/app/assets/less/inc/visualizations/counter-render.less
@@ -1,45 +0,0 @@
-counter-renderer {
-  display: block;
-  text-align: center;
-  padding: 15px 10px;
-  overflow: hidden;
-
-  counter {
-    margin: 0;
-    padding: 0;
-    font-size: 80px;
-    line-height: normal;
-    overflow: hidden;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    value,
-    counter-target {
-      font-size: 1em;
-      display: block;
-    }
-
-    counter-name {
-      font-size: 0.5em;
-      display: block;
-    }
-
-    &.positive value {
-      color: #5cb85c;
-    }
-
-    &.negative value {
-      color: #d9534f;
-    }
-  }
-
-  counter-target {
-    color: #ccc;
-  }
-
-  counter-name {
-    font-size: 0.5em;
-    display: block;
-  }
-}
--- a/client/app/assets/less/inc/visualizations/misc.less
+++ b/client/app/assets/less/inc/visualizations/misc.less
@@ -1,3 +1,8 @@
-visualization-renderer .pagination {
+visualization-renderer {
+  display: block;
+
+  .pagination,
+  .ant-pagination {
    margin: 0;
  }
+}
--- a/client/app/assets/less/inc/visualizations/pivot-table.less
+++ b/client/app/assets/less/inc/visualizations/pivot-table.less
@@ -1,3 +1,4 @@
-pivot-table-renderer > table, grid-renderer > div, visualization-renderer > div {
+.pivot-table-renderer > table,
+visualization-renderer > .visualization-renderer-wrapper {
  overflow: auto;
 }
--- a/client/app/assets/less/main.less
+++ b/client/app/assets/less/main.less
@@ -1,5 +1,3 @@
-@import 'redash/ant';
-
 /** LESS Plugins **/
@import 'inc/less-plugins/for';

@@ -9,7 +7,6 @@
 /** Load Vendors Dependencies **/
@import '~font-awesome/less/font-awesome';
@import '~ui-select/dist/select.css';
-@import '~angular-toastr/src/toastr';
@import '~angular-resizable/src/angular-resizable.css';
@import '~material-design-iconic-font/dist/css/material-design-iconic-font.css';
@import '~pace-progress/themes/blue/pace-theme-minimal.css';
@@ -35,7 +32,6 @@
@import 'inc/progress-bar';
@import 'inc/widgets';
@import 'inc/table';
-@import 'inc/pagination';
@import 'inc/alert';
@import 'inc/media';
@import 'inc/modal';
@@ -47,7 +43,6 @@
@import 'inc/jumbotron';
@import 'inc/profile';
@import 'inc/404';
-@import 'inc/footer';
@import 'inc/ie-warning';
@import 'inc/navbar';
@import 'inc/edit-in-place';
@@ -58,11 +53,9 @@
@import 'inc/schema-browser';
@import 'inc/toast';
@import 'inc/visualizations/box';
-@import 'inc/visualizations/counter-render';
@import 'inc/visualizations/sankey';
@import 'inc/visualizations/pivot-table';
@import 'inc/visualizations/map';
-@import 'inc/visualizations/chart';
@import 'inc/visualizations/sunburst';
@import 'inc/visualizations/cohort';
@import 'inc/visualizations/misc';
@@ -75,10 +68,11 @@
@import 'inc/vendor-overrides/ui-select';

 /** REDASH STYLING **/
-@import 'redash/redash-newstyle';
@import 'redash/redash-table';
@import 'redash/query';
@import 'redash/tags-control';
+@import 'redash/css-logo';
+@import 'redash/loading-indicator';



--- a/client/app/assets/less/redash/ant.less
+++ b/client/app/assets/less/redash/ant.less
@@ -1,38 +0,0 @@
-@import '~antd/lib/style/core/iconfont.less';
-@import '~antd/lib/style/core/motion.less';
-@import '~antd/lib/input/style/index.less';
-@import '~antd/lib/date-picker/style/index.less';
-@import '~antd/lib/tooltip/style/index.less';
-@import '~antd/lib/select/style/index.less';
-
-// Overwritting Ant Design defaults to fit into Redash current style
-@font-family-no-number  : @redash-font;
-@font-family            : @redash-font;
-@code-family            : @redash-font;
-
-@border-radius-base     : @redash-input-radius;
-@border-color-base      : #e8e8e8;
-
-@primary-color          : @blue;
-
-// Fix for disabled button styles inside Tooltip component.
-// Tooltip wraps disabled buttons with `<span>` and moves all styles
-// and classes to that `<span>`. This resets all button styles and
-// turns it into simple inline element (because now it's wrapper is a button)
-.btn {
-  button[disabled] {
-    -moz-appearance: none !important;
-    -webkit-appearance: none !important;
-    appearance: none !important;
-    border: 0 !important;
-    outline: none !important;
-    background: transparent !important;
-    margin: 0 !important;
-    padding: 0 !important;
-  }
-}
-
-// Fix for Ant dropdowns when they are used in Boootstrap modals
-.ant-dropdown-in-bootstrap-modal {
-  z-index: 1050;
-}
--- a/client/app/assets/less/redash/css-logo.less
+++ b/client/app/assets/less/redash/css-logo.less
@@ -0,0 +1,88 @@
+// based on https://github.com/outbrain/tech-companies-logos-in-css/pull/28
+
+@primary: #ff7964;
+@shadow: #ef6c58;
+@bar: white;
+
+#css-logo {
+  width: 100px;
+  height: 100px;
+  position: relative;
+  
+  #circle {
+    width: 79px;
+    height: 79px;
+    background-color: @shadow;
+    border-radius: 50%;
+    margin: auto;
+    overflow: hidden;
+    position: relative;
+
+    & > div {
+      width: 79px;
+      height: 73px;
+      background-color: @primary;
+      border-radius: 50%;
+      position: absolute;
+      top: 0;
+    }
+  }
+  
+  #bars {
+    position: absolute;
+    left: 0;
+    top: 24px;
+    right: 0;
+    height: 33px;
+    display: flex;
+    padding: 0 22px 0;
+
+    .bar {
+      background: @bar;
+      box-shadow: 0px 2px 0 0 @shadow;
+      display: inline-block;
+      border-radius: 1px;
+      align-self: flex-end;
+      flex: 1;
+      margin: 0 2px;
+      border-radius: 3px;
+
+      &:nth-child(1) {
+        height: 32%;
+      }
+      
+      &:nth-child(2) {
+        height: 71%;
+      }
+      
+      &:nth-child(3) {
+        height: 50%;
+      }
+      
+      &:nth-child(4) {
+        height: 100%;
+      }
+    }
+  }
+  
+  #point,
+  #point > div {
+    position: absolute;
+    width: 0;
+    height: 0;
+    border: 17px solid @shadow;
+    border-right-color: transparent !important;
+    border-bottom-color: transparent !important;
+    bottom: 0;
+    left: 48px;
+    transform: scaleX(0.87);
+    transform-origin: left;
+  }
+  
+  #point > div {
+    bottom: -12px;
+    border-color: @primary;
+    transform: scaleX(1.04);
+    left: -17px;
+  }
+}
--- a/client/app/assets/less/redash/loading-indicator.less
+++ b/client/app/assets/less/redash/loading-indicator.less
@@ -0,0 +1,51 @@
+.loading-indicator {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  margin: -50px 0 0 -50px; // center
+  width: 100px;
+  height: 100px;
+  transition-duration: 150ms;
+  transition-timing-function: linear;
+  transition-property: opacity, transform;
+
+  #css-logo {
+    animation: hover 2s infinite;
+  }
+
+  #shadow {
+    width: 33px;
+    height: 12px;
+    border-radius: 50%;
+    background-color: black;
+    opacity: 0.25;
+    display: block;
+    position: absolute;
+    left: 34px;
+    top: 115px;
+    animation: shadow 2s infinite;
+  }
+
+  @keyframes hover {
+    50% {
+      transform: translateY(-5px);
+    }
+  }
+  @keyframes shadow {
+    50% {
+      transform: scaleX(0.9);
+      opacity: 0.2;
+    }
+  }
+}
+
+// hide indicator when app-view has content
+app-view:not(:empty) ~ .loading-indicator {
+  opacity: 0;
+  transform: scale(0.9);
+  pointer-events: none;
+
+  * {
+    animation: none !important;
+  }
+}
--- a/client/app/assets/less/redash/query.less
+++ b/client/app/assets/less/redash/query.less
@@ -92,7 +92,7 @@ edit-in-place p.editable:hover {
 }

 .filter-container {
-  margin-bottom: 10px;
+  margin-bottom: 5px;
 }

 .ace_editor.ace_autocomplete .ace_completion-highlight {
@@ -172,6 +172,12 @@ edit-in-place p.editable:hover {
  }
 }

+.query-log-line {
+  font-family: monospace;
+  white-space: pre;
+  margin: 0;
+}
+
 .paginator-container {
  text-align: center;
 }
@@ -202,18 +208,21 @@ edit-in-place p.editable:hover {
  }
 }

-.visualization-renderer .pagination {
-  margin-top: 10px;
-}
-
 .embed__vis {
  display: flex;
  flex-flow: column;
 }

+.embed-heading {
+  h3 {
+    line-height: 1.75;
+    margin: 0;
+  }
+}
+
 .widget-wrapper {
  .body-container {
-    filters {
+    .filters-wrapper {
      display: block;
      padding-left: 15px;
    }
@@ -255,6 +264,7 @@ a.label-tag {
 .query-page-wrapper {
  display: flex;
  flex-direction: column;
+  flex-grow: 1;
 }

 .query-fullscreen {
@@ -333,7 +343,8 @@ a.label-tag {
      border-bottom: 1px solid #efefef;
    }

-    pivot-table-renderer > table, grid-renderer > div, visualization-renderer > div {
+    .pivot-table-renderer > table,
+    visualization-renderer > .visualization-renderer-wrapper {
      overflow: visible;
    }

@@ -548,6 +559,10 @@ nav .rg-bottom {
  text-transform: capitalize;
 }

+.edit-visualization {
+    margin-right: 5px;
+}
+
 // Smaller screens

@media (max-width: 880px) {
@@ -649,10 +664,6 @@ nav .rg-bottom {
    }
  }

-  a.navbar-brand {
-    display: none;
-  }
-
  .datasource-small {
    visibility: visible;
  }
@@ -663,15 +674,20 @@ nav .rg-bottom {
    display: none;
  }

-  a.navbar-brand {
-    display: block;
-  }
-
  .filter-container {
    padding-right: 0;
  }
+}

-  .btn-edit-visualisation {
+// Responsive fixes
+@media (max-width: 767px) {
+  .query-page-wrapper {
+    h3 {
+      font-size: 18px;
+    }

+    favorites-control {
+      margin-top: -3px;
+    }
  }
 }
--- a/client/app/assets/less/redash/redash-newstyle.less
+++ b/client/app/assets/less/redash/redash-newstyle.less
@@ -1,935 +0,0 @@
-@import (reference, less) '~bootstrap/less/labels.less';
-
-// Variables
-@redash-gray: rgba(102, 136, 153, 1);
-@redash-orange: rgba(255, 120, 100, 1);
-@redash-black: rgba(0, 0, 0, 1);
-@redash-yellow: rgba(252, 252, 161, 0.75);
-@redash-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-
-@spacing: 15px;
-
-//Default spacing (between tiles)
-@redash-space: 10px;
-
-@redash-radius: 3px;
-@redash-input-radius: 2px;
-
-// General
-body {
-  padding-top: 0;
-  background: #F6F8F9;
-  font-family: @redash-font;
-
-  &.headless {
-    padding-top: 10px;
-    padding-bottom: 15px;
-
-    .navbar {
-      display: none !important;
-    }
-
-    div#footer {
-      display: none;
-    }
-  }
-}
-
-.clearboth {
-  clear: both;
-}
-
-.callout {
-  padding: 20px;
-  border: 1px solid #eee;
-  border-left-width: 5px;
-  border-radius: 3px;
-}
-
-.callout-warning {
-  border-left-color: #aa6708;
-}
-
-.callout-info {
-  border-left-color: #1b809e;
-}
-
-.list-content {
-  @media (min-width: 992px) {
-    padding-right: 0;
-  }
-}
-
-.list-control-r-b {
-  @media (max-width: 992px) {
-    display: none;
-  }
-}
-
-.list-control-t {
-  @media (min-width: 992px) {
-    display: none;
-  }
-}
-
-// Fixed width layout for specific pages
-@media (min-width: 768px) {
-  settings-screen, home-page, page-dashboard-list, page-queries-list, alerts-list-page, alert-page, queries-search-results-page, .fixed-container {
-    .container {
-      width: 750px;
-    }
-  }
-}
-
-@media (min-width: 992px) {
-  settings-screen, home-page, page-dashboard-list, page-queries-list, alerts-list-page, alert-page, queries-search-results-page, .fixed-container {
-    .container {
-      width: 970px;
-    }
-  }
-}
-
-@media (min-width: 1200px) {
-  settings-screen, home-page, page-dashboard-list, page-queries-list, alerts-list-page, alert-page, queries-search-results-page, .fixed-container {
-    .container {
-      width: 1170px;
-    }
-  }
-}
-
-.creation-container {
-  h5 {
-    color: #a7a7a7;
-  }
-
-  h3 {
-    margin: 0px;
-    margin-bottom: 15px;
-  }
-}
-
-.add-widget-container {
-  background: #fff;
-  border-radius: @redash-radius;
-  padding: 15px;
-  position: fixed;
-  left: 15px;
-  bottom: 20px;
-  width: calc(~'100% - 30px');
-  z-index: 99;
-  box-shadow: fade(@redash-gray, 50%) 0px 7px 29px -3px;
-  display: flex;
-  justify-content: space-between;
-
-  h2 {
-    margin: 0;
-    font-size: 14px;
-    line-height: 2.1;
-    font-weight: 400;
-
-    .zmdi {
-      margin: 0;
-      margin-right: 5px;
-      font-size: 24px;
-      position: absolute;
-      bottom: 18px;
-    }
-
-    span {
-      padding-left: 30px;
-    }
-  }
-
-  .btn {
-    align-self: center;
-  }
-}
-
-body {
-  .ace-tm .ace_gutter {
-    background: #fff;
-  }
-
-  .ace_editor {
-    border: 1px solid fade(@redash-gray, 15%);
-  }
-
-  .ace-tm .ace_gutter-active-line {
-    background-color: fade(@redash-gray, 20%);
-  }
-
-  .ace-tm .ace_marker-layer .ace_active-line {
-    background: fade(@redash-gray, 9%);
-  }
-}
-
-.list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus {
-  background-color: #fff;
-  box-shadow: inset 3px 0px 0px @brand-primary;
-}
-
-.table.table-data {
-  > tbody > tr > td {
-    padding-top: 5px !important;
-  }
-
-  tr:hover {
-    cursor: pointer;
-  }
-
-  .btn-favourite {
-    font-size: 15px;
-  }
-}
-
-.table-main-title {
-  font-weight: 500;
-  line-height: 1.7 !important;
-  a {
-    //font-size: 15px;
-  }
-}
-
-.btn-favourite {
-  color: #d4d4d4;
-  transition: all .25s ease-in-out;
-
-  &:hover, &:focus {
-    color: @yellow-darker;
-  }
-
-  .fa-star {
-    color: @yellow-darker;
-  }
-}
-
-.page-header--new .btn-favourite {
-  font-size: 19px;
-}
-
-.page-title {
-  display: flex;
-  align-items: center;
-
-  h3 {
-    margin-right: 5px !important;
-  }
-
-  .label {
-    margin-top: 3px;
-    display: inline-block;
-  }
-
-  favorites-control {
-    margin-right: 5px;
-  }
-
-  @media (max-width: 767px) {
-    display: block;
-
-    favorites-control {
-      float: left;
-    }
-
-    h3 {
-      width: 100%;
-      margin-bottom: 5px !important;
-      display: block !important;
-    }
-  }
-}
-
-.navbar li a .btn-favourite .fa {
-  font-size: 100%;
-}
-
-.float-right {
-  float: right;
-}
-
-.database-source {
-  display: inline-flex;
-  flex-wrap: wrap;
-  justify-content: center;
-}
-
-.visual-card {
-  background: #FFFFFF;
-  border: 1px solid fade(@redash-gray, 15%);
-  border-radius: 3px;
-  margin: 5px;
-  width: 212px;
-  padding: 15px 5px;
-  cursor: pointer;
-  box-shadow: none;
-  transition: transform 0.12s ease-out;
-  transition-duration: 0.3s;
-  transition-property: box-shadow;
-
-  display: flex;
-  //flex-direction: row;
-  align-items: center;
-
-  &:hover {
-    box-shadow: rgba(102, 136, 153, 0.15) 0px 4px 9px -3px;
-  }
-
-  img {
-    width: 64px !important;
-    height: 64px !important;
-    margin-right: 5px;
-  }
-
-  h3 {
-    font-size: 13px;
-    color: #323232;
-    margin: 0 !important;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
-}
-
-.visual-card--selected {
-  background: fade(@redash-gray, 3%);
-  border: 1px solid fade(@redash-gray, 15%);
-  border-radius: 3px;
-  padding: 0 15px;
-  box-shadow: none;
-
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-
-  justify-content: space-around;
-  margin-bottom: 15px;
-  width: 100%;
-
-  img {
-    width: 64px;
-    height: 64px;
-  }
-
-  a {
-    cursor: pointer;
-  }
-}
-
-@media (max-width: 1200px) {
-  .visual-card {
-    width: 217px;
-  }
-}
-
-@media (max-width: 755px) {
-  .visual-card {
-    width: 47%;
-  }
-}
-
-@media (max-width: 515px) {
-  .visual-card {
-    width: 47%;
-
-    img {
-      width: 48px;
-      height: 48px;
-    }
-  }
-}
-
-@media (max-width: 408px) {
-  .visual-card {
-    width: 100%;
-    padding: 5px;
-    margin: 5px 0;
-
-    img {
-      width: 48px;
-      height: 48px;
-    }
-  }
-}
-
-
-.t-header:not(.th-alt) {
-  padding: 15px;
-
-  ul {
-    margin-bottom: 0;
-    line-height: 2.2;
-  }
-}
-
-#footer {
-  height: auto;
-  line-height: 3;
-  padding: 20px;
-}
-
-page-header, .page-header--new {
-  h3 {
-    margin: 0.2em 0;
-    line-height: 1.3;
-    font-weight: 500;
-  }
-}
-
-.alert {
-  padding: 15px;
-}
-
-.dynamic-table__pagination {
-  margin-top: 10px;
-}
-
-.rg-top span, .rg-bottom span {
-  height: 3px;
-  border-color: #b1c1ce; // TODO: variable
-}
-
-.rg-bottom {
-  bottom: 15px;
-
-  span {
-    margin: 1.5px 0 0 -10px;
-  }
-}
-
-.popover {
-  box-shadow: fade(@redash-gray, 25%) 0px 0px 15px 0px;
-}
-
-.tile__bottom-control a {
-  color: fade(@redash-black, 65%);
-
-  &:hover {
-    color: fade(@redash-black, 95%);
-  }
-}
-
-.pagination {
-  .disabled a {
-    background-color: fade(@redash-gray, 14%);
-  }
-
-  li {
-    a {
-      background-color: fade(@redash-gray, 15%);
-
-      &:hover {
-        background-color: fade(@redash-gray, 25%);
-      }
-    }
-  }
-}
-
-.btn-default {
-  background-color: fade(@redash-gray, 15%);
-}
-
-.btn-transparent {
-  background-color: transparent !important;
-}
-
-.btn-default:hover, .btn-default:focus, .btn-default.focus, .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default {
-  background-color: fade(@redash-gray, 25%);
-}
-
-.btn-default:active:hover, .btn-default.active:hover, .open > .dropdown-toggle.btn-default:hover, .btn-default:active:focus, .btn-default.active:focus, .open > .dropdown-toggle.btn-default:focus, .btn-default:active.focus, .btn-default.active.focus, .open > .dropdown-toggle.btn-default.focus {
-  color: #333;
-  background-color: fade(@redash-gray, 45%);
-}
-
-.label {
-  border-radius: 2px;
-  padding: 3px 6px 4px;
-  font-weight: 500;
-  font-size: 11px;
-}
-
-.label-default {
-  background: fade(@redash-gray, 85%);
-}
-
-.label-tag-unpublished {
-  background: fade(@redash-gray, 85%);
-}
-
-.label-tag-archived {
-  .label-warning();
-}
-
-.label-tag {
-  background: fade(@redash-gray, 10%);
-  color: fade(@redash-gray, 75%);
-}
-
-.label-tag-unpublished,
-.label-tag-archived,
-.label-tag {
-  margin-right: 3px;
-  display: inline-block;
-  margin-top: 2px;
-  max-width: 24ch;
-  .text-overflow();
-}
-
-.tab-nav > li > a {
-  text-transform: capitalize;
-}
-
-.table > thead > tr > th {
-  text-transform: none;
-}
-
-.dashboard-header {
-  position: -webkit-sticky;  // required for Safari
-  position: sticky;
-  background: #f6f7f9;
-  z-index: 99;
-  width: 100%;
-  top: 0;
-}
-
-.dashboard__control {
-  margin: 8px 0;
-}
-
-.editing-mode {
-  a.query-link {
-    pointer-events: none;
-    cursor: move;
-  }
-
-  .th-title {
-    cursor: move;
-  }
-}
-
-.dashboard-header {
-  position: -webkit-sticky;  // required for Safari
-  position: sticky;
-  background: #f6f7f9;
-  z-index: 99;
-  width: 100%;
-  top: 0;
-}
-
-.widget-wrapper {
-  .parameter-container {
-    padding: 0 15px;
-  }
-}
-
-.bg-ace {
-  background-color: fade(@redash-gray, 12%) !important;
-}
-
-.tiled {
-  border-radius: 3px;
-  box-shadow: fade(@redash-gray, 15%) 0px 4px 9px -3px;
-}
-
-.tile {
-  border-radius: 3px;
-  box-shadow: fade(@redash-gray, 15%) 0px 4px 9px -3px;
-
-  .widget-menu-regular, .btn__refresh {
-    opacity: 0 !important;
-    transition: opacity 0.35s ease-in-out;
-  }
-
-  .t-header {
-    .th-title {
-      a {
-        color: fade(@redash-black, 80%);
-        font-size: 15px;
-        font-weight: 500;
-      }
-    }
-
-    .query--description {
-      font-size: 14px;
-      line-height: 1.5;
-      font-style: italic;
-
-      p {
-        margin-bottom: 0;
-      }
-    }
-  }
-
-  .t-header.widget {
-    padding: 15px;
-  }
-
-  &:hover {
-    .widget-menu-regular, .btn__refresh {
-      opacity: 1 !important;
-      transition: opacity 0.35s ease-in-out;
-    }
-  }
-
-  .tile__bottom-control {
-    padding: 10px 15px;
-    line-height: 2;
-  }
-}
-
-.embed-heading {
-  h3 {
-    line-height: 1.75;
-    margin: 0;
-  }
-}
-
-.filter-container {
-  margin-bottom: 5px;
-}
-
-// Navigation
-.caret--nav {
-  border-top: none;
-}
-
-.caret--nav:after {
-  content: "";
-  position: absolute;
-  right: 5px;
-  top: 9px;
-  width: 13px;
-  height: 13px;
-  display: block;
-  background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='11px' height='6px' viewBox='0 0 11 6' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3C!-- Generator: Sketch 42 %2836781%29 - http://www.bohemiancoding.com/sketch --%3E%3Ctitle%3EShape%3C/title%3E%3Cdesc%3ECreated with Sketch.%3C/desc%3E%3Cdefs%3E%3C/defs%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M5.296,4.288 L9.382,0.2 C9.66086822,-0.0716916976 10.1065187,-0.068122925 10.381,0.208 C10.661,0.488 10.661,0.932 10.388,1.206 L5.792,5.803 C5.6602899,5.93388911 5.48167943,6.00662966 5.296,6.005 C5.10997499,6.00689786 4.93095449,5.93413702 4.799,5.803 L0.204,1.207 C0.072163111,1.07394937 -0.00121750401,0.893846387 9.62313189e-05,0.706545264 C0.00140996665,0.519244142 0.0773097323,0.340188219 0.211,0.209 C0.485365732,-0.0664648737 0.930253538,-0.0700311086 1.209,0.201 L5.296,4.288 L5.296,4.288 Z' id='Shape' fill='%23000000'%3E%3C/path%3E%3C/g%3E%3C/svg%3E");
-  background-size: 100% 100%;
-  transition: transform .2s cubic-bezier(.75,0,.25,1);
-}
-
-.navbar .caret--nav:after {
-  top: 19px;
-}
-
-.dropdown--profile .caret--nav:after {
-  right: 8px;
-}
-
-.btn--create {
-  padding-right: 20px;
-
-  .caret--nav:after {
-    top: 10px;
-    right: 10px;
-    background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='11px' height='6px' viewBox='0 0 11 6' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3C!-- Generator: Sketch 42 %2836781%29 - http://www.bohemiancoding.com/sketch --%3E%3Ctitle%3EShape%3C/title%3E%3Cdesc%3ECreated with Sketch.%3C/desc%3E%3Cdefs%3E%3C/defs%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M5.29592111,4.28945339 L9.38192111,0.201453387 C9.66078932,-0.0702383105 10.1064398,-0.0666695379 10.3809211,0.209453387 C10.6609211,0.489453387 10.6609211,0.933453387 10.3879211,1.20745339 L5.79192111,5.80445339 C5.66021101,5.9353425 5.48160054,6.00808305 5.29592111,6.00645339 C5.1098961,6.00835125 4.9308756,5.9355904 4.79892111,5.80445339 L0.203921109,1.20845339 C0.0720842204,1.07540275 -0.00129639464,0.895299774 1.73406884e-05,0.707998651 C0.00133107602,0.520697529 0.0772308417,0.341641606 0.210921109,0.210453387 C0.485286842,-0.0650114866 0.930174648,-0.0685777215 1.20892111,0.202453387 L5.29592111,4.28945339 L5.29592111,4.28945339 Z' id='Shape' fill='%23FCFCFC'%3E%3C/path%3E%3C/g%3E%3C/svg%3E");
-  }
-}
-
-.dropdown.open .caret--nav:after {
-  transform: rotate(180deg);
-}
-
-.collapsing, .collapse.in {
-  padding: 0;
-}
-
-.navbar {
-  min-height: initial;
-  height: 50px;
-  border: 1px solid #fff;
-  border-top: none;
-  border-radius: 0;
-  background: #fff;
-  margin-bottom: 10px;
-
-  a.navbar-brand {
-    padding: 4px 0px 0px 0px;
-    margin-left: -3px !important;
-  }
-
-  .btn-group.open .dropdown-toggle {
-    -webkit-box-shadow: none;
-    box-shadow: none;
-  }
-
-  .btn-group .btn:active {
-    box-shadow: none;
-  }
-}
-
-.navbar-default .navbar-nav > li > a {
-  color: #000;
-  font-weight: 500;
-
-  &:active, &:hover, &:focus {
-    color: #000;
-  }
-}
-
-.navbar-default .btn__new button {
-  font-weight: 500;
-}
-
-.navbar-default .navbar-nav > li > a:hover {
-  //background-color: fade(@redash-gray, 10%);
-  //text-decoration: underline;
-  //border-radius: 0;
-}
-
-.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
-  background-color: fade(@redash-gray, 15%);
-  color: #111;
-}
-
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
-  background-color: fade(@redash-gray, 15%);
-  color: #111;
-}
-
-.tab-nav {
-  margin-bottom: 0px;
-}
-
-.profile__image--navbar {
-  border-radius: 100%;
-  margin-right: 3px;
-  margin-top: -2px;
-}
-
-.profile__image--settings {
-  border-radius: 100%;
-}
-
-.profile__image_thumb {
-  border-radius: 100%;
-  margin-right: 3px;
-  margin-top: -2px;
-  width: 20px;
-  height: 20px;
-}
-
-.btn__new {
-  margin-left: 15px;
-}
-
-.navbar-btn {
-  margin-top: 10px;
-  margin-bottom: 9px;
-}
-
-.navbar-brand {
-  position: absolute;
-  left: 49%;
-  margin-left: -50px !important;
-  display: block;
-  zoom: 0.9;
-  margin-top: 3px;
-}
-
-.va-top {
-  vertical-align: top;
-}
-
-.navbar {
-  box-shadow: fade(@redash-gray, 15%) 0px 4px 9px -3px;
-
-  .navbar-collapse {
-    padding-left: 0;
-  }
-
-  a.dropdown--profile {
-    padding-top: 10px;
-    padding-bottom: 10px;
-    line-height: 2.35;
-  }
-
-  .navbar-inverse {
-    background-color: @redash-gray;
-    border: none;
-  }
-}
-
-.menu-search {
-  margin-top: 2px;
-}
-
-.tags-list {
-
-  .badge-light {
-    background: fade(@redash-gray, 10%);
-    color: fade(@redash-gray, 75%);
-  }
-}
-
-.dropdown-menu--profile {
-  li {
-    width: 200px;
-  }
-}
-
-.navbar .collapse.in {
-  background: #fff;
-  position: relative;
-  z-index: 999;
-  padding: 0 10px 0 10px;
-}
-
-// Pagination
-.pagination > li > a, .pagination > li > span {
-  border-radius: 3px !important;
-  width: 33px;
-  height: 33px;
-  line-height: 31px;
-}
-
-// Error state
-.error-state {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  text-align: center;
-  margin-top: 25vh;
-  padding: 35px;
-  font-size: 14px;
-  line-height: 21px;
-
-  .error-state__icon {
-    .zmdi {
-      font-size: 64px;
-      color: @redash-gray;
-    }
-  }
-
-  @media (max-width: 767px) {
-    margin-top: 10vh;
-  }
-}
-
-// Forms
-.form-control {
-  border-radius: @redash-input-radius;
-  color: #9E9E9E;
-
-  &:focus {
-    box-shadow: none !important;
-    color: #111;
-    border-color: @blue;
-  }
-
-  &:hover {
-    border-color: @blue;
-  }
-}
-
-// Plotly
-text.slicetext {
-  text-shadow: 1px 1px 5px #333;
-}
-
-
-// Responsive fixes
-@media (max-width: 767px) {
-  .text-center-xs {
-    text-align: center !important;
-  }
-
-  .query-page-wrapper {
-    h3 {
-      font-size: 18px;
-    }
-
-    favorites-control {
-      margin-top: -3px;
-    }
-  }
-
-  .navbar-brand {
-    left: 2%;
-  }
-
-  //Fix navbar collapse
-  .navbar .collapse.in {
-    border: none;
-
-    .dropdown-menu--profile {
-      li {
-        width: auto;
-      }
-    }
-
-    .dropdown--profile {
-      .caret--nav:after {
-        right: initial !important;
-      }
-    }
-
-    .dropdown--profile__username {
-      display: inline-block;
-    }
-
-    .nav__main li a {
-      padding: 10px 15px;
-      display: block;
-      text-align: left;
-      float: none !important;
-    }
-
-    .navbar-form {
-      margin-bottom: 0;
-      margin-top: 0;
-    }
-
-    .navbar-right {
-      margin-bottom: 0;
-    }
-  }
-}
-
-@media (min-width: 768px) and (max-width: 850px) {
-  .menu-search {
-    width: 175px;
-  }
-
-  a.navbar-brand {
-    display: none !important;
-  }
-}
-
-@media (max-width: 1084px) {
-  .dropdown--profile__username {
-    display: none;
-  }
-}
-
-
-
-// Cross-browser fixes
-
-// Firefox
-@-moz-document url-prefix() {
-  .caret--nav::after {
-    height: 7px;
-  }
-
-  .navbar .caret--nav::after {
-    top: 22px;
-  }
-
-  .navbar .btn--create .caret--nav::after {
-    top: 12px;
-  }
-}
-
-// IE10+
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-  .caret--nav::after {
-    height: 7px;
-  }
-
-  .navbar .caret--nav::after {
-    top: 22px;
-  }
-
-  .navbar .btn--create .caret--nav::after {
-    top: 12px;
-  }
-}
-
--- a/client/app/assets/less/redash/tags-control.less
+++ b/client/app/assets/less/redash/tags-control.less
@@ -8,6 +8,15 @@

  &.inline-tags-control {
    display: inline-block;
-    vertical-align: middle;
+  }
+
+  &.disabled {
+    opacity: 0.4;
  }
 }
+
+// This is for using .inline-tags-control in Angular which renders
+// a little differently than React (e.g. in Alert.html)
+.inline-tags-control .tags-control {
+  display: inline-block;
+}
--- a/client/app/assets/less/server.less
+++ b/client/app/assets/less/server.less
@@ -19,8 +19,6 @@
@import 'inc/ie-warning';
@import 'inc/flex';

-@import 'redash/redash-newstyle';
-
 html, body {
  height: 100%;
  margin: 0;
--- a/client/app/components/AceEditorInput.jsx
+++ b/client/app/components/AceEditorInput.jsx
@@ -0,0 +1,22 @@
+import React, { forwardRef } from 'react';
+import AceEditor from 'react-ace';
+
+import './AceEditorInput.less';
+
+function AceEditorInput(props, ref) {
+  return (
+    <div className="ace-editor-input">
+      <AceEditor
+        ref={ref}
+        mode="sql"
+        theme="textmate"
+        height="100px"
+        editorProps={{ $blockScrolling: Infinity }}
+        showPrintMargin={false}
+        {...props}
+      />
+    </div>
+  );
+}
+
+export default forwardRef(AceEditorInput);
--- a/client/app/components/AceEditorInput.less
+++ b/client/app/components/AceEditorInput.less
@@ -0,0 +1,11 @@
+.ace-editor-input {
+  // hide ghost cursor when not focused
+  .ace_hidden-cursors {
+    opacity: 0;
+  }
+
+  // allow Ant Form feedback icon to hover scrollbar
+  .ace_scrollbar {
+    z-index: auto;
+  }
+}
--- a/client/app/components/AutocompleteToggle.jsx
+++ b/client/app/components/AutocompleteToggle.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import Tooltip from 'antd/lib/tooltip';
 import PropTypes from 'prop-types';
 import '@/redash-font/style.less';
-import recordEvent from '@/lib/recordEvent';
+import recordEvent from '@/services/recordEvent';

 export default function AutocompleteToggle({ state, disabled, onToggle }) {
  let tooltipMessage = 'Live Autocomplete Enabled';
--- a/client/app/components/BeaconConsent.jsx
+++ b/client/app/components/BeaconConsent.jsx
@@ -0,0 +1,83 @@
+import React, { useState } from 'react';
+import { react2angular } from 'react2angular';
+import Card from 'antd/lib/card';
+import Button from 'antd/lib/button';
+import Typography from 'antd/lib/typography';
+import { clientConfig } from '@/services/auth';
+import { HelpTrigger } from '@/components/HelpTrigger';
+import DynamicComponent from '@/components/DynamicComponent';
+import OrgSettings from '@/services/organizationSettings';
+
+const Text = Typography.Text;
+
+export function BeaconConsent() {
+  const [hide, setHide] = useState(false);
+
+  if (!clientConfig.showBeaconConsentMessage || hide) {
+    return null;
+  }
+
+  const hideConsentCard = () => {
+    clientConfig.showBeaconConsentMessage = false;
+    setHide(true);
+  };
+
+  const confirmConsent = (confirm) => {
+    let message = '🙏 Thank you.';
+
+    if (!confirm) {
+      message = 'Settings Saved.';
+    }
+
+    OrgSettings.save({ beacon_consent: confirm }, message)
+      // .then(() => {
+      //   // const settings = get(response, 'settings');
+      //   // this.setState({ settings, formValues: { ...settings } });
+      // })
+      .finally(hideConsentCard);
+  };
+
+  return (
+    <DynamicComponent name="BeaconConsent">
+      <div className="m-t-10 tiled">
+        <Card
+          title={(
+            <>
+              Would you be ok with sharing anonymous usage data with the Redash team?{' '}
+              <HelpTrigger type="USAGE_DATA_SHARING" />
+            </>
+          )}
+          bordered={false}
+        >
+          <Text>Help Redash improve by automatically sending anonymous usage data:</Text>
+          <div className="m-t-5">
+            <ul>
+              <li> Number of users, queries, dashboards, alerts, widgets and visualizations.</li>
+              <li> Types of data sources, alert destinations and visualizations.</li>
+            </ul>
+          </div>
+          <Text>All data is aggregated and will never include any sensitive or private data.</Text>
+          <div className="m-t-5">
+            <Button type="primary" className="m-r-5" onClick={() => confirmConsent(true)}>
+              Yes
+            </Button>
+            <Button type="default" onClick={() => confirmConsent(false)}>
+              No
+            </Button>
+          </div>
+          <div className="m-t-15">
+            <Text type="secondary">
+              You can change this setting anytime from the <a href="settings/organization">Organization Settings</a> page.
+            </Text>
+          </div>
+        </Card>
+      </div>
+    </DynamicComponent>
+  );
+}
+
+export default function init(ngModule) {
+  ngModule.component('beaconConsent', react2angular(BeaconConsent));
+}
+
+init.init = true;
--- a/client/app/components/BigMessage.jsx
+++ b/client/app/components/BigMessage.jsx
@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { react2angular } from 'react2angular';

-export function BigMessage({ message, icon, children }) {
+export function BigMessage({ message, icon, children, className }) {
  return (
-    <div className="tiled bg-white p-15 text-center">
+    <div className={'p-15 text-center ' + className}>
      <h3 className="m-t-0 m-b-0">
        <i className={'fa ' + icon} />
      </h3>
@@ -19,11 +19,13 @@ BigMessage.propTypes = {
  message: PropTypes.string,
  icon: PropTypes.string.isRequired,
  children: PropTypes.node,
+  className: PropTypes.string,
 };

 BigMessage.defaultProps = {
  message: '',
  children: null,
+  className: 'tiled bg-white',
 };

 export default function init(ngModule) {
--- a/client/app/components/CodeBlock.jsx
+++ b/client/app/components/CodeBlock.jsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Button from 'antd/lib/button';
+import Tooltip from 'antd/lib/tooltip';
+import './CodeBlock.less';
+
+export default class CodeBlock extends React.Component {
+  static propTypes = {
+    copyable: PropTypes.bool,
+    children: PropTypes.node,
+  };
+
+  static defaultProps = {
+    copyable: false,
+    children: null,
+  };
+
+  state = { copied: null };
+
+  constructor(props) {
+    super(props);
+    this.ref = React.createRef();
+    this.copyFeatureEnabled = props.copyable && document.queryCommandSupported('copy');
+    this.resetCopyState = null;
+  }
+
+  componentWillUnmount() {
+    if (this.resetCopyState) {
+      clearTimeout(this.resetCopyState);
+    }
+  }
+
+  copy = () => {
+    // select text
+    window.getSelection().selectAllChildren(this.ref.current);
+
+    // copy
+    try {
+      const success = document.execCommand('copy');
+      if (!success) {
+        throw new Error();
+      }
+      this.setState({ copied: 'Copied!' });
+    } catch (err) {
+      this.setState({
+        copied: 'Copy failed',
+      });
+    }
+
+    // reset selection
+    window.getSelection().removeAllRanges();
+
+    // reset tooltip
+    this.resetCopyState = setTimeout(() => this.setState({ copied: null }), 2000);
+  };
+
+  render() {
+    const { copyable, children, ...props } = this.props;
+
+    const copyButton = (
+      <Tooltip title={this.state.copied || 'Copy'}>
+        <Button
+          icon="copy"
+          type="dashed"
+          size="small"
+          onClick={this.copy}
+        />
+      </Tooltip>
+    );
+
+    return (
+      <div className="code-block">
+        <code {...props} ref={this.ref}>
+          {children}
+        </code>
+        {this.copyFeatureEnabled && copyButton}
+      </div>
+    );
+  }
+}
--- a/client/app/components/CodeBlock.less
+++ b/client/app/components/CodeBlock.less
@@ -0,0 +1,23 @@
+@import '~antd/lib/button/style/index';
+
+.code-block {
+  background: rgba(0, 0, 0, 0.06);
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  border-radius: 2px;
+  padding: 3px 27px 3px 3px;
+  position: relative;
+  min-height: 32px;
+
+  code {
+    padding: 0;
+    font-size: 85%;
+  }
+
+  .@{btn-prefix-cls} {
+    position: absolute;
+    right: 3px;
+    bottom: 3px;
+    padding-left: 3px !important;
+    padding-right: 3px !important;
+  }
+}
--- a/client/app/components/Collapse.jsx
+++ b/client/app/components/Collapse.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import cx from 'classnames';
+import AntCollapse from 'antd/lib/collapse';
+
+export default function Collapse({ collapsed, children, className, ...props }) {
+  return (
+    <AntCollapse {...props} activeKey={collapsed ? null : 'content'} className={cx(className, 'ant-collapse-headerless')}>
+      <AntCollapse.Panel key="content" header="">{children}</AntCollapse.Panel>
+    </AntCollapse>
+  );
+}
+
+Collapse.propTypes = {
+  collapsed: PropTypes.bool,
+  children: PropTypes.node,
+  className: PropTypes.string,
+};
+
+Collapse.defaultProps = {
+  collapsed: true,
+  children: null,
+  className: '',
+};
--- a/client/app/components/ColorBox.jsx
+++ b/client/app/components/ColorBox.jsx
@@ -0,0 +1,12 @@
+// ANGULAR_REMOVE_ME
+import { react2angular } from 'react2angular';
+
+import ColorPicker from '@/components/ColorPicker';
+
+import './color-box.less';
+
+export default function init(ngModule) {
+  ngModule.component('colorBox', react2angular(ColorPicker.Swatch));
+}
+
+init.init = true;
--- a/client/app/components/ColorPicker/Input.jsx
+++ b/client/app/components/ColorPicker/Input.jsx
@@ -0,0 +1,93 @@
+import { isNil, isArray, chunk, map, filter, toPairs } from 'lodash';
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import tinycolor from 'tinycolor2';
+import TextInput from 'antd/lib/input';
+import Typography from 'antd/lib/typography';
+import Swatch from './Swatch';
+
+import './input.less';
+
+function preparePresets(presetColors, presetColumns) {
+  presetColors = isArray(presetColors) ? map(presetColors, v => [null, v]) : toPairs(presetColors);
+  presetColors = map(presetColors, ([title, value]) => {
+    if (isNil(value)) {
+      return [title, null];
+    }
+    value = tinycolor(value);
+    if (value.isValid()) {
+      return [title, '#' + value.toHex().toUpperCase()];
+    }
+    return null;
+  });
+  return chunk(filter(presetColors), presetColumns);
+}
+
+function validateColor(value, callback, prefix = '#') {
+  if (isNil(value)) {
+    callback(null);
+  }
+  value = tinycolor(value);
+  if (value.isValid()) {
+    callback(prefix + value.toHex().toUpperCase());
+  }
+}
+
+export default function Input({ color, presetColors, presetColumns, onChange, onPressEnter }) {
+  const [inputValue, setInputValue] = useState('');
+  const [isInputFocused, setIsInputFocused] = useState(false);
+
+  const presets = preparePresets(presetColors, presetColumns);
+
+  function handleInputChange(value) {
+    setInputValue(value);
+    validateColor(value, onChange);
+  }
+
+  useEffect(() => {
+    if (!isInputFocused) {
+      validateColor(color, setInputValue, '');
+    }
+  }, [color, isInputFocused]);
+
+  return (
+    <React.Fragment>
+      {map(presets, (group, index) => (
+        <div className="color-picker-input-swatches" key={`preset-row-${index}`}>
+          {map(group, ([title, value]) => (
+            <Swatch key={value} color={value} title={title} size={30} onClick={() => validateColor(value, onChange)} />
+          ))}
+        </div>
+      ))}
+      <div className="color-picker-input">
+        <TextInput
+          addonBefore={<Typography.Text type="secondary">#</Typography.Text>}
+          value={inputValue}
+          onChange={e => handleInputChange(e.target.value)}
+          onFocus={() => setIsInputFocused(true)}
+          onBlur={() => setIsInputFocused(false)}
+          onPressEnter={onPressEnter}
+        />
+      </div>
+    </React.Fragment>
+  );
+}
+
+Input.propTypes = {
+  color: PropTypes.string,
+  presetColors: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.string), // array of colors (no tooltips)
+    PropTypes.objectOf(PropTypes.string), // color name => color value
+  ]),
+  presetColumns: PropTypes.number,
+  onChange: PropTypes.func,
+  onPressEnter: PropTypes.func,
+};
+
+Input.defaultProps = {
+  color: '#FFFFFF',
+  presetColors: null,
+  presetColumns: 8,
+  onChange: () => {},
+  onPressEnter: () => {},
+};
--- a/client/app/components/ColorPicker/Swatch.jsx
+++ b/client/app/components/ColorPicker/Swatch.jsx
@@ -0,0 +1,37 @@
+import { isString } from 'lodash';
+import React from 'react';
+import PropTypes from 'prop-types';
+import Tooltip from 'antd/lib/tooltip';
+
+import './swatch.less';
+
+export default function Swatch({ className, color, title, size, ...props }) {
+  const result = (
+    <span
+      className={`color-swatch ${className}`}
+      style={{ backgroundColor: color, width: size }}
+      {...props}
+    />
+  );
+
+  if (isString(title) && (title !== '')) {
+    return (
+      <Tooltip title={title} mouseEnterDelay={0} mouseLeaveDelay={0}>{result}</Tooltip>
+    );
+  }
+  return result;
+}
+
+Swatch.propTypes = {
+  className: PropTypes.string,
+  title: PropTypes.string,
+  color: PropTypes.string,
+  size: PropTypes.number,
+};
+
+Swatch.defaultProps = {
+  className: '',
+  title: null,
+  color: 'transparent',
+  size: 12,
+};
--- a/client/app/components/ColorPicker/index.jsx
+++ b/client/app/components/ColorPicker/index.jsx
@@ -0,0 +1,128 @@
+import { toString } from 'lodash';
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import tinycolor from 'tinycolor2';
+import Popover from 'antd/lib/popover';
+import Card from 'antd/lib/card';
+import Tooltip from 'antd/lib/tooltip';
+import Icon from 'antd/lib/icon';
+
+import ColorInput from './Input';
+import Swatch from './Swatch';
+
+import './index.less';
+
+function validateColor(value, fallback = null) {
+  value = tinycolor(value);
+  return value.isValid() ? '#' + value.toHex().toUpperCase() : fallback;
+}
+
+export default function ColorPicker({
+  color, placement, presetColors, presetColumns, triggerSize, interactive, children, onChange,
+}) {
+  const [visible, setVisible] = useState(false);
+  const [currentColor, setCurrentColor] = useState('');
+
+  function handleApply() {
+    setVisible(false);
+    if (!interactive) {
+      onChange(currentColor);
+    }
+  }
+
+  function handleCancel() {
+    setVisible(false);
+  }
+
+  const actions = [];
+  if (!interactive) {
+    actions.push((
+      <Tooltip key="cancel" title="Cancel">
+        <Icon type="close" onClick={handleCancel} />
+      </Tooltip>
+    ));
+    actions.push((
+      <Tooltip key="apply" title="Apply">
+        <Icon type="check" onClick={handleApply} />
+      </Tooltip>
+    ));
+  }
+
+  function handleInputChange(newColor) {
+    setCurrentColor(newColor);
+    if (interactive) {
+      onChange(newColor);
+    }
+  }
+
+  useEffect(() => {
+    if (visible) {
+      setCurrentColor(validateColor(color));
+    }
+  }, [color, visible]);
+
+  return (
+    <Popover
+      overlayClassName={`color-picker ${interactive ? 'color-picker-interactive' : 'color-picker-with-actions'}`}
+      overlayStyle={{ '--color-picker-selected-color': currentColor }}
+      content={(
+        <Card
+          className="color-picker-panel"
+          bordered={false}
+          title={toString(currentColor).toUpperCase()}
+          headStyle={{
+            backgroundColor: currentColor,
+            color: tinycolor(currentColor).isLight() ? '#000000' : '#ffffff',
+          }}
+          actions={actions}
+        >
+          <ColorInput
+            color={currentColor}
+            presetColors={presetColors}
+            presetColumns={presetColumns}
+            onChange={handleInputChange}
+            onPressEnter={handleApply}
+          />
+        </Card>
+      )}
+      trigger="click"
+      placement={placement}
+      visible={visible}
+      onVisibleChange={setVisible}
+    >
+      {children || (<Swatch className="color-picker-trigger" color={validateColor(color)} size={triggerSize} />)}
+    </Popover>
+  );
+}
+
+ColorPicker.propTypes = {
+  color: PropTypes.string,
+  placement: PropTypes.oneOf([
+    'top', 'left', 'right', 'bottom',
+    'topLeft', 'topRight', 'bottomLeft', 'bottomRight',
+    'leftTop', 'leftBottom', 'rightTop', 'rightBottom',
+  ]),
+  presetColors: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.string), // array of colors (no tooltips)
+    PropTypes.objectOf(PropTypes.string), // color name => color value
+  ]),
+  presetColumns: PropTypes.number,
+  triggerSize: PropTypes.number,
+  interactive: PropTypes.bool,
+  children: PropTypes.node,
+  onChange: PropTypes.func,
+};
+
+ColorPicker.defaultProps = {
+  color: '#FFFFFF',
+  placement: 'top',
+  presetColors: null,
+  presetColumns: 8,
+  triggerSize: 30,
+  interactive: false,
+  children: null,
+  onChange: () => {},
+};
+
+ColorPicker.Input = ColorInput;
+ColorPicker.Swatch = Swatch;
--- a/client/app/components/ColorPicker/index.less
+++ b/client/app/components/ColorPicker/index.less
@@ -0,0 +1,40 @@
+.color-picker {
+  &.color-picker-with-actions {
+    &.ant-popover-placement-top,
+    &.ant-popover-placement-topLeft,
+    &.ant-popover-placement-topRight,
+    &.ant-popover-placement-leftBottom,
+    &.ant-popover-placement-rightBottom {
+      > .ant-popover-content > .ant-popover-arrow {
+        border-color: #fafafa; // same as card actions
+      }
+    }
+  }
+
+  &.ant-popover-placement-bottom,
+  &.ant-popover-placement-bottomLeft,
+  &.ant-popover-placement-bottomRight,
+  &.ant-popover-placement-leftTop,
+  &.ant-popover-placement-rightTop {
+    > .ant-popover-content > .ant-popover-arrow {
+      border-color: var(--color-picker-selected-color);
+    }
+  }
+
+  .ant-popover-inner-content {
+    padding: 0;
+  }
+
+  .ant-card-head {
+    text-align: center;
+    border-bottom-color: rgba(0, 0, 0, 0.1);
+  }
+
+  .ant-card-body {
+    padding: 10px;
+  }
+}
+
+.color-picker-trigger {
+  cursor: pointer;
+}
--- a/client/app/components/ColorPicker/input.less
+++ b/client/app/components/ColorPicker/input.less
@@ -0,0 +1,19 @@
+.color-picker-input-swatches {
+  margin: 0 0 10px 0;
+  text-align: left;
+  white-space: nowrap;
+
+  .color-swatch {
+    cursor: pointer;
+    margin: 0 10px 0 0;
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+}
+
+.color-picker-input {
+  text-align: left;
+  white-space: nowrap;
+}
--- a/client/app/components/ColorPicker/swatch.less
+++ b/client/app/components/ColorPicker/swatch.less
@@ -0,0 +1,30 @@
+.color-swatch {
+  display: inline-block;
+  box-sizing: border-box;
+  vertical-align: middle;
+  border-radius: 2px;
+  overflow: hidden;
+  width: 12px;
+
+  @cell-size: 12px;
+  @cell-color: rgba(0, 0, 0, 0.1);
+
+  background-color: transparent;
+  background-image:
+    linear-gradient(45deg, @cell-color 25%, transparent 25%),
+    linear-gradient(-45deg, @cell-color 25%, transparent 25%),
+    linear-gradient(45deg, transparent 75%, @cell-color 75%),
+    linear-gradient(-45deg, transparent 75%, @cell-color 75%);
+  background-size: @cell-size @cell-size;
+  background-position: 0 0, 0 @cell-size/2, @cell-size/2 -@cell-size/2, -@cell-size/2 0px;
+
+  &:before {
+    content: "";
+    display: block;
+    padding-top: ~"calc(100% - 2px)";
+    background-color: inherit;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    border-radius: 2px;
+    overflow: hidden;
+  }
+}
--- a/client/app/components/CreateSourceDialog.jsx
+++ b/client/app/components/CreateSourceDialog.jsx
@@ -0,0 +1,191 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { isEmpty, toUpper, includes } from 'lodash';
+import Button from 'antd/lib/button';
+import List from 'antd/lib/list';
+import Modal from 'antd/lib/modal';
+import Input from 'antd/lib/input';
+import Steps from 'antd/lib/steps';
+import { wrap as wrapDialog, DialogPropType } from '@/components/DialogWrapper';
+import { PreviewCard } from '@/components/PreviewCard';
+import EmptyState from '@/components/items-list/components/EmptyState';
+import DynamicForm from '@/components/dynamic-form/DynamicForm';
+import helper from '@/components/dynamic-form/dynamicFormHelper';
+import { HelpTrigger, TYPES as HELP_TRIGGER_TYPES } from '@/components/HelpTrigger';
+
+const { Step } = Steps;
+const { Search } = Input;
+
+const StepEnum = {
+  SELECT_TYPE: 0,
+  CONFIGURE_IT: 1,
+  DONE: 2,
+};
+
+class CreateSourceDialog extends React.Component {
+  static propTypes = {
+    dialog: DialogPropType.isRequired,
+    types: PropTypes.arrayOf(PropTypes.object),
+    sourceType: PropTypes.string.isRequired,
+    imageFolder: PropTypes.string.isRequired,
+    helpTriggerPrefix: PropTypes.string,
+    onCreate: PropTypes.func.isRequired,
+  };
+
+  static defaultProps = {
+    types: [],
+    helpTriggerPrefix: null,
+  };
+
+  state = {
+    searchText: '',
+    selectedType: null,
+    savingSource: false,
+    currentStep: StepEnum.SELECT_TYPE,
+  };
+
+  selectType = (selectedType) => {
+    this.setState({ selectedType, currentStep: StepEnum.CONFIGURE_IT });
+  };
+
+  resetType = () => {
+    if (this.state.currentStep === StepEnum.CONFIGURE_IT) {
+      this.setState({ searchText: '', selectedType: null, currentStep: StepEnum.SELECT_TYPE });
+    }
+  };
+
+  createSource = (values, successCallback, errorCallback) => {
+    const { selectedType, savingSource } = this.state;
+    if (!savingSource) {
+      this.setState({ savingSource: true, currentStep: StepEnum.DONE });
+      this.props.onCreate(selectedType, values).then((data) => {
+        successCallback('Saved.');
+        this.props.dialog.close({ success: true, data });
+      }).catch((error) => {
+        this.setState({ savingSource: false, currentStep: StepEnum.CONFIGURE_IT });
+        errorCallback(error.message);
+      });
+    }
+  };
+
+  renderTypeSelector() {
+    const { types } = this.props;
+    const { searchText } = this.state;
+    const filteredTypes = types.filter(type => isEmpty(searchText) ||
+      includes(type.name.toLowerCase(), searchText.toLowerCase()));
+    return (
+      <div className="m-t-10">
+        <Search
+          placeholder="Search..."
+          onChange={e => this.setState({ searchText: e.target.value })}
+          autoFocus
+          data-test="SearchSource"
+        />
+        <div className="scrollbox p-5 m-t-10" style={{ minHeight: '30vh', maxHeight: '40vh' }}>
+          {isEmpty(filteredTypes) ? (<EmptyState className="" />) : (
+            <List
+              size="small"
+              dataSource={filteredTypes}
+              renderItem={item => this.renderItem(item)}
+            />
+          )}
+        </div>
+      </div>
+    );
+  }
+
+  renderForm() {
+    const { imageFolder, helpTriggerPrefix } = this.props;
+    const { selectedType } = this.state;
+    const fields = helper.getFields(selectedType);
+    const helpTriggerType = `${helpTriggerPrefix}${toUpper(selectedType.type)}`;
+    return (
+      <div className="p-5">
+        <div className="d-flex justify-content-center align-items-center">
+          <img
+            className="p-5"
+            src={`${imageFolder}/${selectedType.type}.png`}
+            alt={selectedType.name}
+            width="48"
+          />
+          <h4 className="m-0">{selectedType.name}</h4>
+        </div>
+        <div className="text-right">
+          {HELP_TRIGGER_TYPES[helpTriggerType] && (
+            <HelpTrigger className="f-13" type={helpTriggerType}>
+              Setup Instructions <i className="fa fa-question-circle" />
+            </HelpTrigger>
+          )}
+        </div>
+        <DynamicForm
+          id="sourceForm"
+          fields={fields}
+          onSubmit={this.createSource}
+          feedbackIcons
+          hideSubmitButton
+        />
+      </div>
+    );
+  }
+
+  renderItem(item) {
+    const { imageFolder } = this.props;
+    return (
+      <List.Item
+        className="p-l-10 p-r-10 clickable"
+        onClick={() => this.selectType(item)}
+      >
+        <PreviewCard title={item.name} imageUrl={`${imageFolder}/${item.type}.png`} roundedImage={false}>
+          <i className="fa fa-angle-double-right" />
+        </PreviewCard>
+      </List.Item>
+    );
+  }
+
+  render() {
+    const { currentStep, savingSource } = this.state;
+    const { dialog, sourceType } = this.props;
+    return (
+      <Modal
+        {...dialog.props}
+        title={`Create a New ${sourceType}`}
+        footer={(currentStep === StepEnum.SELECT_TYPE) ? [
+          (<Button key="cancel" onClick={() => dialog.dismiss()}>Cancel</Button>),
+          (<Button key="submit" type="primary" disabled>Create</Button>),
+        ] : [
+          (<Button key="previous" onClick={this.resetType}>Previous</Button>),
+          (
+            <Button
+              key="submit"
+              htmlType="submit"
+              form="sourceForm"
+              type="primary"
+              loading={savingSource}
+              data-test="CreateSourceButton"
+            >
+              Create
+            </Button>
+          ),
+        ]}
+      >
+        <div data-test="CreateSourceDialog">
+          <Steps className="hidden-xs m-b-10" size="small" current={currentStep} progressDot>
+            {currentStep === StepEnum.CONFIGURE_IT ? (
+              <Step
+                title={<a>Type Selection</a>}
+                className="clickable"
+                onClick={this.resetType}
+              />
+            ) : (<Step title="Type Selection" />)}
+            <Step title="Configuration" />
+            <Step title="Done" />
+          </Steps>
+          {currentStep === StepEnum.SELECT_TYPE && this.renderTypeSelector()}
+          {currentStep !== StepEnum.SELECT_TYPE && this.renderForm()}
+        </div>
+      </Modal>
+    );
+  }
+}
+
+export default wrapDialog(CreateSourceDialog);
--- a/client/app/components/DateInput.jsx
+++ b/client/app/components/DateInput.jsx
@@ -1,48 +1,49 @@
-import moment from 'moment';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { react2angular } from 'react2angular';
 import DatePicker from 'antd/lib/date-picker';
+import { clientConfig } from '@/services/auth';
+import { Moment } from '@/components/proptypes';

-function DateInput({
+const DateInput = React.forwardRef(({
+  defaultValue,
  value,
  onSelect,
-  // eslint-disable-next-line react/prop-types
-  clientConfig,
-}) {
+  className,
+  ...props
+}, ref) => {
  const format = clientConfig.dateFormat || 'YYYY-MM-DD';
  const additionalAttributes = {};
-  if (value && value.isValid()) {
-    additionalAttributes.defaultValue = value;
+  if (defaultValue && defaultValue.isValid()) {
+    additionalAttributes.defaultValue = defaultValue;
+  }
+  if (value === null || (value && value.isValid())) {
+    additionalAttributes.value = value;
  }
  return (
    <DatePicker
+      ref={ref}
+      className={className}
      {...additionalAttributes}
      format={format}
      placeholder="Select Date"
      onChange={onSelect}
+      {...props}
    />
  );
-}
+});

 DateInput.propTypes = {
-  value: (props, propName, componentName) => {
-    const value = props[propName];
-    if ((value !== null) && !moment.isMoment(value)) {
-      return new Error('Prop `' + propName + '` supplied to `' + componentName +
-        '` should be a Moment.js instance.');
-    }
-  },
+  defaultValue: Moment,
+  value: Moment,
  onSelect: PropTypes.func,
+  className: PropTypes.string,
 };

 DateInput.defaultProps = {
-  value: null,
+  defaultValue: null,
+  value: undefined,
  onSelect: () => {},
+  className: '',
 };

-export default function init(ngModule) {
-  ngModule.component('dateInput', react2angular(DateInput, null, ['clientConfig']));
-}
-
-init.init = true;
+export default DateInput;
--- a/client/app/components/DateRangeInput.jsx
+++ b/client/app/components/DateRangeInput.jsx
@@ -1,53 +1,51 @@
-import moment from 'moment';
 import { isArray } from 'lodash';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { react2angular } from 'react2angular';
-import { RangePicker } from 'antd/lib/date-picker';
+import DatePicker from 'antd/lib/date-picker';
+import { clientConfig } from '@/services/auth';
+import { Moment } from '@/components/proptypes';

-function DateRangeInput({
+const { RangePicker } = DatePicker;
+
+const DateRangeInput = React.forwardRef(({
+  defaultValue,
  value,
  onSelect,
-  // eslint-disable-next-line react/prop-types
-  clientConfig,
-}) {
+  className,
+  ...props
+}, ref) => {
  const format = clientConfig.dateFormat || 'YYYY-MM-DD';
  const additionalAttributes = {};
-  if (isArray(value) && value[0].isValid() && value[1].isValid()) {
-    additionalAttributes.defaultValue = value;
+  if (isArray(defaultValue) && defaultValue[0].isValid() && defaultValue[1].isValid()) {
+    additionalAttributes.defaultValue = defaultValue;
+  }
+  if (value === null || (isArray(value) && value[0].isValid() && value[1].isValid())) {
+    additionalAttributes.value = value;
  }
  return (
    <RangePicker
+      ref={ref}
+      className={className}
      {...additionalAttributes}
      format={format}
      onChange={onSelect}
+      {...props}
    />
  );
-}
+});

 DateRangeInput.propTypes = {
-  value: (props, propName, componentName) => {
-    const value = props[propName];
-    if (
-      (value !== null) && !(
-        isArray(value) && (value.length === 2) &&
-        moment.isMoment(value[0]) && moment.isMoment(value[1])
-      )
-    ) {
-      return new Error('Prop `' + propName + '` supplied to `' + componentName +
-        '` should be an array of two Moment.js instances.');
-    }
-  },
+  defaultValue: PropTypes.arrayOf(Moment),
+  value: PropTypes.arrayOf(Moment),
  onSelect: PropTypes.func,
+  className: PropTypes.string,
 };

 DateRangeInput.defaultProps = {
-  value: null,
+  defaultValue: null,
+  value: undefined,
  onSelect: () => {},
+  className: '',
 };

-export default function init(ngModule) {
-  ngModule.component('dateRangeInput', react2angular(DateRangeInput, null, ['clientConfig']));
-}
-
-init.init = true;
+export default DateRangeInput;
--- a/client/app/components/DateTimeInput.jsx
+++ b/client/app/components/DateTimeInput.jsx
@@ -1,53 +1,54 @@
-import moment from 'moment';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { react2angular } from 'react2angular';
 import DatePicker from 'antd/lib/date-picker';
+import { clientConfig } from '@/services/auth';
+import { Moment } from '@/components/proptypes';

-function DateTimeInput({
+const DateTimeInput = React.forwardRef(({
+  defaultValue,
  value,
  withSeconds,
  onSelect,
-  // eslint-disable-next-line react/prop-types
-  clientConfig,
-}) {
+  className,
+  ...props
+}, ref) => {
  const format = (clientConfig.dateFormat || 'YYYY-MM-DD') +
    (withSeconds ? ' HH:mm:ss' : ' HH:mm');
  const additionalAttributes = {};
-  if (value && value.isValid()) {
-    additionalAttributes.defaultValue = value;
+  if (defaultValue && defaultValue.isValid()) {
+    additionalAttributes.defaultValue = defaultValue;
+  }
+  if (value === null || (value && value.isValid())) {
+    additionalAttributes.value = value;
  }
  return (
    <DatePicker
+      ref={ref}
+      className={className}
      showTime
      {...additionalAttributes}
      format={format}
      placeholder="Select Date and Time"
      onChange={onSelect}
+      {...props}
    />
  );
-}
+});

 DateTimeInput.propTypes = {
-  value: (props, propName, componentName) => {
-    const value = props[propName];
-    if ((value !== null) && !moment.isMoment(value)) {
-      return new Error('Prop `' + propName + '` supplied to `' + componentName +
-        '` should be a Moment.js instance.');
-    }
-  },
+  defaultValue: Moment,
+  value: Moment,
  withSeconds: PropTypes.bool,
  onSelect: PropTypes.func,
+  className: PropTypes.string,
 };

 DateTimeInput.defaultProps = {
-  value: null,
+  defaultValue: null,
+  value: undefined,
  withSeconds: false,
  onSelect: () => {},
+  className: '',
 };

-export default function init(ngModule) {
-  ngModule.component('dateTimeInput', react2angular(DateTimeInput, null, ['clientConfig']));
-}
-
-init.init = true;
+export default DateTimeInput;
--- a/client/app/components/DateTimeRangeInput.jsx
+++ b/client/app/components/DateTimeRangeInput.jsx
@@ -1,59 +1,56 @@
-import moment from 'moment';
 import { isArray } from 'lodash';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { react2angular } from 'react2angular';
-import { RangePicker } from 'antd/lib/date-picker';
+import DatePicker from 'antd/lib/date-picker';
+import { clientConfig } from '@/services/auth';
+import { Moment } from '@/components/proptypes';

-function DateTimeRangeInput({
+const { RangePicker } = DatePicker;
+
+const DateTimeRangeInput = React.forwardRef(({
+  defaultValue,
  value,
  withSeconds,
  onSelect,
-  // eslint-disable-next-line react/prop-types
-  clientConfig,
-}) {
+  className,
+  ...props
+}, ref) => {
  const format = (clientConfig.dateFormat || 'YYYY-MM-DD') +
    (withSeconds ? ' HH:mm:ss' : ' HH:mm');
  const additionalAttributes = {};
-  if (isArray(value) && value[0].isValid() && value[1].isValid()) {
-    additionalAttributes.defaultValue = value;
+  if (isArray(defaultValue) && defaultValue[0].isValid() && defaultValue[1].isValid()) {
+    additionalAttributes.defaultValue = defaultValue;
+  }
+  if (value === null || (isArray(value) && value[0].isValid() && value[1].isValid())) {
+    additionalAttributes.value = value;
  }
  return (
    <RangePicker
+      ref={ref}
+      className={className}
      showTime
      {...additionalAttributes}
      format={format}
      onChange={onSelect}
+      {...props}
    />
  );
-}
+});

 DateTimeRangeInput.propTypes = {
-  value: (props, propName, componentName) => {
-    const value = props[propName];
-    if (
-      (value !== null) && !(
-        isArray(value) && (value.length === 2) &&
-        moment.isMoment(value[0]) && moment.isMoment(value[1])
-      )
-    ) {
-      return new Error('Prop `' + propName + '` supplied to `' + componentName +
-        '` should be an array of two Moment.js instances.');
-    }
-  },
+  defaultValue: PropTypes.arrayOf(Moment),
+  value: PropTypes.arrayOf(Moment),
  withSeconds: PropTypes.bool,
  onSelect: PropTypes.func,
+  className: PropTypes.string,
 };

 DateTimeRangeInput.defaultProps = {
-  value: null,
+  defaultValue: null,
+  value: undefined,
  withSeconds: false,
  onSelect: () => {},
+  className: '',
 };

-export default function init(ngModule) {
-  ngModule.component('dateTimeRangeInput', react2angular(DateTimeRangeInput, null, ['clientConfig']));
-}
-
-init.init = true;
-
+export default DateTimeRangeInput;
--- a/client/app/components/DialogWrapper.jsx
+++ b/client/app/components/DialogWrapper.jsx
@@ -0,0 +1,209 @@
+import { isFunction } from 'lodash';
+import React from 'react';
+import PropTypes from 'prop-types';
+import ReactDOM from 'react-dom';
+
+/**
+  Wrapper for dialogs based on Ant's <Modal> component.
+
+
+  Using wrapped dialogs
+  =====================
+
+  Wrapped component is an object with two fields:
+
+    {
+      showModal: (dialogProps) => object({
+          result: Promise,
+          close: (result) => void,
+          dismiss: (reason) => void,
+        }),
+      Component: React.Component, // wrapped dialog component
+    }
+
+  To open dialog, use `showModal` method; optionally you can pass additional properties that
+  will be expanded on wrapped component:
+
+    const dialog = SomeWrappedDialog.showModal()
+
+    const dialog = SomeWrappedDialog.showModal({ greeting: 'Hello' })
+
+  To get result of modal, use `result` property:
+
+    dialog.result
+      .then(...) // pressed OK button or used `close` method; resolved value is a result of dialog
+      .catch(...) // pressed Cancel button or used `dismiss` method; optional argument is a rejection reason.
+
+  Also, dialog has `close` and `dismiss` methods that allows to close dialog by caller. Passed arguments
+  will be used to resolve/reject `dialog.result` promise. `update` methods allows to pass new properties
+  to dialog.
+
+
+  Creating a dialog
+  ================
+
+  1. Add imports:
+
+    import { wrap as wrapDialog, DialogPropType } from 'path/to/DialogWrapper';
+
+  2. define a `dialog` property on your component:
+
+    propTypes = {
+      dialog: DialogPropType.isRequired,
+    };
+
+  `dialog` property is an object:
+
+    {
+      props: object, // properties for <Modal> component;
+      close: (result) => void, // method to confirm dialog; `result` will be returned to caller
+      dismiss: (reason) => void, // method to reject dialog; `reason` will be returned to caller
+    }
+
+  3. expand additional properties on <Modal> component:
+
+    render() {
+      const { dialog } = this.props;
+      return (
+        <Modal {...dialog.props}>
+      );
+    }
+
+  4. wrap your component and export it:
+
+    export default wrapDialog(YourComponent).
+
+  Your component is ready to use. Wrapper will manage <Modal>'s visibility and events.
+  If you want to override behavior of `onOk`/`onCancel` - don't forget to close dialog:
+
+    customOkHandler() {
+      this.saveData().then(() => {
+         this.props.dialog.close({ success: true }); // or dismiss();
+      });
+    }
+
+    render() {
+      const { dialog } = this.props;
+        return (
+          <Modal {...dialog.props} onOk={() => this.customOkHandler()}>
+        );
+    }
+
+
+  Settings
+  ========
+
+  You can setup this wrapper to use custom `Promise` library (for example, Bluebird):
+
+    import DialogWrapper from 'path/to/DialogWrapper';
+    import Promise from 'bluebird';
+
+    DialogWrapper.Promise = Promise;
+
+  It could be useful to avoid `unhandledrejection` exception that would fire with native Promises,
+  or when some custom Promise library is used in application.
+
+*/
+
+export const DialogPropType = PropTypes.shape({
+  props: PropTypes.shape({
+    visible: PropTypes.bool,
+    onOk: PropTypes.func,
+    onCancel: PropTypes.func,
+    afterClose: PropTypes.func,
+  }).isRequired,
+  close: PropTypes.func.isRequired,
+  dismiss: PropTypes.func.isRequired,
+});
+
+// default export of module
+const DialogWrapper = {
+  Promise,
+  DialogPropType,
+  wrap() {},
+};
+
+function openDialog(DialogComponent, props) {
+  const dialog = {
+    props: {
+      visible: true,
+      onOk: () => {},
+      onCancel: () => {},
+      afterClose: () => {},
+    },
+    close: () => {},
+    dismiss: () => {},
+  };
+
+  const dialogResult = {
+    resolve: () => {},
+    reject: () => {},
+  };
+
+  const container = document.createElement('div');
+  document.body.appendChild(container);
+
+  function render() {
+    ReactDOM.render(<DialogComponent {...props} dialog={dialog} />, container);
+  }
+
+  function destroyDialog() {
+    // Allow calling chain to roll up, and then destroy component
+    setTimeout(() => {
+      ReactDOM.unmountComponentAtNode(container);
+      document.body.removeChild(container);
+    }, 10);
+  }
+
+  function closeDialog(result) {
+    dialogResult.resolve(result);
+    dialog.props.visible = false;
+    render();
+  }
+
+  function dismissDialog(reason) {
+    dialogResult.reject(reason);
+    dialog.props.visible = false;
+    render();
+  }
+
+  dialog.props.onOk = closeDialog;
+  dialog.props.onCancel = dismissDialog;
+  dialog.props.afterClose = destroyDialog;
+  dialog.close = closeDialog;
+  dialog.dismiss = dismissDialog;
+
+  const result = {
+    close: closeDialog,
+    dismiss: dismissDialog,
+    update: (newProps) => {
+      props = { ...props, ...newProps };
+      render();
+    },
+    result: new DialogWrapper.Promise((resolve, reject) => {
+      dialogResult.resolve = resolve;
+      dialogResult.reject = reject;
+    }),
+  };
+
+  render(); // show it only when all structures initialized to avoid unnecessary re-rendering
+
+  // Some known libraries support
+  // Bluebird: http://bluebirdjs.com/docs/api/suppressunhandledrejections.html
+  if (isFunction(result.result.suppressUnhandledRejections)) {
+    result.result.suppressUnhandledRejections();
+  }
+
+  return result;
+}
+
+export function wrap(DialogComponent) {
+  return {
+    Component: DialogComponent,
+    showModal: props => openDialog(DialogComponent, props),
+  };
+}
+
+DialogWrapper.wrap = wrap;
+
+export default DialogWrapper;
--- a/client/app/components/DynamicComponent.jsx
+++ b/client/app/components/DynamicComponent.jsx
@@ -0,0 +1,50 @@
+import { isFunction, isString } from 'lodash';
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const componentsRegistry = new Map();
+const activeInstances = new Set();
+
+export function registerComponent(name, component) {
+  if (isString(name) && name !== '') {
+    componentsRegistry.set(name, isFunction(component) ? component : null);
+    // Refresh active DynamicComponent instances which use this component
+    activeInstances.forEach((dynamicComponent) => {
+      if (dynamicComponent.props.name === name) {
+        dynamicComponent.forceUpdate();
+      }
+    });
+  }
+}
+
+export function unregisterComponent(name) {
+  registerComponent(name, null);
+}
+
+export default class DynamicComponent extends React.Component {
+  static propTypes = {
+    name: PropTypes.string.isRequired,
+    children: PropTypes.node,
+  };
+
+  static defaultProps = {
+    children: null,
+  };
+
+  componentDidMount() {
+    activeInstances.add(this);
+  }
+
+  componentWillUnmount() {
+    activeInstances.delete(this);
+  }
+
+  render() {
+    const { name, children, ...props } = this.props;
+    const RealComponent = componentsRegistry.get(name);
+    if (!RealComponent) {
+      return children;
+    }
+    return <RealComponent {...props}>{children}</RealComponent>;
+  }
+}
--- a/client/app/components/EditInPlace.jsx
+++ b/client/app/components/EditInPlace.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { react2angular } from 'react2angular';
+import { trim } from 'lodash';

 export class EditInPlace extends React.Component {
  static propTypes = {
@@ -18,6 +19,7 @@ export class EditInPlace extends React.Component {
    placeholder: '',
    value: '',
  };
+
  constructor(props) {
    super(props);
    this.state = {
@@ -39,7 +41,7 @@ export class EditInPlace extends React.Component {
  };

  stopEditing = () => {
-    const newValue = this.inputRef.current.value;
+    const newValue = trim(this.inputRef.current.value);
    const ignorableBlank = this.props.ignoreBlanks && newValue === '';
    if (!ignorableBlank && newValue !== this.props.value) {
      this.props.onDone(newValue);
@@ -67,8 +69,7 @@ export class EditInPlace extends React.Component {
    </span>
  );

-  renderEdit = () =>
-    React.createElement(this.props.editor, {
+  renderEdit = () => React.createElement(this.props.editor, {
    ref: this.inputRef,
    className: 'rd-form-control',
    defaultValue: this.props.value,
--- a/client/app/components/EditParameterSettingsDialog.jsx
+++ b/client/app/components/EditParameterSettingsDialog.jsx
@@ -0,0 +1,254 @@
+
+import { includes, words, capitalize, clone, isNull } from 'lodash';
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import Checkbox from 'antd/lib/checkbox';
+import Modal from 'antd/lib/modal';
+import Form from 'antd/lib/form';
+import Button from 'antd/lib/button';
+import Select from 'antd/lib/select';
+import Input from 'antd/lib/input';
+import Divider from 'antd/lib/divider';
+import { wrap as wrapDialog, DialogPropType } from '@/components/DialogWrapper';
+import { QuerySelector } from '@/components/QuerySelector';
+import { Query } from '@/services/query';
+
+const { Option } = Select;
+const formItemProps = { labelCol: { span: 6 }, wrapperCol: { span: 16 } };
+
+function getDefaultTitle(text) {
+  return capitalize(words(text).join(' ')); // humanize
+}
+
+function isTypeDateRange(type) {
+  return /-range/.test(type);
+}
+
+function joinExampleList(multiValuesOptions) {
+  const { prefix, suffix } = multiValuesOptions;
+  return ['value1', 'value2', 'value3']
+    .map(value => `${prefix}${value}${suffix}`)
+    .join(',');
+}
+
+function NameInput({ name, type, onChange, existingNames, setValidation }) {
+  let helpText = '';
+  let validateStatus = '';
+
+  if (!name) {
+    helpText = 'Choose a keyword for this parameter';
+    setValidation(false);
+  } else if (includes(existingNames, name)) {
+    helpText = 'Parameter with this name already exists';
+    setValidation(false);
+    validateStatus = 'error';
+  } else {
+    if (isTypeDateRange(type)) {
+      helpText = (
+        <React.Fragment>
+          Appears in query as {' '}
+          <code style={{ display: 'inline-block', color: 'inherit' }}>
+            {`{{${name}.start}} {{${name}.end}}`}
+          </code>
+        </React.Fragment>
+      );
+    }
+    setValidation(true);
+  }
+
+  return (
+    <Form.Item
+      required
+      label="Keyword"
+      help={helpText}
+      validateStatus={validateStatus}
+      {...formItemProps}
+    >
+      <Input onChange={e => onChange(e.target.value)} autoFocus />
+    </Form.Item>
+  );
+}
+
+NameInput.propTypes = {
+  name: PropTypes.string.isRequired,
+  onChange: PropTypes.func.isRequired,
+  existingNames: PropTypes.arrayOf(PropTypes.string).isRequired,
+  setValidation: PropTypes.func.isRequired,
+  type: PropTypes.string.isRequired,
+};
+
+function EditParameterSettingsDialog(props) {
+  const [param, setParam] = useState(clone(props.parameter));
+  const [isNameValid, setIsNameValid] = useState(true);
+  const [initialQuery, setInitialQuery] = useState();
+
+  const isNew = !props.parameter.name;
+
+  // fetch query by id
+  useEffect(() => {
+    const { queryId } = props.parameter;
+    if (queryId) {
+      Query.get({ id: queryId }, (query) => {
+        setInitialQuery(query);
+      });
+    }
+  }, []);
+
+  function isFulfilled() {
+    // name
+    if (!isNameValid) {
+      return false;
+    }
+
+    // title
+    if (param.title === '') {
+      return false;
+    }
+
+    // query
+    if (param.type === 'query' && !param.queryId) {
+      return false;
+    }
+
+    return true;
+  }
+
+  function onConfirm(e) {
+    // update title to default
+    if (!param.title) {
+      // forced to do this cause param won't update in time for save
+      param.title = getDefaultTitle(param.name);
+      setParam(param);
+    }
+
+    props.dialog.close(param);
+
+    e.preventDefault(); // stops form redirect
+  }
+
+  return (
+    <Modal
+      {...props.dialog.props}
+      title={isNew ? 'Add Parameter' : param.name}
+      width={600}
+      footer={[(
+        <Button key="cancel" onClick={props.dialog.dismiss}>Cancel</Button>
+      ), (
+        <Button key="submit" htmlType="submit" disabled={!isFulfilled()} type="primary" form="paramForm" data-test="SaveParameterSettings">
+          {isNew ? 'Add Parameter' : 'OK'}
+        </Button>
+      )]}
+    >
+      <Form layout="horizontal" onSubmit={onConfirm} id="paramForm">
+        {isNew && (
+          <NameInput
+            name={param.name}
+            onChange={name => setParam({ ...param, name })}
+            setValidation={setIsNameValid}
+            existingNames={props.existingParams}
+            type={param.type}
+          />
+        )}
+        <Form.Item label="Title" {...formItemProps}>
+          <Input
+            value={isNull(param.title) ? getDefaultTitle(param.name) : param.title}
+            onChange={e => setParam({ ...param, title: e.target.value })}
+            data-test="ParameterTitleInput"
+          />
+        </Form.Item>
+        <Form.Item label="Type" {...formItemProps}>
+          <Select value={param.type} onChange={type => setParam({ ...param, type })} data-test="ParameterTypeSelect">
+            <Option value="text" data-test="TextParameterTypeOption">Text</Option>
+            <Option value="number" data-test="NumberParameterTypeOption">Number</Option>
+            <Option value="enum">Dropdown List</Option>
+            <Option value="query">Query Based Dropdown List</Option>
+            <Option disabled key="dv1">
+              <Divider className="select-option-divider" />
+            </Option>
+            <Option value="date" data-test="DateParameterTypeOption">Date</Option>
+            <Option value="datetime-local" data-test="DateTimeParameterTypeOption">Date and Time</Option>
+            <Option value="datetime-with-seconds">Date and Time (with seconds)</Option>
+            <Option disabled key="dv2">
+              <Divider className="select-option-divider" />
+            </Option>
+            <Option value="date-range" data-test="DateRangeParameterTypeOption">Date Range</Option>
+            <Option value="datetime-range">Date and Time Range</Option>
+            <Option value="datetime-range-with-seconds">Date and Time Range (with seconds)</Option>
+          </Select>
+        </Form.Item>
+        {param.type === 'enum' && (
+          <Form.Item label="Values" help="Dropdown list values (newline delimited)" {...formItemProps}>
+            <Input.TextArea
+              rows={3}
+              value={param.enumOptions}
+              onChange={e => setParam({ ...param, enumOptions: e.target.value })}
+            />
+          </Form.Item>
+        )}
+        {param.type === 'query' && (
+          <Form.Item label="Query" help="Select query to load dropdown values from" {...formItemProps}>
+            <QuerySelector
+              selectedQuery={initialQuery}
+              onChange={q => setParam({ ...param, queryId: q && q.id })}
+              type="select"
+            />
+          </Form.Item>
+        )}
+        {(param.type === 'enum' || param.type === 'query') && (
+          <Form.Item className="m-b-0" label=" " colon={false} {...formItemProps}>
+            <Checkbox
+              defaultChecked={!!param.multiValuesOptions}
+              onChange={e => setParam({ ...param,
+                multiValuesOptions: e.target.checked ? {
+                  prefix: '',
+                  suffix: '',
+                  separator: ',',
+                } : null })}
+              data-test="AllowMultipleValuesCheckbox"
+            >
+            Allow multiple values
+            </Checkbox>
+          </Form.Item>
+        )}
+        {(param.type === 'enum' || param.type === 'query') && param.multiValuesOptions && (
+          <Form.Item
+            label="Quotation"
+            help={(
+              <React.Fragment>
+                Placed in query as: <code>{joinExampleList(param.multiValuesOptions)}</code>
+              </React.Fragment>
+            )}
+            {...formItemProps}
+          >
+            <Select
+              value={param.multiValuesOptions.prefix}
+              onChange={quoteOption => setParam({ ...param,
+                multiValuesOptions: {
+                  ...param.multiValuesOptions,
+                  prefix: quoteOption,
+                  suffix: quoteOption,
+                } })}
+              data-test="QuotationSelect"
+            >
+              <Option value="">None (default)</Option>
+              <Option value="'">Single Quotation Mark</Option>
+              <Option value={'"'} data-test="DoubleQuotationMarkOption">Double Quotation Mark</Option>
+            </Select>
+          </Form.Item>
+        )}
+      </Form>
+    </Modal>
+  );
+}
+
+EditParameterSettingsDialog.propTypes = {
+  parameter: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
+  dialog: DialogPropType.isRequired,
+  existingParams: PropTypes.arrayOf(PropTypes.string),
+};
+
+EditParameterSettingsDialog.defaultProps = {
+  existingParams: [],
+};
+
+export default wrapDialog(EditParameterSettingsDialog);
--- a/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx
+++ b/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Dropdown from 'antd/lib/dropdown';
+import Menu from 'antd/lib/menu';
+import Button from 'antd/lib/button';
+import Icon from 'antd/lib/icon';
+import { react2angular } from 'react2angular';
+
+import QueryResultsLink from './QueryResultsLink';
+
+
+export function QueryControlDropdown(props) {
+  const menu = (
+    <Menu>
+      {!props.query.isNew() && (!props.query.is_draft || !props.query.is_archived) && (
+        <Menu.Item>
+          <a target="_self" onClick={() => props.openAddToDashboardForm(props.selectedTab)}>
+            <Icon type="plus-circle" theme="filled" /> Add to Dashboard
+          </a>
+        </Menu.Item>
+      )}
+      {!props.query.isNew() && (
+        <Menu.Item>
+          <a onClick={() => props.showEmbedDialog(props.query, props.selectedTab)} data-test="ShowEmbedDialogButton">
+            <Icon type="share-alt" /> Embed Elsewhere
+          </a>
+        </Menu.Item>
+      )}
+      <Menu.Item>
+        <QueryResultsLink
+          disabled={props.queryExecuting || !props.queryResult.getData || !props.queryResult.getData()}
+          query={props.query}
+          queryResult={props.queryResult}
+          embed={props.embed}
+          apiKey={props.apiKey}
+        >
+          <Icon type="file" /> Download as CSV File
+        </QueryResultsLink>
+      </Menu.Item>
+      <Menu.Item>
+        <QueryResultsLink
+          fileType="xlsx"
+          disabled={props.queryExecuting || !props.queryResult.getData || !props.queryResult.getData()}
+          query={props.query}
+          queryResult={props.queryResult}
+          embed={props.embed}
+          apiKey={props.apiKey}
+        >
+          <Icon type="file-excel" /> Download as Excel File
+        </QueryResultsLink>
+      </Menu.Item>
+    </Menu>
+  );
+
+  return (
+    <Dropdown
+      trigger={['click']}
+      overlay={menu}
+      overlayClassName="query-control-dropdown-overlay"
+    >
+      <Button data-test="QueryControlDropdownButton">
+        <Icon type="ellipsis" rotate={90} />
+      </Button>
+    </Dropdown>
+  );
+}
+
+QueryControlDropdown.propTypes = {
+  query: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
+  queryResult: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  queryExecuting: PropTypes.bool.isRequired,
+  showEmbedDialog: PropTypes.func.isRequired,
+  embed: PropTypes.bool,
+  apiKey: PropTypes.string,
+  selectedTab: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number,
+  ]),
+  openAddToDashboardForm: PropTypes.func.isRequired,
+};
+
+QueryControlDropdown.defaultProps = {
+  queryResult: {},
+  embed: false,
+  apiKey: '',
+  selectedTab: '',
+};
+
+export default function init(ngModule) {
+  ngModule.component('queryControlDropdown', react2angular(QueryControlDropdown));
+}
+
+init.init = true;
--- a/client/app/components/EditVisualizationButton/QueryResultsLink.jsx
+++ b/client/app/components/EditVisualizationButton/QueryResultsLink.jsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+
+export default function QueryResultsLink(props) {
+  let href = '';
+
+  const { query, queryResult, fileType } = props;
+  const resultId = queryResult.getId && queryResult.getId();
+  const resultData = queryResult.getData && queryResult.getData();
+
+  if (resultId && resultData && query.name) {
+    if (query.id) {
+      href = `api/queries/${query.id}/results/${resultId}.${fileType}${
+        props.embed ? `?api_key=${props.apiKey}` : ''
+      }`;
+    } else {
+      href = `api/query_results/${resultId}.${fileType}`;
+    }
+  }
+
+  return (
+    <a target="_self" disabled={props.disabled} href={href}>
+      {props.children}
+    </a>
+  );
+}
+
+QueryResultsLink.propTypes = {
+  query: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
+  queryResult: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  fileType: PropTypes.string,
+  disabled: PropTypes.bool.isRequired,
+  embed: PropTypes.bool,
+  apiKey: PropTypes.string,
+  children: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.node),
+    PropTypes.node,
+  ]).isRequired,
+};
+
+QueryResultsLink.defaultProps = {
+  queryResult: {},
+  fileType: 'csv',
+  embed: false,
+  apiKey: '',
+};
--- a/client/app/components/EditVisualizationButton/index.jsx
+++ b/client/app/components/EditVisualizationButton/index.jsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Button from 'antd/lib/button';
+import Icon from 'antd/lib/icon';
+import { react2angular } from 'react2angular';
+
+
+export function EditVisualizationButton(props) {
+  return (
+    <Button
+      data-test="EditVisualization"
+      className="edit-visualization"
+      onClick={() => props.openVisualizationEditor(props.selectedTab)}
+    >
+      <Icon type="form" />
+      <span className="hidden-xs hidden-s hidden-m">
+        Edit Visualization
+      </span>
+    </Button>
+  );
+}
+
+EditVisualizationButton.propTypes = {
+  openVisualizationEditor: PropTypes.func.isRequired,
+  selectedTab: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number,
+  ]),
+};
+
+EditVisualizationButton.defaultProps = {
+  selectedTab: '',
+};
+
+export default function init(ngModule) {
+  ngModule.component('editVisualizationButton', react2angular(EditVisualizationButton));
+}
+
+init.init = true;
--- a/client/app/components/EmailSettingsWarning.jsx
+++ b/client/app/components/EmailSettingsWarning.jsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { react2angular } from 'react2angular';
+import { currentUser, clientConfig } from '@/services/auth';
+
+export function EmailSettingsWarning({ featureName }) {
+  return (clientConfig.mailSettingsMissing && currentUser.isAdmin) ? (
+    <p className="alert alert-danger">
+      {`It looks like your mail server isn't configured. Make sure to configure it for the ${featureName} to work.`}
+    </p>
+  ) : null;
+}
+
+EmailSettingsWarning.propTypes = {
+  featureName: PropTypes.string.isRequired,
+};
+
+export default function init(ngModule) {
+  ngModule.component('emailSettingsWarning', react2angular(EmailSettingsWarning));
+}
+
+init.init = true;
--- a/Show More
+++ b/Show More