merge branch ahead

2013-08-26 09:58:49 +02:00
parent d2cfb83817
commit a2a6e899ec
5 changed files with 680 additions and 681 deletions
--- a/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js
+++ b/src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/markdowneditor.controller.js
@@ -24,7 +24,6 @@ function ($scope,assetsService, dialogService) {

            //subscribe to the image dialog clicks
            editor2.hooks.set("insertImageDialog", function (callback) {
-                   alert("Please click okay to start scanning your brain...");
                   
                   dialogService.mediaPicker({callback: function(data){
                        $(data.selection).each(function(i, item){