Merge branch 'master' into simplify-fk-modeling

.dockerignore

+.babel_cache/*
+docs/*
+OSX/*
+target/*
+
+**metabase.jar

Dockerfile

-FROM ubuntu:trusty
+FROM java:openjdk-7-jre-alpine
 
-# Make sure we are using UTF-8
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV JAVA_HOME=/usr/lib/jvm/default-jvm
+ENV PATH /usr/local/bin:$PATH
+ENV LEIN_ROOT 1
 
 # install core build tools
-RUN apt-get update && \
-    apt-get install -y openjdk-7-jdk && \
-    apt-get install -y nodejs && \
-    apt-get install -y npm && \
-    apt-get install -y git && \
-    apt-get install -y wget
+RUN apk add --update nodejs git wget bash python make g++ java-cacerts && \
+    ln -sf "${JAVA_HOME}/bin/"* "/usr/bin/"
+
+# fix broken cacerts
+RUN rm -f /usr/lib/jvm/default-jvm/jre/lib/security/cacerts && \
+    ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/default-jvm/jre/lib/security/cacerts
+
+# install lein
 ADD https://raw.github.com/technomancy/leiningen/stable/bin/lein /usr/local/bin/lein
 RUN chmod 744 /usr/local/bin/lein
 
-# little bit of cleanup so that our build process will work
-ENV PATH /usr/local/bin:$PATH
-ENV LEIN_ROOT 1
-RUN ln -s /usr/bin/nodejs /usr/bin/node
-
 # add the application source to the image
 ADD . /app/source
 
@@ -31,6 +23,10 @@ ADD . /app/source
 WORKDIR /app/source
 RUN bin/build
 
+# remove unnecessary packages & tidy up
+RUN apk del nodejs git wget python make g++
+RUN rm -rf /root/.lein /root/.m2 /root/.node-gyp /root/.npm /tmp/* /var/cache/apk/* /app/source/node_modules
+
 # expose our default runtime port
 EXPOSE 3000
 

README.md

+[![Latest Release](https://img.shields.io/github/release/metabase/metabase.svg?label=latest%20release)](https://github.com/metabase/metabase/releases)
+[![GitHub license](https://img.shields.io/badge/license-AGPL-05B8CC.svg)](https://raw.githubusercontent.com/metabase/metabase/master/LICENSE.txt)
 [![Circle CI](https://circleci.com/gh/metabase/metabase.svg?style=svg&circle-token=3ccf0aa841028af027f2ac9e8df17ce603e90ef9)](https://circleci.com/gh/metabase/metabase)
-[![Leiningen Dependencies Status](https://jarkeeper.com/metabase/metabase/status.png)](https://jarkeeper.com/metabase/metabase)
+[![Leiningen Dependencies Status](https://jarkeeper.com/metabase/metabase/status.svg)](https://jarkeeper.com/metabase/metabase)
 [![NPM Dependencies Status](https://david-dm.org/metabase/metabase.svg)](https://david-dm.org/metabase/metabase)
 
 # Overview
@@ -8,12 +10,12 @@ Metabase is an easy way to generate charts and dashboards, ask simple ad hoc que
 
 With a bit of tagging and annotation of what the tables and fields in your database mean, it can be used to provide a rich, humanized version analytics server and administration interface.
 
-For more information check out [www.metabase.com](http://www.metabase.com)
+For more information check out [www.metabase.com](http://www.metabase.com).
 
 
 # Security Disclosure
 
-Security is very important to us. If discover any issue regarding security, please disclose the information responsibly by sending an email to security@metabase.com and not by creating a github issue.
+Security is very important to us. If discover any issue regarding security, please disclose the information responsibly by sending an email to security@metabase.com and not by creating a GitHub issue.
 
 # Installation
 
@@ -73,4 +75,4 @@ Unless otherwise noted, all Metabase source files are made available under the t
 
 See [LICENSE.txt](https://github.com/metabase/metabase/blob/master/LICENSE.txt) for details and exceptions.
 
-Unless otherwise noted, all files © 2015 Metabase, Inc.
+Unless otherwise noted, all files © 2016 Metabase, Inc.

bin/docker/Dockerfile

-FROM java:openjdk-7-jre
+FROM java:openjdk-7-jre-alpine
 
-ENV LC_ALL C
-ENV LANG C.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
+# need bash
+RUN apk add --update bash
+
+# fix broken cacerts
+RUN apk add --update java-cacerts && \
+    rm -f /usr/lib/jvm/default-jvm/jre/lib/security/cacerts && \
+    ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/default-jvm/jre/lib/security/cacerts
 
 # add Metabase jar
 COPY ./metabase.jar /app/
@@ -12,6 +15,9 @@ COPY ./metabase.jar /app/
 COPY ./run_metabase.sh /app/
 RUN chmod 755 /app/run_metabase.sh
 
+# tidy up
+RUN rm -rf /tmp/* /var/cache/apk/*
+
 # expose our default runtime port
 EXPOSE 3000
 

bin/version

 #!/usr/bin/env bash
 
-VERSION="v0.16.0-snapshot"
+VERSION="v0.17.0-snapshot"
 
 # dynamically pull more interesting stuff from latest git commit
 HASH=$(git show-ref --head --hash=7 head)            # first 7 letters of hash should be enough; that's what GitHub uses

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

@@ -16,7 +16,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.15.1/launch-aws-eb.html)
+[Launch Metabase on Elastic Beanstalk](http://downloads.metabase.com/v0.16.0/launch-aws-eb.html)
 
 The rest of this guide will follow each phase of the Elastic Beanstalk setup step-by-step.
 
@@ -53,7 +53,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:
 
-https://s3.amazonaws.com/downloads.metabase.com/v0.15.1/metabase-aws-eb.zip
+https://s3.amazonaws.com/downloads.metabase.com/v0.16.0/metabase-aws-eb.zip
 
 Leave all the settings under Deployment Limits on their defaults.  These settings won't impact Metabase.
 
@@ -186,7 +186,7 @@ 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
-  * https://s3.amazonaws.com/downloads.metabase.com/v0.15.1/metabase-aws-eb.zip
+  * https://s3.amazonaws.com/downloads.metabase.com/v0.16.0/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.13.0)

docs/users-guide/05-sharing-answers.md

@@ -24,27 +24,55 @@ You can make as many dashboards as you want. Go nuts.
 ### How to Create a Dashboard
 Once you have a question saved, you can create a dashboard. Click the **Dashboards** dropdown at the top of the screen, then **Create a new dashboard**. Give your new dashboard a name and a description, then click **Create**, and you’ll be taken to your shiny new dashboard. You can always get to your dashboards from the dropdown at the very top of the screen.
 
+![Create Dashboard](images/dashboards/DashboardCreate.png)
+
 ### Adding saved questions to a dashboard
 You can add a newly saved question to a dashboard directly from the window that pops up after you save the question, or by clicking the Add to Dashboard icon in the top-right of a question page. You can also go to one of your dashboards and click the plus icon in the top right to add any of your saved questions to the dashboard.
 
 Once you add a question to your dashboard, it’ll look something like this:
 
-![First Dashboard](images/FirstDashboard.png)
+![First Dashboard](images/dashboards/FirstDashboard.png)
 
 ### Arranging cards
 Each question on a dashboard is in its own card that you can move around or resize as you see fit; just click the edit icon that looks like a pencil in the top-right of the dashboard screen.  
 
-The lines around the card will change from solid to dotted, showing you that you’re in edit mode.  
+Once you're in edit mode you'll see a grid appear. You can move and resize the cards in the dashboard to your liking and they'll snap to the grid.
+
+![Editing dashboard](images/dashboards/DashboardEdit.png)
 
-![editmode](images/Editmode.png)
+- To move cards just click and drag.
+- To resize a card just click and drag the handle at the bottom right corner of the card.
+- To remove a card, click the X icon in the top right corner.
+
+Questions in your dashboard will automatically update their display based on the size you choose to make sure your data looks great at any size.
 
-* To resize a card, hover your pointer over the lower right corner of it and click and drag.
-* To reorder your cards, click on the card and drag it to where you want it to be. The other cards will rearrange themselves as you move the card around.  
-* To remove a card, click the trashcan icon on it.
 
 ## Deleting a dashboard
 Deleting a dashboard does not delete the individual saved questions on it — it just deletes the dashboard. Remember — dashboards are shared by everyone on your team, so think twice before you delete something that someone else might be using!
 
 To delete a dashboard, click the pencil-looking **Edit** icon in the top right of the dashboard, then click **Delete**.
 
+## Fullscreen dashboards
+
+After you've made your ideal dashboard you may want to put it on a TV or present it in some other visible space to help keep your team up-to-date throughout the day.
+
+To enter fullscreen mode just click the fullscreen icon in the top right of the dashboard.
+
+Once you've entered fullscreen mode you can also switch the dashboard into "Night mode" for higher contrast.
+
+![Night mode](images/dashboards/DashboardNightMode.png)
+
+## Auto refresh
+If your data is more realtime in nature you can set your dashboard up to auto refresh.
+
+![Autorefresh](images/dashboards/DashboardAutorefresh.png)
+
+You can set your dashboard to update in 1, 5, 10, 15, 30, and 60 minute intervals depending on how fresh you need the data to be.
+
+Enabling auto refresh will re-run all the queries on the dashboard at the interval you choose, so keep the size of the dashboard and the complexity of the questions in mind when setting up auto refresh.
+
+Combining fullscreen mode and auto refresh is a great way to keep your team in sync with your data throughout the day.
+
+---
+
 Next, we'll offer up some suggestions on how to create useful dashboards, in our [Tips on Dashboards](06-dashboard-tips.md).

docs/users-guide/10-metabot.md

+# Getting answers in Slack with Metabot
+
+You can already send data to Slack on  a set schedule via [Pulses](http://www.metabase.com/docs/latest/users-guide/07-pulses) but what about when you need an answer right now? Say hello to Metabot.
+
+Metabot helps add context to conversations you’re having in Slack by letting you insert results from Metabase.
+
+## Connecting to Slack.
+To use Metabot with Slack you’ll first need to connect Metabase to your Slack with an API token.
+
+See [Setting up Slack](http://www.metabase.com/docs/v0.15.1/administration-guide/07-setting-up-slack) for more information.
+
+
+## What can Metabot do?
+
+Metabot can show individual questions and also lists of questions that have already been asked in Metabase.
+
+If you ever need help remembering what Metabot can do, just type ```metabot help``` in Slack.
+
+![Metabot help](images/metabot/MetabotHelp.png)
+
+## Showing questions
+
+To see a question from Metabase in Slack type
+```metabot show "<question-name>"``` where question name is the title of one of saved questions. If you have several similarly named questions Metabot will ask you to differentiate between the two by typing the number next to the name.
+
+![Metabot similar](images/metabot/MetabotSimilarItems.png)
+
+That number is the ID number of the question in Metabase and if you find yourself using the same question over and over again you can save a bit of time by typing “metabot show 19.”
+
+![Metabot show](images/metabot/MetabotShow.png)
+
+## Listing questions
+If you don’t have a sense of which questions you want to view in  Slack, you can type ```metabot list``` to get a list of recent questions from your Metabase.
+
+![Metabot show](images/metabot/MetabotList.png)
+
+
+## To review
+
+- [Connect to Slack](http://www.metabase.com/docs/latest/users-guide/07-pulses) to start using Metabot.
+- Show data from Metabase in Slack using ```metabot show <question-id>```
+- Search for questions by typing ```metabot show <search-term>```
+- Get a list of questions by typing ```metabot list```
+- ```metabot help``` lets you see everything Metabot can do if you forget or need more information

docs/users-guide/start.md

@@ -20,4 +20,6 @@
 
 > [Visualizing multiple series](09-data-model-reference.md)
 
+> [Get answers in Slack with Metabot](10-metabot.md)
+
 Let's get started with an overview of [What Metabase does](01-what-is-metabase.md).