- 22 Aug, 2014 1 commit
-
-
* Manually update ORA2 version to the TrackChanges SHA1 ** Note this should be reverted when the TrackChanges PR merges upstream * Includes submissions dependency bump to 0.0.7
Joe Blaylock committed
-
- 21 Aug, 2014 1 commit
-
-
This is required following our update to a new version of ORA2.
stv committed
-
- 15 Aug, 2014 1 commit
-
-
Giulio Gratta committed
-
- 14 Aug, 2014 2 commits
-
-
* release: pick up new ora2 (7/21 -> 8/08)
Sef Kloninger committed -
* rc: pick up new ora2 (7/21 -> 8/08) make unit tests respect mongo port/host settings (with default) Fix json_update_videos() commit (1f5c95ba) to transcript_utils.py changed the sig of download_youtube_subs from def download_youtube_subs(youtube_subs, item, settings): to def download_youtube_subs(youtube_id, video_descriptor, settings):
Sef Kloninger committed
-
- 13 Aug, 2014 2 commits
-
-
Sef Kloninger committed
-
Fix json_update_videos()
David Adams committed
-
- 08 Aug, 2014 3 commits
-
-
make unit tests respect mongo port/host settings (with default)
Jason Bau committed -
settings are read in from environment variable
Jason Bau committed -
commit (1f5c95ba) to transcript_utils.py changed the sig of download_youtube_subs from def download_youtube_subs(youtube_subs, item, settings): to def download_youtube_subs(youtube_id, video_descriptor, settings): hence taking a video id instead of a dict. This broke the download captions feature from the utilities page.
David Adams committed
-
- 07 Aug, 2014 5 commits
-
-
from Stanford-Online/release into Stanford-Online/master
stv committed -
* origin/rc: Fix Enroll-email subject containing newline Fix Enrollment Email UI/UX send beta testers to dashboard Remove commented code Cleaning up messes from hurried upstream merge move stanford logo where tests can find it Code additions to enable Ooyala player XBlock.
stv committed -
from Stanford-Online/sjang92/email_subject_bugfix into Stanford-Online/rc
stv committed -
Se Won Jang committed
-
from Stanford-Online/master into Stanford-Online/rc
stv committed
-
- 05 Aug, 2014 2 commits
-
-
Fix Enrollment Email UI/UX
sjang92 committed -
Fixed enrollment email UI in Studio. The list of changes is as follows: - Test Email functionality: can now send yourself a test email from studio - Set default template button: can now click a button to replace email with the default template - UI changes: html ordering and structuring Got rid of enable_default_email button. Pushed this feature to the default template button Things to note: - default template is stanford-specific. - minor test changes (since enable_default_email field is gone now)Se Won Jang committed
-
- 01 Aug, 2014 2 commits
-
-
send beta testers to dashboard
Giulio Gratta committed -
Giulio Gratta committed
-
- 31 Jul, 2014 9 commits
-
-
from 'stv/bugfix_bad_merge_conflict_resolutions' into 'master'
stv committed -
These lines are remnants from debugging during conflict resolution, following the merge from upstream.
stv committed -
* Restore the temporary use of edx_sga to our CMS advanced components list * Uncomment lines commented out (and then forgotten) during unit test debugging
Joe Blaylock committed -
Conflicts: cms/djangoapps/contentstore/views/component.py
Joe Blaylock committed -
Fixed duplication of username and full name fields in lms registration
Joe Blaylock committed -
njdup committed
-
Jbau/rc/fix anon access tests for real
Joe Blaylock committed -
Jason Bau committed
-
- 30 Jul, 2014 10 commits
-
-
lms/djangoapps/courseware/access.py has a complicated return value on line 336 introduced by Jason in January - presumably as part of getting anonymous user access working. The unit tests in lms/djangoapps/courseware/tests/test_access.py have changed and this line now makes the tests (which pass upstream) fail. Until I understand how to fix it properly, changing this line to always return True makes the tests pass (though I don't yet understand if it breaks anonymous user access.)
Joe Blaylock committed -
Joe Blaylock committed
-
Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field. To fix the issue, I did the following: - Moved the existing username and real name form fields above the password field. - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field. New tests created to check the added functionality. Conflicts: common/djangoapps/student/tests/test_password_policy.py lms/templates/register.html
njdup committed -
Joe Blaylock committed
-
Joe Blaylock committed
-
Joe Blaylock committed
-
Jason Bau committed
-
move stanford logo where tests can find it
Joe Blaylock committed -
Code additions to enable Ooyala player XBlock.
David Adams committed -
Jason Bau committed
-
- 29 Jul, 2014 2 commits
-
-
Joe Blaylock committed
-
Bulksettings -> Problem Settings name change
sjang92 committed
-