Merge pull request #159 from KalikoCMS/1.2.5-dev

Release 1.2.5
KalikoCMS · May 29, 2019 · 11c03ee · 11c03ee
2 parents dbf4019 + 9318da2
commit 11c03ee
Show file tree

Hide file tree

Showing 21 changed files with 5,374 additions and 1,630 deletions.
diff --git a/KalikoCMS.Admin/Admin/Assets/js/kalikocms.admin.core.js b/KalikoCMS.Admin/Admin/Assets/js/kalikocms.admin.core.js
diff --git a/KalikoCMS.Admin/Admin/Assets/js/kalikocms.admin.core.min.js b/KalikoCMS.Admin/Admin/Assets/js/kalikocms.admin.core.min.js
diff --git a/KalikoCMS.Admin/Admin/Assets/js/kalikocms.admin.js b/KalikoCMS.Admin/Admin/Assets/js/kalikocms.admin.js
@@ -44,6 +44,7 @@ function initHtmlEditor(assetsPath) {
         },
         paste_data_images: true,
         extended_valid_elements: "i[class],span,span[class]",
+        convert_urls: false,
         relative_urls: false,
         toolbar: "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | code",
         file_picker_callback: function (callback, value, meta) {