Ignore gh-pages branch in CircleCI.

Update bootstrap.sh

circle.yml

@@ -26,3 +26,7 @@ deployment:
 notify:
   webhooks:
     - url: https://webhooks.gitter.im/e/895d09c3165a0913ac2f
+general:
+  branches:
+    ignore:
+      - gh-pages

rd_ui/app/scripts/visualizations/table.js

@@ -79,14 +79,14 @@
               } else if (columnType === 'date') {
                 columnDefinition.formatFunction = function (value) {
                   if (value) {
-                    return value.format("DD/MM/YY");
+                    return value.toDate().toLocaleDateString();
                   }
                   return value;
                 };
               } else if (columnType === 'datetime') {
                 columnDefinition.formatFunction = function (value) {
                   if (value) {
-                    return value.format("DD/MM/YY HH:mm");
+                    return value.toDate().toLocaleString();
                   }
                   return value;
                 };

redash/settings.py

@@ -67,14 +67,14 @@ GOOGLE_CLIENT_SECRET = os.environ.get("REDASH_GOOGLE_CLIENT_SECRET", "")
 GOOGLE_OAUTH_ENABLED = GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET
 
 STATIC_ASSETS_PATH = fix_assets_path(os.environ.get("REDASH_STATIC_ASSETS_PATH", "../rd_ui/app/"))
-JOB_EXPIRY_TIME = int(os.environ.get("REDASH_JOB_EXPIRY_TIME", 3600*6))
+JOB_EXPIRY_TIME = int(os.environ.get("REDASH_JOB_EXPIRY_TIME", 3600 * 6))
 COOKIE_SECRET = os.environ.get("REDASH_COOKIE_SECRET", "c292a0a3aa32397cdb050e233733900f")
 LOG_LEVEL = os.environ.get("REDASH_LOG_LEVEL", "INFO")
 CLIENT_SIDE_METRICS = parse_boolean(os.environ.get("REDASH_CLIENT_SIDE_METRICS", "false"))
 ANALYTICS = os.environ.get("REDASH_ANALYTICS", "")
 
 # Query Runners
-QUERY_RUNNERS = [
+QUERY_RUNNERS = array_from_string(os.environ.get("REDASH_ENABLED_QUERY_RUNNERS", ",".join([
     'redash.query_runner.big_query',
     'redash.query_runner.graphite',
     'redash.query_runner.mongodb',
@@ -82,7 +82,7 @@ QUERY_RUNNERS = [
     'redash.query_runner.pg',
     'redash.query_runner.script',
     'redash.query_runner.url',
-]
+])))
 
 # Features:
 FEATURE_TABLES_PERMISSIONS = parse_boolean(os.environ.get("REDASH_FEATURE_TABLES_PERMISSIONS", "false"))

setup/bootstrap.sh

@@ -98,7 +98,9 @@ if [ ! -f "/opt/redash/.env" ]; then
 fi
 
 # Install latest version
-REDASH_VERSION=${REDASH_VERSION-0.4.0.b589}
+# REDASH_VERSION=${REDASH_VERSION-0.4.0.b589}
+# modified by @fedex1 3/15/2015 seems to be the latest version at this point in time. 
+REDASH_VERSION=${REDASH_VERSION-0.6.0.b722}
 LATEST_URL="https://github.com/EverythingMe/redash/releases/download/v${REDASH_VERSION/.b/%2Bb}/redash.$REDASH_VERSION.tar.gz"
 VERSION_DIR="/opt/redash/redash.$REDASH_VERSION"
 REDASH_TARBALL=/tmp/redash.tar.gz