Merge branch 'master' into fix_docs_deeplinks

bin/version

 #!/usr/bin/env bash
 
-VERSION="v0.28.0-snapshot"
+VERSION="v0.29.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/administration-guide/08-configuration-settings.md

@@ -9,13 +9,18 @@ How you’d like to refer to this instance of Metabase.
 The base URL of this Metabase instance. The base URL is used in emails to allow users to click through to their specific instance. Make sure to include http:// or https:// to make sure it’s reachable.
 
 ### Report Timezone
-The **report timezone** sets the default time zone for displaying times. The timezone is used when breaking out data by dates.  
+The **report timezone** sets the default time zone for displaying times. The timezone is used when breaking out data by dates.
 
-*Setting the default timezone will not change the timezone of any data in your database*. If the underlying times in your database aren't assigned to a timezone, Metabase will use the report timezone as the default timezone.  
+*Setting the default timezone will not change the timezone of any data in your database*. If the underlying times in your database aren't assigned to a timezone, Metabase will use the report timezone as the default timezone.
 
 ### Anonymous Tracking
 This option turns determines whether or not you allow anonymous data about your usage of Metabase to be sent back to us to help us improve the product. *Your database’s data is never tracked or sent*.
 
+### Friendly Table and Field Names
+By default, Metabase attempts to make field and table names more readable by changing things like `somehorriblename` to `Some Horrible Name`. This does not work well for languages other than English, or for fields that have lots of abbreviations or codes in them. If you'd like to turn this setting off, you can do so from the Admin Panel under Settings > General > Friendly Table and Field Names.
+
+To manually fix field or table names if they still look wrong, you can go to the Metadata section of the Admin Panel, select the database that contains the table or field you want to edit, select the table, and then edit the name(s) in the input boxes that appear.
+
 ---
 
 ## Next: Setting up Slack

docs/faq.md

@@ -48,7 +48,7 @@ However, in [Metabase version 0.25 we introduced nested queries](http://www.meta
 
 By default, Metabase attempts to make field names more readable by changing things like `somehorriblename` to `Some Horrible Name`. This does not work well for languages other than English, or for fields that have lots of abbreviations or codes in them. If you'd like to turn this setting off, you can do so from the Admin Panel under Settings > General > Friendly Table and Field Names.
 
-Note that even with this setting turned off, Metabase will replace underscores with spaces. To manually fix field or table names if they still look wrong, you can go to the Metadata section of the Admin Panel, select the database that contains the table or field you want to edit, select the table, and then edit the name(s) in the input boxes that appear.
+To manually fix field or table names if they still look wrong, you can go to the Metadata section of the Admin Panel, select the database that contains the table or field you want to edit, select the table, and then edit the name(s) in the input boxes that appear.
 
 ## Dashboards
 

docs/users-guide/07-dashboards.md

@@ -21,8 +21,28 @@ Once you add a question to your dashboard, it’ll look something like this:
 
 ![First Dashboard](images/dashboards/FirstDashboard.png)
 
+### Adding headings or descriptions with text cards
+Another neat thing you can do is add text cards to your dashboards so that you can write descriptions, explanations, notes, or even add images. Text cards can also be used to create separations between sections of charts in your dashboards.
+
+To add a new text card, create a new dashboard or edit an existing one and click on the text card button in the top-right:
+
+![Text card button](images/dashboards/text-cards/text-card-button.png)
+
+Your new, empty text card will appear. It has two modes: writing and previewing. Toggle between the modes by clicking the eye or pencil icons in the top-left of the card:
+
+![New text card](images/dashboards/text-cards/new-text-card.png)
+
+You can use [Markdown](http://commonmark.org/help/) to format the text in your text card, create inline tables or code snippets, or even embed linked images (easy on the GIFs, friends).
+
+![Markdown](images/dashboards/text-cards/markdown.png)
+
+Click the eyeball icon to see what your formatted Markdown will look like when you save the card:
+
+![Result](images/dashboards/text-cards/result.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.  
+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.
 
 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.
 
@@ -91,7 +111,7 @@ Some tips:
 
 *  Place the most important saved question cards near the top of the dashboard, and/or make them bigger than the other cards. That will help draw people’s attention to what matters most.
 *  If you have more than 10 cards on a dashboard, think about breaking the dashboard into two separate ones. You don't want to overwhelm people with too much information, and each dashboard should revolve around one theme or topic. Remember — you can make as many dashboards as you want, so you don’t have to cram everything into just one.
-* Consider [adding filters to your dashboard](07-dashboards.html#dashboard-filters) to make them more useful and flexible. For example, instead of your dashboard being full of questions that are restricted to a specific time span, you can make more general questions and use dashboard filters to change the time span you're looking at.
+* Consider [adding filters to your dashboard](08-dashboard-filters.md) to make them more useful and flexible. For example, instead of your dashboard being full of questions that are restricted to a specific time span, you can make more general questions and use dashboard filters to change the time span you're looking at.
 
 ---
 

docs/users-guide/08-dashboard-filters.md

@@ -13,7 +13,7 @@ To add a filter to a dashboard, first enter dashboard editing mode, then click t
 ![Add a Filter](images/dashboard-filters/01-add-filter.png)
 
 You can choose from a number of filter types: Time, Location, ID, or Other Categories. The type of filter you choose will determine what the filter widget will look like, and will also determine what fields you’ll be able to filter your cards by:
-* **Time:** when picking a Time filter, you'll also be prompted to pick a specific type of filter widget: Month and Year, Quarter and Year, Single Date, Date Range, or Relative Date. Single Date and Date Range will provide a calendar widget, while the other options all provide slightly different dropdown interfaces for picking values.
+* **Time:** when picking a Time filter, you'll also be prompted to pick a specific type of filter widget: Month and Year, Quarter and Year, Single Date, Date Range, Relative Date, or All Options. "Single Date" and "Date Range" will provide a calendar widget, while the other options all provide slightly different dropdown interfaces for picking values. Choose "All Options" to get a widget that's just like the time filter in the graphical query builder.
 * **Location:** there are four types of Location filters to choose from: City, State, ZIP or Postal Code, and Country. These will all show up as input box widgets unless the field(s) you're filtering contain fewer than 40 distinct possible values, in which case the widget will be a dropdown.
 * **ID:** this filter provides a simple input box where you can type the ID of a user, order, etc.
 * **Other Categories:** this is a flexible filter type that will let you create either a dropdown or input box to filter on any category field in your cards. Whether the filter widget is displayed as a dropdown or an input box is dependent on the field(s) you pick to filter on: if there are fewer than 40 distinct possible values for that field, you'll see a dropdown; otherwise you'll see an input box. (A future version of Metabase will include type-ahead search suggestions for the input box widget.)

docs/users-guide/10-pulses.md

@@ -20,10 +20,24 @@ When you select a saved question, Metabase will show you a preview of how it’l
 
 ![Behold! The metamorphosis.](images/pulses/04-transformation.png)
 
+#### Attaching a .csv or .xls with results
+You can also optionally include the results of a saved question in an emailed pulse as a .csv or .xls file attachment. Just click the paperclip icon on an included saved question to add the attachment. Click the paperclip again to remove the attachment.
+
+![Attach button](images/pulses/attach-button.png)
+
+Choose between a .csv or .xls file by clicking on the text buttons:
+
+![Attached](images/pulses/attached.png)
+
+Your attachments will be included in your emailed pulse just like a regular email attachment:
+
+![Email attachment](images/pulses/email.png)
+
+#### Limitations
 Currently, there are a few restrictions on what kinds of saved questions you can put into a pulse:
 
-* Raw data can’t be put in a pulse
-* Tables will be cropped to a maximum of three columns and 10 rows
+* Raw data questions won't be displayed, but will be included as a file attachment
+* Pivot tables will be cropped to a maximum of three columns and 10 rows
 * Bar charts (and pie charts which get turned into bar charts) will be cropped to one column for the labels, one column for the values, and 10 total rows
 
 ### Choose How and When to Deliver Your Data

frontend/src/metabase/admin/people/containers/PeopleListingApp.jsx

@@ -242,7 +242,7 @@ export default class PeopleListingApp extends Component {
                 ]}
                 onClose={this.onCloseModal}
             >
-                <div style={{paddingLeft: "5em", paddingRight: "5em"}} className="pb4">{jt`We’ve sent an invite to ${<span className="text-bold">${user.email}</span>} with instructions to set their password.`}</div>
+                <div style={{paddingLeft: "5em", paddingRight: "5em"}} className="pb4">{jt`We’ve sent an invite to ${<span className="text-bold">{user.email}</span>} with instructions to set their password.`}</div>
             </Modal>
         );
     }