1. 15 Jul, 2015 4 commits
  2. 13 Jul, 2015 1 commit
  3. 07 Jul, 2015 2 commits
  4. 23 Jun, 2015 2 commits
  5. 22 Jun, 2015 1 commit
  6. 19 Jun, 2015 13 commits
  7. 18 Jun, 2015 2 commits
  8. 12 Jun, 2015 1 commit
  9. 22 May, 2015 5 commits
  10. 21 May, 2015 2 commits
  11. 20 May, 2015 2 commits
  12. 19 May, 2015 2 commits
  13. 18 May, 2015 1 commit
  14. 13 May, 2015 1 commit
  15. 12 May, 2015 1 commit
    • Merge remote-tracking branch 'remotes/origin/edx-release' into merge-candidate · 85d12cce
      Conflicts:
      	problem_builder/mentoring.py
      	problem_builder/questionnaire.py
      	problem_builder/tests/integration/test_dashboard.py
      	problem_builder/tests/integration/xml/assessment_2.xml
      	problem_builder/tests/integration/xml/mcq_with_html_choices.xml
      	problem_builder/tests/integration/xml/mrq_with_comments_1.xml
      	problem_builder/tests/integration/xml/mrq_with_html_choices.xml
      	problem_builder/tests/integration/xml_templates/assessment.xml
      	problem_builder/v1/tests/xml/v1_upgrade_a_new.xml
      	problem_builder/v1/tests/xml/v1_upgrade_b_new.xml
      	run_tests.py
      	test_requirements.txt
      E. Kolpakov committed