Merge branch 'master' into vdom

2016-02-22 12:20:59 +11:00
parent d0337e7f5e 5a47199528
commit c404da248a
20 changed files with 3315 additions and 29 deletions
@@ -69,6 +69,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
              sentTo: result.sent_to_email,
              currentEmail: result.current_email
            });
+          } else if (result.reason === 'suspended' ) {
+            self.send("closeModal");
+            bootbox.alert(result.error);
          } else {
            self.flash(result.error, 'error');
          }