Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

Conflicts:
	repo-requirements.txt

brew-formulas.txt

@@ -6,3 +6,4 @@ gfortran
 python 
 yuicompressor 
 node
+graphviz

create-dev-env.sh

@@ -105,7 +105,7 @@ NUMPY_VER="1.6.2"
 SCIPY_VER="0.10.1"
 BREW_FILE="$BASE/mitx/brew-formulas.txt"
 LOG="/var/tmp/install-$(date +%Y%m%d-%H%M%S).log"
-APT_PKGS="curl git python-virtualenv build-essential python-dev gfortran liblapack-dev libfreetype6-dev libpng12-dev libxml2-dev libxslt-dev yui-compressor coffeescript"
+APT_PKGS="curl git python-virtualenv build-essential python-dev gfortran liblapack-dev libfreetype6-dev libpng12-dev libxml2-dev libxslt-dev yui-compressor coffeescript graphviz"
 
 if [[ $EUID -eq 0 ]]; then
     error "This script should not be run using sudo or as the root user"

lms/djangoapps/courseware/grades.py

@@ -155,8 +155,18 @@ def progress_summary(student, course, grader, student_module_cache):
     chapters = []
     # Don't include chapters that aren't displayable (e.g. due to error)
     for c in course.get_display_items():
+        # Skip if the chapter is hidden
+        hidden = c.metadata.get('hide_from_toc','false')
+        if hidden.lower() == 'true':
+            continue
+
         sections = []
         for s in c.get_display_items():
+            # Skip if the section is hidden
+            hidden = s.metadata.get('hide_from_toc','false')
+            if hidden.lower() == 'true':
+                continue
+
             # Same for sections
             graded = s.metadata.get('graded', False)
             scores = []

lms/envs/test.py

@@ -84,11 +84,17 @@ DATABASES = {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': ENV_ROOT / "db" / "course1.db",
     },
-    
+
     'edx/full/6.002_Spring_2012': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': ENV_ROOT / "db" / "course2.db",
-    }
+    },
+
+    'edX/toy/TT_2012_Fall': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ENV_ROOT / "db" / "course3.db",
+    },
+
 }
 
 CACHES = {

lms/templates/courseware/courseware.html

@@ -54,8 +54,8 @@
           <div id="course-errors">
             <ul>
           % for (msg, err) in course_errors:
-            <li>${msg}
-              <ul><li><pre>${err}</pre></li></ul>
+            <li>${msg | h}
+              <ul><li><pre>${err | h}</pre></li></ul>
             </li>
           % endfor
             </ul>

requirements.txt

@@ -11,7 +11,6 @@ python-memcached
 python-openid 
 path.py
 django_debug_toolbar
-django-staticfiles>=1.2.1
 fs
 beautifulsoup 
 beautifulsoup4
@@ -43,4 +42,5 @@ django-ses
 django-storages
 django-threaded-multihost
 django-sekizai<0.7
+networkx
 -r repo-requirements.txt