closed #63; update markitup to 1.1.5

djangobb/apps/forum/urls.py

@@ -84,4 +84,4 @@ if (forum_settings.REPUTATION_SUPPORT):
 if (forum_settings.ATTACHMENT_SUPPORT):
     urlpatterns += patterns('',
         url('^attachment/(?P<hash>\w+)/$', forum_views.show_attachment, name='forum_attachment'),
-    )
+    )

djangobb/forms.py

@@ -1,9 +1,9 @@
 import re
 from django import forms
-from registration.forms import RegistrationForm
+from registration.forms import RegistrationFormUniqueEmail
 
 
-class RegistrationFormUtfUsername(RegistrationForm):
+class RegistrationFormUtfUsername(RegistrationFormUniqueEmail):
     '''
     Allowed UTF8 logins with space
     '''

djangobb/static/forum/js/markitup/readme.txt

@@ -1,6 +1,10 @@
-markItUp! 1.1.4
+markItUp! 1.1.5
 
 CHANGE LOG
+markItUp! 1.1.5 2009-05-01
+- Modified: http://drupal.org/project/wysiwyg compatibility
+- Modified: Alt/Ctrl/Alt+Tab are now disabled
+
 markItUp! 1.1.4 2008-12-03
 - Fixed: Extra quote deleted line 95
 

djangobb/static/forum/js/markitup/skins/markitup/style.css

@@ -27,7 +27,7 @@
 	padding:5px 5px 5px 35px;
 	border:3px solid #3C769D;
 	width:643px;
-	height:220px;
+	height:320px;
 	background-image:url(images/bg-editor.png);
 	background-repeat:no-repeat;
 	clear:both; display:block;
@@ -130,19 +130,19 @@
 	background-color:#3C769D;
 }
 /***************************************************************************************/
-.html.markItUpEditor {
+.html .markItUpEditor {
 	background-image:url(images/bg-editor-html.png);
 }
-.markdown.markItUpEditor {
+.markdown .markItUpEditor {
 	background-image:url(images/bg-editor-markdown.png);
 }
-.textile.markItUpEditor {
+.textile .markItUpEditor {
 	background-image:url(images/bg-editor-textile.png);
 }
-.bbcode.markItUpEditor {
+.bbcode .markItUpEditor {
 	background-image:url(images/bg-editor-bbcode.png);
 }
-.wiki.markItUpEditor,
+.wiki .markItUpEditor,
 .dotclear .markItUpEditor {
 	background-image:url(images/bg-editor-wiki.png);
 }