Merge branch 'dev'

django-fiber · Feb 18, 2014 · 5fdac57 · 5fdac57
2 parents ca6aa69 + 7652193
commit 5fdac57
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [pypi-image]: https://pypip.in/d/django-fiber/badge.png
 
 [coveralls-url]: https://coveralls.io/r/ridethepony/django-fiber
-[coveralls-image]: https://coveralls.io/repos/ridethepony/django-fiber/badge.png?branch=master
+[coveralls-image]: https://coveralls.io/repos/ridethepony/django-fiber/badge.png?branch=dev
 
 [![Travis build image][travis-build-image]][travis-url]
 [![PyPi download count image][pypi-image]][pypi-url]

diff --git a/fiber/static/fiber/js/ckeditor-4.3.2-full/ckeditor.js b/fiber/static/fiber/js/ckeditor-4.3.2-full/ckeditor.js
diff --git a/fiber/static/fiber/js/fiber.ckeditor.js b/fiber/static/fiber/js/fiber.ckeditor.js
@@ -29,7 +29,7 @@ Fiber.enhance_textarea = function(textarea, auto_height) {
 		language: LANGUAGE_CODE,
 		extraPlugins: 'fpagelink,ffilelink,fimagelink,fcustomlink,funlink,fimage,table,tabletools',
 		removePlugins: 'scayt,language,menubutton,forms,image,link',
-		extraAllowedContent: 'a[*];img[*];iframe[*];object[*];param[*];embed[*]',
+		extraAllowedContent: 'a[*]{*}(*);img[*]{*}(*);iframe[*];object[*];param[*];embed[*]',
 		toolbar: window.CKEDITOR_CONFIG_TOOLBAR,
 		format_tags: window.CKEDITOR_CONFIG_FORMAT_TAGS || 'p;h2;h3;h4',
 		stylesSet: window.CKEDITOR_CONFIG_STYLES_SET || null,