Merge branch 'hotfix/1.4.1'

moschlar · Sep 24, 2013 · 8588a6c · 8588a6c
2 parents f7c4211 + a10729f
commit 8588a6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sauce/widgets/widgets.py b/sauce/widgets/widgets.py
@@ -31,6 +31,7 @@ class SmallMixin(object):
 
 class Wysihtml5(LargeMixin, twbw.Wysihtml5):
     rows = 3
+    parser = False
     wysihtml5_args = {
         'html': True,
     }

diff --git a/setup.py b/setup.py
@@ -59,7 +59,7 @@
     "tw2.dynforms",
     "tw2.jquery",
     "tw2.bootstrap.forms >= 2.2.0",
-    "tw2.wysihtml5 >= 0.3",
+    "tw2.wysihtml5 >= 0.3.1",
     "tw2.jqplugins.chosen",
     "tw2.ace",
     "tw2.pygmentize",
@@ -98,7 +98,7 @@
 
 setup(
     name='SAUCE',
-    version='1.4',
+    version='1.4.1',
     description='System for AUtomated Code Evaluation',
     long_description=open(os.path.join(here, 'README.rst')).read(),
     author='Moritz Schlarb',