merge 1f166fd7

.babelrc

 {
-  "plugins": ["transform-flow-strip-types", "add-react-displayname", "transform-decorators-legacy"],
+  "plugins": [
+    "transform-flow-strip-types",
+    "add-react-displayname",
+    "transform-decorators-legacy",
+    ["transform-builtin-extend", {
+        "globals": ["Error", "Array"]
+    }]
+  ],
   "presets": ["es2015", "stage-0", "react"],
   "env": {
     "development": {

.dir-locals.el

@@ -23,7 +23,6 @@
                               (execute-query 1)
                               (execute-sql! 2)
                               (expect 0)
-                              (expect-when-testing-engine 1)
                               (expect-with-all-engines 0)
                               (expect-with-engine 1)
                               (expect-with-engines 1)
@@ -34,7 +33,7 @@
                               (match-$ 1)
                               (merge-with 1)
                               (post-select 1)
-                              (pre-cascade-delete 1)
+                              (pre-delete 1)
                               (pre-insert 1)
                               (pre-update 1)
                               (project 1)

.eslintrc

@@ -45,7 +45,8 @@
     "env": {
         "browser": true,
         "es6": true,
-        "commonjs": true
+        "commonjs": true,
+        "jest": true
     },
     "parser": "babel-eslint",
     "plugins": [

.gitignore

@@ -20,6 +20,7 @@ profiles.clj
 /*.trace.db
 /resources/frontend_client/app/dist/
 /resources/frontend_client/index.html
+/resources/frontend_client/public.html
 /node_modules/
 /.babel_cache
 /coverage

README.md

@@ -16,7 +16,7 @@ Metabase is the easy, open source way for everyone in your company to ask questi
 - Let anyone on your team [ask questions](http://www.metabase.com/docs/latest/users-guide/03-asking-questions) without knowing SQL
 - Rich beautiful [dashboards](http://www.metabase.com/docs/latest/users-guide/05-sharing-answers) with auto refresh and fullscreen
 - SQL Mode for analysts and data pros
-- Create canonical [segments and metrics](http://www.metabase.com/docs/latest/administration-guide/06-segments-and-metrics) for your team to use
+- Create canonical [segments and metrics](http://www.metabase.com/docs/latest/administration-guide/07-segments-and-metrics) for your team to use
 - Send data to Slack or email on a schedule with [Pulses](http://www.metabase.com/docs/latest/users-guide/09-pulses)
 - View data in Slack anytime with [Metabot](http://www.metabase.com/docs/latest/users-guide/10-metabot)
 - [Humanize data](http://www.metabase.com/docs/latest/administration-guide/03-metadata-editing) for your team by renaming, annotating and hiding fields

bin/ci

@@ -19,11 +19,11 @@ node-1() {
         run_step lein-test
 }
 node-2() {
-    is_enabled "drivers" && export ENGINES="h2,postgres,sqlite,crate" || export ENGINES="h2"
+    is_enabled "drivers" && export ENGINES="h2,postgres,sqlite" || export ENGINES="h2"
     if is_engine_enabled "crate"; then
         run_step install-crate
     fi
-    MB_DB_TYPE=mysql MB_DB_DBNAME=circle_test MB_DB_PORT=3306 MB_DB_USER=ubuntu MB_DB_HOST=localhost \
+    MB_ENCRYPTION_SECRET_KEY='Orw0AAyzkO/kPTLJRxiyKoBHXa/d6ZcO+p+gpZO/wSQ=' MB_DB_TYPE=mysql MB_DB_DBNAME=circle_test MB_DB_PORT=3306 MB_DB_USER=ubuntu MB_DB_HOST=localhost \
         run_step lein-test
 }
 node-3() {
@@ -31,7 +31,10 @@ node-3() {
     if is_engine_enabled "vertica"; then
         run_step install-vertica
     fi
-    run_step lein-test
+    # this is redundant with node 0 unless one of the non-H2 driver tests is enabled
+    if [ ENGINES != "h2" ]; then
+        run_step lein-test
+    fi
 }
 node-4() {
     run_step lein bikeshed
@@ -42,6 +45,7 @@ node-5() {
     run_step lein eastwood
     run_step yarn run lint
     run_step yarn run test
+    run_step yarn run test-jest
     run_step yarn run flow
 }
 node-6() {
@@ -106,19 +110,26 @@ is_engine_enabled() {
 }
 
 # print a summary on exit
+status=0
 summary=""
 
 # records the time and exit code of each step
 run_step() {
     status=0
     start=$(date +%s)
-    "$@" || status=$?
+    # run in the background then `wait` so fail_fast can interrupt it
+    "$@" &
+    wait $! || status=$?
     elapsed=$(expr $(date +%s) - $start || true)
     summary="${summary}status=$status time=$elapsed command=$@\n"
     return $status
 }
 
 summary() {
+    # if last status was failure then fail the rest of the nodes
+    if [ $status != 0 ]; then
+      fail_fast
+    fi
     echo -e "========================================"
     echo -en "$summary"
     echo -e "========================================"
@@ -126,6 +137,26 @@ summary() {
 
 trap summary EXIT
 
+fail_fast() {
+  echo -e "========================================"
+  echo -e "Failing fast! Stopping other nodes..."
+  # ssh to the other CircleCI nodes and send SIGUSR1 to tell them to exit early
+  for (( i = 0; i < $CIRCLE_NODE_TOTAL; i++ )); do
+    if [ $i != $CIRCLE_NODE_INDEX ]; then
+      ssh node$i 'touch /tmp/fail; pkill -SIGUSR1 -f "bash ./bin/ci"' 2> /dev/null || true
+    fi
+  done
+}
+
+exit_early() {
+  echo -e "========================================"
+  echo -e "Exited early! Did not necesssarily pass!"
+  pkill -TERM -P $$ || true
+  exit 0
+}
+
+trap exit_early SIGUSR1
+
 if [ -z ${CIRCLE_SHA1+x} ]; then
     export CIRCLE_SHA1="$(git rev-parse HEAD)"
 fi
@@ -136,6 +167,10 @@ fi
 
 export CIRCLE_COMMIT_MESSAGE="$(git log --format=oneline -n 1 $CIRCLE_SHA1)"
 
+if [ -f "/tmp/fail" ]; then
+  exit_early
+fi
+
 if [ -z ${CIRCLE_NODE_INDEX+x} ]; then
     # If CIRCLE_NODE_INDEX isn't set, read node numbers from the args
     # Useful for testing locally.

circle.yml

@@ -3,7 +3,7 @@ machine:
     America/Los_Angeles
   java:
     version:
-      oraclejdk8
+      openjdk7
   node:
     version: 4.4.7
   services:

docs/administration-guide/03-metadata-editing.md

@@ -27,7 +27,7 @@ If you ever want to see the original underlying schema for a given table, just c
 
 A field is a representation of either a column (when using a SQL based database, like PostgreSQL) or a field in a document (when using a document- or JSON-based database like MongoDB). Metabase automatically attempts to classify your fields and assign them a type. If Metabase misclassified any fields, you can correct that here.
 
-There are several pieces of metadata you can edit per field: name, description, visibility, type, and details:
+There are several pieces of metadata you can edit per field: name, description, visibility, and type.
 
 #### Name
 
@@ -39,22 +39,13 @@ This is a human-readable description of what the field is and how it is meant to
 
 #### Visibility
 
-If you have really long data in certain fields, like descriptions or biographies, you can set the visibility to display the field **Only in Detail Views** when looking at a single record. By default, any column with an average length of longer than 50 characters is assigned this setting.
+Every field in a table shows up in Metabase by default. If you have really long data in certain fields, like descriptions or biographies, you can set the visibility to display the field **Only in Detail Views** when looking at a single record. By default, any column with an average length of longer than 50 characters is assigned this setting.
 
 Similarly, if you have sensitive or irrelevant fields, you can set them to **Do Not Include**, preventing the field from being accessed by Metabase.
 
 #### Types
 
-**Type** assigns a field a high-level category, and changes how the field can be used within Metabase. For example, only Metric fields can be added or averaged. A field can be assigned one of four basic types:
-
-* Metric — a metric is a number that you expect to plot, sum, take averages of, etc. You could think of it as anything that would end up being plotted on the y-axis of a graph.
-* Dimension — This is any field that you expect to use as an x-axis of a graph or as part of a pivot table. Anything that you could group your results by could be called a dimension, such as dates.
-* Information — This is any other information that is not expected to be used in any kind of aggregate metrics but contains other information. Examples include descriptions, names, emails.
-* Sensitive Information — Use this setting for fields that you don’t want to show up anywhere in Metabase. This does the same thing as changing the visibility to Do Not Include, and in fact if you set a field’s visibility to Do Not Include, it’ll automatically get assigned the type Sensitive Information.
-
-#### Details
-
-A field’s detailed type is used to determine how to display it, and can also give certain types of fields special functionality. For example, by marking fields in a table as Latitude and Longitude, you allow the table to be used to create pin and heat maps. Similarly, marking a field as a URL allows users to click on it and go to that URL.
+A field’s "special type" is used to determine how to display it, and can also give certain types of fields special functionality. For example, by marking fields in a table as Latitude and Longitude, you allow the table to be used to create pin and heat maps. Similarly, marking a field as a URL allows users to click on it and go to that URL.
 
 This is also where you can set a field to be a **primary key** or **foreign key** of a table.
 

docs/administration-guide/databases/bigquery.md

@@ -7,15 +7,23 @@ Starting in v0.15.0 Metabase provides a driver for connecting to BigQuery direct
 
 1. make sure you have a [Google Cloud Platform](https://cloud.google.com/) account with a Project you would like to use in Metabase.
 * Start by giving this connection a __Name__ and providing your Google Cloud Platform __Project ID__ along with your desired BigQuery __Dataset ID__.  If you don't have a dataset and want to play around with something we recommend copying one of the [sample tables](https://cloud.google.com/bigquery/sample-tables)
-![basicfields](../images/bigquery_basic.png)
+![Basic Fields](../images/bigquery_basic.png)
 * Follow the `Click here` link provided below the __Client ID__ field which will open a new browser tab and guide you through the process of generating OAuth 2.0 credentials for Metabase.  Make sure to choose `Other` for your application type.
-![clientid](../images/bigquery_clientid.png)
+![Client ID](../images/bigquery_clientid.png)
 * take the resulting client ID and client secret and copy them over to Metabase.
-![clientid](../images/bigquery_clientdetails.png)
+![Client Details](../images/bigquery_clientdetails.png)
 * Now follow the link below the __Auth Code__ field for `Click here to get an auth code` which will open a new browser window and authorize your credentials for a BigQuery access token to use the api.  Simply click the `Allow` button.
-![clientid](../images/bigquery_authcode.png)
+![Generating an Auth Code](../images/bigquery_authcode.png)
 * Copy the resulting code provided into the __Auth Code__ field in Metabase.
-![clientid](../images/bigquery_copycode.png)
+![Copying the Auth Code](../images/bigquery_copycode.png)
 * Click the `Save` button!
 
 Metabase will now begin inspecting your BigQuery Dataset and finding any tables and fields to build up a sense for the schema.  Give it a little bit of time to do its work and then you're all set to start querying.
+
+
+## Using Standard SQL
+
+By default, Metabase tells BigQuery to interpret queries as [Legacy SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql). If you prefer using
+[Standard SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/) instead, you can tell Metabase to do so by including a `#standardSQL` directive at the beginning of your query:
+
+![Enabling Standard SQL](../images/bigquery_standard_sql.png)

docs/api-documentation.md

-# API Documentation for Metabase v0.22.0-snapshot
+# API Documentation for Metabase v0.23.0-snapshot
 
 ## `GET /api/activity/`
 
@@ -19,6 +19,17 @@ Unfavorite a Card.
 *  **`card-id`** 
 
 
+## `DELETE /api/card/:card-id/public_link`
+
+Delete the publically-accessible link to this Card.
+
+You must be a superuser to do this.
+
+##### PARAMS:
+
+*  **`card-id`** 
+
+
 ## `DELETE /api/card/:id`
 
 Delete a `Card`.
@@ -102,6 +113,19 @@ Update the set of `Labels` that apply to a `Card`.
 *  **`label_ids`** value must be an array. Each value must be an integer greater than zero.
 
 
+## `POST /api/card/:card-id/public_link`
+
+Generate publically-accessible links for this Card. Returns UUID to be used in public links.
+   (If this Card has already been shared, it will return the existing public link rather than creating a new one.)
+   Public sharing must be enabled.
+
+You must be a superuser to do this.
+
+##### PARAMS:
+
+*  **`card-id`** 
+
+
 ## `POST /api/card/:card-id/query`
 
 Run the query associated with a Card.
@@ -236,6 +260,17 @@ Do a batch update of Collections Permissions by passing in a modified graph.
 *  **`body`** value must be a map.
 
 
+## `DELETE /api/dashboard/:dashboard-id/public_link`
+
+Delete the publically-accessible link to this Dashboard.
+
+You must be a superuser to do this.
+
+##### PARAMS:
+
+*  **`dashboard-id`** 
+
+
 ## `DELETE /api/dashboard/:id`
 
 Delete a `Dashboard`.
@@ -299,6 +334,19 @@ Create a new `Dashboard`.
 *  **`dashboard`** 
 
 
+## `POST /api/dashboard/:dashboard-id/public_link`
+
+Generate publically-accessible links for this Dashboard. Returns UUID to be used in public links.
+   (If this Dashboard has already been shared, it will return the existing public link rather than creating a new one.)
+   Public sharing must be enabled.
+
+You must be a superuser to do this.
+
+##### PARAMS:
+
+*  **`dashboard-id`** 
+
+
 ## `POST /api/dashboard/:id/cards`
 
 Add a `Card` to a `Dashboard`.
@@ -911,6 +959,61 @@ You must be a superuser to do this.
 *  **`name`** value must be a non-blank string.
 
 
+## `GET /api/public/card/:uuid`
+
+Fetch a publically-accessible Card an return query results as well as `:card` information. Does not require auth credentials. Public sharing must be enabled.
+
+##### PARAMS:
+
+*  **`uuid`** 
+
+*  **`parameters`** value may be nil, or if non-nil, value must be a valid JSON string.
+
+
+## `GET /api/public/card/:uuid/csv`
+
+Fetch a publically-accessible Card and return query results as CSV. Does not require auth credentials. Public sharing must be enabled.
+
+##### PARAMS:
+
+*  **`uuid`** 
+
+*  **`parameters`** value may be nil, or if non-nil, value must be a valid JSON string.
+
+
+## `GET /api/public/card/:uuid/json`
+
+Fetch a publically-accessible Card and return query results as JSON. Does not require auth credentials. Public sharing must be enabled.
+
+##### PARAMS:
+
+*  **`uuid`** 
+
+*  **`parameters`** value may be nil, or if non-nil, value must be a valid JSON string.
+
+
+## `GET /api/public/dashboard/:uuid`
+
+Fetch a publically-accessible Dashboard. Does not require auth credentials. Public sharing must be enabled.
+
+##### PARAMS:
+
+*  **`uuid`** 
+
+
+## `GET /api/public/dashboard/:uuid/card/:card-id`
+
+Fetch the results for a Card in a publically-accessible Dashboard. Does not require auth credentials. Public sharing must be enabled.
+
+##### PARAMS:
+
+*  **`uuid`** 
+
+*  **`card-id`** 
+
+*  **`parameters`** value may be nil, or if non-nil, value must be a valid JSON string.
+
+
 ## `DELETE /api/pulse/:id`
 
 Delete a `Pulse`.

docs/operations-guide/running-metabase-on-elastic-beanstalk.md

@@ -18,7 +18,7 @@ The Metabase team runs a number of production installations on AWS using Elastic
 
 Metabase provides an Elastic Beanstalk pre-configured launch url to help new installations getting started.  If you are starting fresh we recommend you follow this link to begin creating the Elastic Beanstalk deployment with a few choices pre-filled.
 
-[Launch Metabase on Elastic Beanstalk](http://downloads.metabase.com/v0.19.3/launch-aws-eb.html)
+[Launch Metabase on Elastic Beanstalk](http://downloads.metabase.com/{{site.latest_version}}/launch-aws-eb.html)
 
 The rest of this guide will follow each phase of the Elastic Beanstalk setup step-by-step.
 
@@ -55,7 +55,7 @@ When your environment type settings look like the above then go ahead and click
 
 The application version describes the exact binary you wish to deploy to your Elastic Beanstalk application.  Metabase provides a pre-built AWS Elastic Beanstalk application version which can be linked to directly.  Simply enter the following url in the `S3 URL` textbox:
 
-http://downloads.metabase.com/v0.20.0/metabase-aws-eb.zip
+http://downloads.metabase.com/{{ site.latest_version }}/metabase-aws-eb.zip
 
 Leave all the settings under Deployment Limits on their defaults.  These settings won't impact Metabase.
 
@@ -188,10 +188,10 @@ Here's each step:
 1. Go to Elastic Beanstalk and select your `Metabase` application
 * Click on `Application Versions` on the left nav (you can also choose `Application Versions` from the dropdown at the top of the page)
 * Download the latest Metabase Elastic Beanstalk deployment file
-  * http://downloads.metabase.com/v0.20.0/metabase-aws-eb.zip
+  * http://downloads.metabase.com/{{ site.latest_version }}/metabase-aws-eb.zip
 * Upload a new Application Version
 	* Click the `Upload` button on the upper right side of the listing
-		* Give the new version a name, ideally including the Metabase version number (e.g. v0.20.0)
+		* Give the new version a name, ideally including the Metabase version number (e.g. {{ site.latest_version }})
 		* Select `Choose File` and navigate to the file you just downloaded
 		* Click the `Upload` button to upload the file
 	* After the upload completes make sure you see your new version in the Application Versions listing

docs/operations-guide/start.md

@@ -8,6 +8,7 @@
 *  [Migrating from using the H2 database to MySQL or Postgres](#migrating-from-using-the-h2-database-to-mysql-or-postgres)
 *  [Running database migrations manually](#running-metabase-database-migrations-manually)
 *  [Backing up Metabase Application Data](#backing-up-metabase-application-data)
+*  [Encrypting your database connection details at rest](#encrypting-your-database-connection-details-at-rest)
 *  [Customizing the Metabase Jetty Webserver](#customizing-the-metabase-jetty-webserver)
 *  [Changing password complexity](#changing-metabase-password-complexity)
 *  [Handling Timezones](#handling-timezones-in-metabase)
@@ -221,6 +222,27 @@ Instructions can be found in the [Amazon RDS User Guide](http://docs.aws.amazon.
 Simply follow the same instructions you would use for making any normal database backup.  It's a large topic more fit for a DBA to answer, but as long as you have a dump of the Metabase database you'll be good to go.
 
 
+# Encrypting your database connection details at rest
+
+Metabase stores connection information for the various databases you add in the Metabase application database. To prevent bad actors from being able to access these details if they were to gain access to
+the application DB, Metabase can automatically encrypt them when they are saved, and decrypt them on-the-fly whenever they are needed. The only thing you need to do is set the environment variable
+`MB_ENCRYPTION_SECRET_KEY`.
+
+Your secret key must be at least 16 characters (longer is even better!), and we recommend using a secure random key generator to generate it. `openssl` is a good choice:
+
+    openssl rand -base64 32
+
+This gives you a cryptographically-secure, randomly-generated 32-character key that will look something like `IYqrSi5QDthvFWe4/WdAxhnra5DZC3RKx3ZSrOJDKsM=`. Set it as an environment variable and
+start Metabase as usual:
+
+    MB_ENCRYPTION_SECRET_KEY='IYqrSi5QDthvFWe4/WdAxhnra5DZC3RKx3ZSrOJDKsM=' java -jar metabase.jar
+
+Metabase will securely encrypt and store the connection details for any new Databases you add. (Connection details for existing databases will be encrypted as well if you save them in the admin panel).
+Existing databases with unencrypted details will continue to work normally.
+
+Take care not to lose this key because you can't decrypt connection details without it. If you lose (or change) it, you'll have to reset all of the connection details that have been encrypted with it in the Admin Panel.
+
+
 # Customizing the Metabase Jetty webserver
 
 In most cases there will be no reason to modify any of the settings around how Metabase runs its embedded Jetty webserver to host the application, but if you wish to run HTTPS directly with your Metabase server or if you need to run on another port, that's all configurable.
@@ -289,6 +311,7 @@ To ensure proper reporting it's important that timezones be set consistently in
 
 
 Common Pitfalls:
+
 1. Your database is using date/time columns without any timezone information.  Typically when this happens your database will assume all the data is from whatever timezone the database is configured in or possible just default to UTC (check your database vendor to be sure).
 2. Your JVM timezone is not the same as your Metabase `Report Timezone` choice.  This is a very common issue and can be corrected by launching java with the `-Duser.timezone=<timezone>` option properly set to match your Metabase report timezone.
 

docs/users-guide/04-visualizing-results.md

@@ -39,6 +39,7 @@ The Table option is good for looking at tabular data (duh), or for lists of thin
 Line charts are best for displaying the trend of a number over time, especially when you have lots of x-axis values. Bar charts are great for displaying a metric grouped by a category (e.g., the number of users you have by country), and they can also be useful for showing a number over time if you have a smaller number of x-axis values (like orders per month this year). Area charts are useful when comparing the the proportions between two metrics over time. Both bar and area charts can be stacked.
 
 These three charting types have very similar options, which are broken up into the following:
+
 * **Data** — choose the fields you want to plot on your x and y axes. This is mostly useful if your table or result set contains more than two columns, like if you're trying to graph fields from an unaggregated table. You can also add additional metric fields by clicking the `Add another series` link below the y-axis dropdown, or break your current metric out by an additional dimension by clicking the `Add a series breakout` link below the x-axis dropdown (note that you can't add an additional series breakout if you have more than one metric/series).
 * **Display** — here's where you can make some cosmetic changes, like setting colors, and stacking bar or area charts. With line and area charts, you can also change the line style (line, curve, or step). We've also recently added the ability to create a goal line for your chart, and to configure how your chart deals with x-axis points that have missing y-axis values.
 * **Axes** — this is where you can hide axis markers or change their ranges, and turn split axes on or off. You can also configure the way your axes are scaled, if you're into that kind of thing.

frontend/interfaces/icepick.js

@@ -2,16 +2,16 @@ type Key = string | number;
 type Value = any;
 
 declare module icepick {
-    declare function assoc<O:Object, K:Key, V:Value>(object: O, key: K, value: V): O;
-    declare function dissoc<O:Object, K:Key, V:Value>(object: O, key: K): O;
+    declare function assoc<O:Object|Array<any>, K:Key, V:Value>(object: O, key: K, value: V): O;
+    declare function dissoc<O:Object|Array<any>, K:Key, V:Value>(object: O, key: K): O;
 
-    declare function getIn<O:Object, K:Key, V:Value>(object: ?O, path: Array<K>): ?V;
-    declare function setIn<O:Object, K:Key, V:Value>(object: O, path: Array<K>, value: V): O;
-    declare function assocIn<O:Object, K:Key, V:Value>(object: O, path: Array<K>, value: V): O;
-    declare function updateIn<O:Object, K:Key, V:Value>(object: O, path: Array<K>, callback: ((value: V) => V)): O;
+    declare function getIn<O:Object|Array<any>, K:Key, V:Value>(object: ?O, path: Array<K>): ?V;
+    declare function setIn<O:Object|Array<any>, K:Key, V:Value>(object: O, path: Array<K>, value: V): O;
+    declare function assocIn<O:Object|Array<any>, K:Key, V:Value>(object: O, path: Array<K>, value: V): O;
+    declare function updateIn<O:Object|Array<any>, K:Key, V:Value>(object: O, path: Array<K>, callback: ((value: V) => V)): O;
 
-    declare function merge<O:Object>(object: O, other: O): O;
+    declare function merge<O:Object|Array<any>>(object: O, other: O): O;
 
     // TODO: improve this
-    declare function chain<O:Object>(object: O): any;
+    declare function chain<O:Object|Array<any>>(object: O): any;
 }

frontend/interfaces/underscore.js

@@ -8,7 +8,7 @@ declare module "underscore" {
   declare function clone<T>(obj: T): T;
 
   declare function isEqual(a: any, b: any): boolean;
-  declare function range(a: number, b: number): Array<number>;
+  declare function range(a: number, b?: number): Array<number>;
   declare function extend<S, T>(o1: S, o2: T): S & T;
 
   declare function zip<S, T>(a1: S[], a2: T[]): Array<[S, T]>;
@@ -44,13 +44,20 @@ declare module "underscore" {
   declare function min<T>(a: Array<T>|{[key:any]: T}): T;
   declare function max<T>(a: Array<T>|{[key:any]: T}): T;
 
-  declare function uniq<T>(a: T[], isSorted?: boolean, iteratee?: (val: T) => boolean): T[];
+  declare function uniq<T>(a: T[], iteratee?: (val: T) => boolean): T[];
+  declare function uniq<T>(a: T[], isSorted: boolean, iteratee?: (val: T) => boolean): T[];
 
   declare function values<T>(o: {[key: any]: T}): T[];
-  declare function omit<T>(o: {[key: any]: T}, ...properties: string[]): T;
+  declare function omit(o: {[key: any]: any}, ...properties: string[]): {[key: any]: any};
+  declare function omit(o: {[key: any]: any}, predicate: (val: any, key: any, object: {[key: any]: any})=>boolean): {[key: any]: any};
+  declare function pick(o: {[key: any]: any}, ...properties: string[]): {[key: any]: any};
+  declare function pick(o: {[key: any]: any}, predicate: (val: any, key: any, object: {[key: any]: any})=>boolean): {[key: any]: any};
+  declare function pluck(o: Array<{[key: any]: any}>, propertyNames: string): Array<any>;
 
   declare function flatten(a: Array<any>): Array<any>;
 
+  declare function debounce<T: (any) => any>(func: T): T;
+
   // TODO: improve this
   declare function chain<S>(obj: S): any;
 }

frontend/src/metabase/App.jsx

+/* @flow weak */
+
 import React, { Component, PropTypes } from "react";
+import { connect } from "react-redux";
 
 import Navbar from "metabase/nav/containers/Navbar.jsx";
 
 import UndoListing from "metabase/containers/UndoListing";
 
+import NotFound from "metabase/components/NotFound.jsx";
+import Unauthorized from "metabase/components/Unauthorized.jsx";
+
+const mapStateToProps = (state, props) => ({
+    errorPage: state.app.errorPage
+})
+
+@connect(mapStateToProps)
 export default class App extends Component {
     render() {
-        const { children, location } = this.props;
+        const { children, location, errorPage } = this.props;
         return (
             <div className="spread flex flex-column">
                 <Navbar location={location} className="flex-no-shrink" />
-                {children}
+                { errorPage && errorPage.status === 403 ?
+                    <Unauthorized />
+                : errorPage ?
+                    // TODO: different error page for non-404 errors
+                    <NotFound />
+                :
+                    children
+                }
                 <UndoListing />
             </div>
         )

frontend/src/metabase/admin/databases/components/CreatedDatabaseModal.jsx

@@ -22,7 +22,7 @@ export default class CreatedDatabaseModal extends Component {
                         We're analyzing its schema now to make some educated guesses about its
                         metadata. <Link to={"/admin/datamodel/database/"+databaseId}>View this
                         database</Link> in the Data Model section to see what we've found and to
-                        make edits, or <Link to={"/q?db="+databaseId}>ask a question</Link> about
+                        make edits, or <Link to={"/q#?db="+databaseId}>ask a question</Link> about
                         this database.
                     </p>
                 </div>

frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx

@@ -70,6 +70,7 @@ export default class PartialQueryBuilder extends Component {
                     query={dataset_query}
                     features={features}
                     tableMetadata={tableMetadata}
+                    databases={tableMetadata && [tableMetadata.db]}
                     setQueryFn={this.setQuery}
                     isShowingDataReference={false}
                     setDatabaseFn={null}

frontend/src/metabase/admin/people/components/EditUserForm.jsx

@@ -122,6 +122,7 @@ export default class EditUserForm extends Component {
                         <FormField>
                             <FormLabel title="Permission Groups" offset={false}></FormLabel>
                             <PopoverWithTrigger
+                                sizeToFit
                                 triggerElement={
                                     <SelectButton>
                                         <GroupSummary groups={groups} selectedGroups={selectedGroups}/>