1. 03 Apr, 2014 1 commit
  2. 26 Mar, 2014 4 commits
  3. 25 Mar, 2014 4 commits
    • Merge pull request #3030 from edx/jrbl/fix_ncp101 · f0797813
      certs: /request_cert: add_cert() strips HTML
      Jason Bau committed
    • certs: /request_cert: add_cert() strips HTML · eb24a226
      * HTML in the grade range label was getting passed through to the
        certificate agent via xqueue. This strips HTML before passing labels
        through.
      
        This change is being rolled into my PR to master for the /request_cert
        endpoint feature.
      Joe Blaylock committed
    • Few more change for merge · 5388b654
      Jason Bau committed
    • 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
  4. 17 Mar, 2014 13 commits
  5. 15 Mar, 2014 2 commits
  6. 14 Mar, 2014 7 commits
  7. 13 Mar, 2014 9 commits