Merge branch 'master' into dev

2013-08-19 00:23:13 -05:00 · 2013-08-19 00:23:13 -05:00 · d62931098d
commit d62931098d
parent 0ceb362f0b 05dc2a3119
15 changed files with 212 additions and 156 deletions
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@ -758,7 +758,7 @@ Callbacks = {
        }
        makeAlert("Error", data, "alert-error")
            .addClass("span12")
-            .insertAfter($("#mediaurl").parent());
+            .insertBefore($("#extended_controls"));
    },

    setTemp: function(data) {