- 28 May, 2014 1 commit
-
-
Joe Blaylock committed
-
- 22 May, 2014 1 commit
-
-
Giulio Gratta committed
-
- 21 May, 2014 1 commit
-
-
Giulio Gratta committed
-
- 20 May, 2014 5 commits
-
-
Jbau/edx west/fix thirdparty tests
Jason Bau committed -
Jason Bau committed
-
Giulio Gratta committed
-
Autoactivate inactive users on external_auth loginJason Bau committed -
Conditional on existing flag BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH
Jason Bau committed
-
- 13 May, 2014 1 commit
-
-
Nick Parlante committed
-
- 12 May, 2014 3 commits
-
-
Conflicts: lms/djangoapps/courseware/tests/test_module_render.py
Jason Bau committed -
- moved zendesk endpoint to new condition - some help modal styling
Giulio Gratta committed -
The bug is with the case of multiple-questions with targeted feedback within a single problem. Refactor the targeted-feedback tests to house the most common xml in external files. Move the capa test load_fixture function to __init__.py so it can be used generally.
Nick Parlante committed
-
- 07 May, 2014 9 commits
-
-
Even though not running in Stanford production, was causing tests to fail. We can resurrect sometime later if/when it's useful.
Sef Kloninger committed -
Pick up last few weeks of edX changes up to (and including) last week's hotfix. Conflicts: common/djangoapps/student/models.py common/djangoapps/student/views.py common/lib/xmodule/xmodule/capa_base.py common/lib/xmodule/xmodule/tabs.py docs/en_us/developers/source/xblocks.rst lms/djangoapps/certificates/views.py lms/djangoapps/courseware/views.py lms/envs/common.py lms/templates/courseware/course_about.html lms/templates/courseware/course_navigation.html lms/templates/instructor/instructor_dashboard_2/metrics.html lms/templates/problem.html lms/templates/register.html requirements/edx/github.txt
Sef Kloninger committed
-
- 01 May, 2014 1 commit
-
-
Adam Palay committed
-
- 30 Apr, 2014 1 commit
-
-
Stanford only: pass course name on queue Merging for our release to stage
Joe Blaylock committed
-
- 29 Apr, 2014 5 commits
-
-
Conflicts: lms/djangoapps/certificates/queue.py
Joe Blaylock committed -
factor out google analytics ids (LMS-2555)
Adam committed -
Fixed advanced editor not working due to cheatsheet undefined.
Waheed Ahmed committed -
STUD-1514
Waheed Ahmed committed -
This reverts commit d2b8b4f0.
zubair-arbi committed
-
- 28 Apr, 2014 11 commits
-
-
Adam Palay committed
-
Conflicts: CHANGELOG.rst
David Baumgold committed -
Fix i18n of video transcript
Sarina Canelake committed -
Fixed transform_url function in WikiAccessMiddleware.
Adam committed -
Sarina Canelake committed
-
In the current implementation if the path prefix contains the wiki_path value it gets deleted. For example if the prefix is '/courses/edx/math101/2014' and wiki_path is '101/' the final prefix becomes '/courses/edx/math2014'. LMS-2556
Usman Khalid committed -
Don't scrape unnecessary strings for i18n
Sarina Canelake committed -
Add info about removing prompt
srpearce committed -
Document our development/review process
David Baumgold committed -
Configure youtube stub for bok-choy
muhammad-ammar committed -
Release for Apr 27, 2014
Stephen Sanchez committed
-
- 27 Apr, 2014 1 commit
-
-
Sarina/042914 language update
Sarina Canelake committed
-