Merge branch '2.1'

2016-02-17 20:08:56 +00:00
parent 73fa0951f7 1ddd868449
commit 726f5e851d
6 changed files with 17 additions and 14 deletions
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -78,6 +78,9 @@ $(function() {

    window.Cachet.Notifier = function () {
        this.notify = function (message, type, options) {
+            if (_.isPlainObject(message)) {
+                message = message.detail;
+            }
            type = (typeof type === 'undefined' || type === 'error') ? 'error' : type;

            var defaultOptions = {