Merge branch 'master' of github.com:metabase/metabase into fix-pulse-save

README.md

@@ -77,6 +77,11 @@ Once you have added this connection, you will be taken into the app and you'll b
 
 For a more detailed walkthrough, check out our [Getting Started](docs/getting-started.md) guide.
 
+# Frequently Asked Questions
+
+Some questions come up over and over again. Check here first:
+[FAQ](docs/faq.md)
+
 # 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.

docs/faq.md

+# Frequently Asked Questions
+
+### I can't log into Metabase. Can you reset my password?
+
+If you are running the Mac OS X application on your laptop, you can click on the Help menu item and click `Reset Password`.
+
+If you are using a browser to access Metabase, then someone downloaded our software and installed it on a server. We at Metabase don't host your instance. We write software that someone at your company decided to run.  You should ask whoever it is that set up your company's Metabase (a good starting point for this would be to ask whoever). 
+
+### How should I use the Mac OS X application?
+
+Our Mac OS X application is best thought of as Metabase in single-player mode. It's meant to be a way to quickly try out the program and see if it's something you'd want to use across your team. It's also useful for use on your own.
+
+When you need to share dashboards or pulses with others, we *strongly* recommend you run our server application. 
+
+### Does Metabase support SQL Joins?
+
+Metabase does not expose a "Join" operator, but we do provide ways for non-SQL-proficient users to perform the tasks that joins are used for such as filtering or grouping by columns in other tables, etc.
+
+For more info see our [blog post on the subject](http://www.metabase.com/blog/Joins)
+
+### Can I use SQL with Metabase?
+
+[Yes](http://www.metabase.com/docs/latest/users-guide/03-asking-questions.html#using-sql). 
+
+
+### Do I need to know SQL to use Metabase?
+[No](http://www.metabase.com/docs/latest/users-guide/03-asking-questions.html)
+
+
+### Why can't I do X in the Query Builder?
+
+The primary audience of the GUI querying interface is a non-technical user who doesn't SQL. Advanced users can always [use SQL](http://www.metabase.com/docs/latest/users-guide/03-asking-questions.html#using-sql).
+
+We're constantly trying to walk the line between putting more functionality into the GUI interface and creating a confusing mess. You can expect it to improve and change with time, but in the meantime, you can always lean on SQL directly for the complicated matters.
+
+### Does Metabase support database X?
+
+Metabase currently supports:
+* Amazon Redshift
+* BigQuery
+* Crate (version 0.55 or higher)
+* Druid
+* H2
+* MongoDB (version 3.0 or higher)
+* MySQL (and MariaSQL)
+* PostgreSQL
+* SQL Server
+* SQLite 
+
+### Can Metabase support database X?
+
+Metabase is built by a small core team, and we have very limited engineering bandwidth. Each additional database we connect to slows down overall product development, increases the time and cost of our automated testing and requires us to learn a lot about the edge cases of the specific database driver. While writing a given driver might only take a few days, supporting it places a cost on us indefinitely.
+
+That said, we will build out additional database connectors as we are able to. We generally select additional drivers based on demand from the community and our ability to set up a test database server easily in our integrated testing environment. 
+
+We welcome community contributions of database connectors. If you're able to help, we have [open issues](https://github.com/metabase/metabase/labels/Database%20Support) for a number of databases. We'd greatly appreciate your help!
+
+### Can you help me debug something?
+
+Yes, to the extent that we are able to and have time. 
+
+In the event of a clear bug, please [open an issue](https://github.com/metabase/metabase/issues/new).
+
+If you're having other trouble, please start a conversation at our [discussion forum](http://discourse.metabase.com) and check out the other threads. Someone else might have experienced the same problem. 
+
+### Do you offer paid support?
+
+We are experimenting with offering paid support to a limited number of companies. [Contact us](http://www.metabase.com/services/) if you want more information. 
+
+### Can I embed charts or dashboards in another application?
+
+Not yet. We're working on it however, and you should expect it in the near future. (Late summer/early fall 2016). Keep tabs on it at the main [tracking issue](https://github.com/metabase/metabase/issues/1380)
\ No newline at end of file

frontend/src/metabase/query_builder/containers/QueryBuilder.jsx

@@ -67,6 +67,7 @@ const mapStateToProps = (state, props) => {
         updateUrl:                 props.updateUrl,
         user:                      state.currentUser,
         fromUrl:                   state.router && state.router.location && state.router.location.query.from,
+        location:                  state.router && state.router.location,
 
         card:                      card(state),
         originalCard:              originalCard(state),
@@ -128,6 +129,10 @@ export default class QueryBuilder extends Component {
             // ensure that some components are updated after the animation completes (e.g. card visualization)
             window.setTimeout(this.forceUpdateDebounced, 300);
         }
+        // HACK: if we switch to the tutorial from within the QB we need to manually re-initialize
+        if (!this.props.location.query.tutorial && nextProps.location.query.tutorial) {
+            this.props.initializeQB(nextProps.updateUrl);
+        }
     }
 
     componentWillUnmount() {

src/metabase/email.clj

@@ -43,7 +43,8 @@
   [& {:keys [subject recipients message-type message]}]
   {:pre [(string? subject)
          (sequential? recipients)
-         (every? u/is-email? recipients)
+         (or (every? u/is-email? recipients)
+             (log/error "recipients contains an invalid email:" recipients))
          (contains? #{:text :html :attachments} message-type)
          (if (= message-type :attachments) (sequential? message) (string? message))]}
   (try

test/metabase/api/session_test.clj

@@ -241,6 +241,7 @@
 
 ;; test that a user that doesn't exist with the *same* domain as the auto-create accounts domain means a new user gets created
 (expect
-  (with-temporary-setting-values [google-auth-auto-create-accounts-domain "sf-toucannery.com"]
+  (with-temporary-setting-values [google-auth-auto-create-accounts-domain "sf-toucannery.com"
+                                  admin-email                             "rasta@toucans.com"]
     (u/prog1 (is-session? (google-auth-fetch-or-create-user! "Rasta" "Toucan" "rasta@sf-toucannery.com"))
       (db/cascade-delete! User :email "rasta@sf-toucannery.com"))))                                       ; clean up after ourselves