1. 25 Mar, 2014 1 commit
    • Merge tag 'release-2014-03-18' into edx-west/rc · 710896ff
      Release for Mar 18, 2014
      
      Conflicts:
      	common/djangoapps/student/views.py
      	common/lib/capa/capa/tests/test_responsetypes.py
      	common/lib/xmodule/xmodule/capa_base.py
      	lms/djangoapps/branding/__init__.py
      	lms/djangoapps/class_dashboard/dashboard_data.py
      	lms/djangoapps/class_dashboard/test/test_dashboard_data.py
      	lms/djangoapps/class_dashboard/test/test_views.py
      	lms/djangoapps/class_dashboard/views.py
      	lms/djangoapps/instructor/views/instructor_dashboard.py
      	lms/djangoapps/instructor/views/legacy.py
      	lms/envs/common.py
      	lms/envs/dev.py
      	lms/envs/test.py
      	lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee
      	lms/templates/class_dashboard/all_section_metrics.js
      	lms/templates/class_dashboard/d3_stacked_bar_graph.js
      	lms/templates/courseware/course_about.html
      	lms/templates/courseware/instructor_dashboard.html
      	lms/templates/dashboard.html
      	lms/templates/dashboard/_dashboard_certificate_information.html
      	lms/templates/instructor/instructor_dashboard_2/metrics.html
      	lms/templates/main.html
      	lms/urls.py
      Jason Bau committed
  2. 17 Mar, 2014 13 commits
  3. 15 Mar, 2014 2 commits
  4. 14 Mar, 2014 7 commits
  5. 13 Mar, 2014 17 commits