merge from dev

2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
@@ -4,7 +4,7 @@

        Dashboard.showLoadingMsg();

-        ApiClient.getJSON(ApiClient.getUrl("Notifications/Types")).done(function (list) {
+        ApiClient.getJSON(ApiClient.getUrl("Notifications/Types")).then(function (list) {

            var html = '';

@@ -66,7 +66,9 @@

        var page = this;

-        reload(page);
+        require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
+            reload(page);
+        });
    });

 })(jQuery, window);