- 30 Jul, 2014 1 commit
-
-
Jason Bau committed
-
- 29 Jul, 2014 8 commits
-
-
Joe Blaylock committed
-
Bulksettings -> Problem Settings name change
sjang92 committed -
Fork password-reset page to have stanford stuff
Joe Blaylock committed -
change naming of the bulk settings page to problem settings
Se Won Jang committed -
Cherry-picked into rc by Joe Blaylock <jrbl@stanford.edu>. Conflicts: cms/djangoapps/contentstore/views/component.py
David Adams committed -
Cherry-pick by Joe Blaylock <jrbl@stanford.edu> into our rc with fixups to test file; I don't know how all the indentation got broken. Conflicts: common/djangoapps/student/tests/test_password_policy.py
Jason Bau committed -
Thanks to David and Giulio for their assistance.
Joe Blaylock committed -
Jason Bau committed
-
- 25 Jul, 2014 2 commits
-
-
Conflicts: AUTHORS cms/djangoapps/contentstore/views/component.py cms/djangoapps/contentstore/views/tests/test_checklists.py cms/urls.py lms/djangoapps/courseware/access.py lms/djangoapps/courseware/views.py lms/templates/courseware/course_about.html lms/templates/main_django.html Joe Blaylock <jrbl@jrbl.org> intentionally left all conflicts in place, so that we can work through resolving them systematically.
Joe Blaylock committed -
Name full-screen-image setup function and call it
Giulio Gratta committed
-
- 24 Jul, 2014 5 commits
-
-
Specify MIME type when adding SCRIPT tag
Giulio Gratta committed -
This change is needed to prevent Studio from stripping this SCRIPT tag from the input.
stv committed -
This change sets up "Full Screen Image" JS everytime courseware tabs are clicked, as they are js/templates and not available in the DOM on page load.
Giulio Gratta committed -
Modify LOCALE_PATH & add LANGUAGE_DICT override
Giulio Gratta committed -
Kevin Luo committed
-
- 23 Jul, 2014 4 commits
-
-
shorten line lengths
Kevin Luo committed -
Giulio Gratta committed
-
Fix password reset done template
Giulio Gratta committed -
Kevin Luo committed
-
- 22 Jul, 2014 6 commits
-
-
Include theme locale path for translations
Giulio Gratta committed -
Kevin Luo committed
-
fix wording for 'Check' and 'Submit' mismatch
Giulio Gratta committed -
Hard code edx_sga to ADVANCED_COMPONENT_TYPES
Giulio Gratta committed -
Giulio Gratta committed
-
add entry to github.txt. Quick fix while waiting for the upstream PR to come through.David Adams committed
-
- 21 Jul, 2014 14 commits
-
-
Added item for Studio URL changes to Release Notes
Mark Hoeber committed -
Mark Hoeber committed
-
Remove course ID from title in course about page
Ned Batchelder committed -
John Jarvis committed
-
Updating the ORA2 hash for July 21st, 2014
Stephen Sanchez committed -
Add course author notes for 7/16 release
srpearce committed -
Studio: New Course Field Tip Copy Correction
Brian Talbot committed -
Sylvia Pearce committed
-
Conflicts: common/lib/xmodule/xmodule/modulestore/mixed.py common/lib/xmodule/xmodule/modulestore/mongo/base.py
Nimisha Asthagiri committed -
Stephen Sanchez committed
-
Don't update ancestors while bulk editing.
Nimisha Asthagiri committed -
ignore MAC meta files on import and also remove any such files from the ...
zubair-arbi committed -
STUD-1725
zubair-arbi committed -
Conflicts: common/lib/xmodule/xmodule/modulestore/mongo/base.py Conflicts: common/lib/xmodule/xmodule/modulestore/mongo/base.py
Nimisha Asthagiri committed
-
