Merge branch 'master' into feature/tomg/fall-design

lms/djangoapps/courseware/module_render.py

@@ -374,7 +374,7 @@ def modx_dispatch(request, dispatch, location, course_id):
     # ''' (fix emacs broken parsing)
 
     # Check for submitted files and basic file size checks
-    p = request.POST.dict()
+    p = request.POST.copy()
     if request.FILES:
         for fileinput_id in request.FILES.keys():
             inputfiles = request.FILES.getlist(fileinput_id)

lms/envs/common.py

@@ -317,6 +317,7 @@ SIMPLE_WIKI_REQUIRE_LOGIN_VIEW = False
 WIKI_ACCOUNT_HANDLING = False
 WIKI_EDITOR = 'course_wiki.editors.CodeMirror'
 WIKI_SHOW_MAX_CHILDREN = 0 # We don't use the little menu that shows children of an article in the breadcrumb
+WIKI_ANONYMOUS = False # Don't allow anonymous access until the styling is figured out
 
 ################################# Jasmine ###################################
 JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
@@ -582,7 +583,7 @@ INSTALLED_APPS = (
     'course_wiki', # Our customizations
     'mptt',
     'sekizai',
-    'wiki.plugins.attachments',
+    #'wiki.plugins.attachments',
     'wiki.plugins.notifications',
     'course_wiki.plugins.markdownedx',
 

lms/templates/seq_module.html

@@ -23,7 +23,7 @@
   </nav>
 
   % for item in items:
-  <div class="seq_contents tex2jax_ignore">${item['content'] | h}</div>
+  <div class="seq_contents tex2jax_ignore asciimath2jax_ignore">${item['content'] | h}</div>
   % endfor
   <div id="seq_content"></div>
 
@@ -45,4 +45,4 @@
     sequenceNav = new SequenceNav($('.sequence-nav'));
     console.log(sequenceNav);
   });
-</script>
\ No newline at end of file
+</script>

repo-requirements.txt

 -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
 -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
--e git://github.com/benjaoming/django-wiki.git@e237b2ac#egg=django-wiki
+-e git://github.com/benjaoming/django-wiki.git@02275fb4#egg=django-wiki
 -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
 -e common/lib/capa
 -e common/lib/xmodule