Valera Rozuvan
8ba9497fd9
Merge pull request #675 from edx/anton/disable_0-25x_speed
...
Add filter for playback rates.
2013-08-14 19:46:58 -07:00
ichuang
501c089f41
capa optioninput template was missing msg output (needed for hints)
2013-08-14 21:51:40 -04:00
Julian Arni
3ed4198204
Contentstore views pylint fixes
2013-08-14 19:10:00 -04:00
Adam Palay
c5d52b8b74
turn off i18n
2013-08-14 17:14:05 -04:00
Adam
bcb4ae0751
Merge pull request #683 from edx/adam/turn-off-i18n
...
turn off i18n
2013-08-14 14:10:26 -07:00
Adam Palay
4855fd5af4
turn off i18n
2013-08-14 17:03:21 -04:00
Sarina Canelake
6a1e88cf77
Merge pull request #681 from edx/sarina/hotfix/fix-combinedopenended
...
Fix error seen in combinedopenended modules
2013-08-14 13:53:52 -07:00
Sarina Canelake
f438922a88
Fix error seen in combinedopenended modules
2013-08-14 16:36:33 -04:00
Jay Zoldak
c65c9eb069
Merge pull request #657 from edx/zoldak/fix-i18n-enroll
...
The enrollment_action value enroll should not be translated.
2013-08-14 13:18:00 -07:00
Diana Huang
cc86fb3f23
Merge pull request #676 from edx/diana/course-modes
...
Add Course Modes to LMS
2013-08-14 12:33:55 -07:00
Diana Huang
7d44379c99
Add admin site for CourseMode
2013-08-14 15:13:11 -04:00
John Jarvis
4c469cc414
Merge pull request #666 from edx/jarv/add-get-grades
...
adding django-admin commands to dump grades to a csv file
2013-08-14 11:42:51 -07:00
John Jarvis
7dc7406d3c
updating help for --course
2013-08-14 14:42:24 -04:00
Diana Huang
22b1ef3472
Initial migrations for course modes
2013-08-14 14:40:17 -04:00
Diana Huang
6c6ba54e84
Create Course Modes django app
2013-08-14 14:40:17 -04:00
marco
c9807db308
styling of peer review interface for students along with minimal adjustments to the staff grading interface as well. added internationalization of peer grading strings.
2013-08-14 14:12:04 -04:00
David Ormsbee
57a8063517
Merge pull request #651 from edx/ormsbee/enrollment_modes
...
Add mode and is_active to CourseEnrollment, shift enrollment logic to model
2013-08-14 10:45:27 -07:00
David Ormsbee
3ce87583ab
Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.
...
Features coming down the pipe will want to be able to:
* Refer to enrollments before they are actually activated (approval step).
* See what courses a user used to be enrolled in for when they re-enroll in
the same course, or a different run of that course.
* Have different "modes" of enrolling in a course, representing things like
honor certificate enrollment, auditing (no certs), etc.
This change adds an is_active flag and mode (with default being "honor").
The commit is only as large as it is because many parts of the codebase were
manipulating enrollments by adding and removing CourseEnrollment objects
directly. It was necessary to create classmethods on CourseEnrollment to
encapsulate this functionality and then port everything over to using them.
The migration to add columns has been tested on a prod replica, and seems to be
fine for running on a live system with single digit millions of rows of
enrollments.
2013-08-14 13:23:06 -04:00
Jay Zoldak
6416a21aa5
Merge branch 'release'
2013-08-14 12:11:52 -04:00
Jay Zoldak
7b6dcbba05
Merge pull request #673 from edx/hotfix/adam/help-modal
...
Hotfix/adam/help modal
2013-08-14 09:08:29 -07:00
Anton Stupak
b4df2c4d73
Add filter for playback rates.
2013-08-14 18:15:18 +03:00
Adam Palay
72fdc414ca
change FEEDBACK_SUBMISSION_EMAIL to @example.com in dev settings
2013-08-14 10:57:03 -04:00
Adam Palay
5fd09ca1ee
add dummy FEEDBACK_SUBMISSION_EMAIL for debugging
2013-08-14 10:09:01 -04:00
Adam Palay
970f5f60d3
fix syntax error in help_modal
2013-08-14 10:08:54 -04:00
Adam Palay
6594401d2f
if mktg, redirects faq to mktg. else, to '/help'
2013-08-14 10:05:26 -04:00
cahrens
13ef870b1b
pylint/pep8 cleanup.
...
cleanup.
2013-08-14 09:59:44 -04:00
cahrens
aed29cb01f
Add get_instance method.
2013-08-14 09:50:00 -04:00
cahrens
70d5ec6ea4
Make it clear that get_course_for_item is only a helper method in mongo modulestore.
2013-08-14 09:04:58 -04:00
Valera Rozuvan
642a4fa2f3
Merge pull request #659 from edx/valera/bugfix_tabbing_video_controls
...
Valera/bugfix tabbing video controls
2013-08-14 02:01:31 -07:00
Valera Rozuvan
b583a4e793
Optimizing code. Caching an element selector.
2013-08-14 11:56:13 +03:00
Valera Rozuvan
99ae63777e
Removed unnecessary tabindex = 0 from <a /> - they get it by default.
2013-08-14 11:51:15 +03:00
Valera Rozuvan
3b326c3072
Fixing spelling typos in comments.
2013-08-14 11:49:27 +03:00
Valera Rozuvan
efac70e6b3
Adding documentation to the event handlers for volume and speed control.
2013-08-14 10:51:45 +03:00
Valera Rozuvan
da3e21ceee
Fixed tabbing backwards.
...
Now you can tab through all of the controls in Video forwards, and then tab backwards.
2013-08-14 10:51:45 +03:00
Valera Rozuvan
0a5d261fc4
For YouTube videos tabbing from Speeds to Volume closes Speeds dialog.
...
An old TODO item was done. It turns out a simple case of calling
the method to bind handlers after the Spees dialog was re-rendered.
2013-08-14 10:51:45 +03:00
Valera Rozuvan
05539b1bbe
Removed unnecessary tabindex -1 from Video template.
2013-08-14 10:51:45 +03:00
marco
3a970d1490
restyled controls area for motion through multiple scored peer reviews
2013-08-13 20:56:53 -04:00
Carlos Andrés Rocha
a2225aad01
Merge pull request #655 from rocha/cleanup-xmodule-test-imports
...
Cleanup some xmodule tests imports and data directory location
2013-08-13 14:48:26 -07:00
Jay Zoldak
bc1ba63bc9
Merge pull request #669 from edx/zoldak/release-changelog
...
added video changes to the changelog
2013-08-13 14:13:07 -07:00
Jay Zoldak
3d83e836bd
Merge branch 'release'
2013-08-13 17:10:12 -04:00
Joe Blaylock
9fb329609d
Merge pull request #663 from edx/nate/anonymized_id_mapping
...
Add mgmt cmd to generate anonymized ID mapping
2013-08-13 13:56:14 -07:00
Adam
575345ecb2
Merge pull request #668 from edx/fix/adam/lms-help-button
...
Fix/adam/lms help button
2013-08-13 13:54:22 -07:00
Adam Palay
172d415929
add dummy FEEDBACK_SUBMISSION_EMAIL for debugging
2013-08-13 16:13:42 -04:00
Adam Palay
307d27db9a
fix syntax error in help_modal
2013-08-13 16:13:42 -04:00
Adam Palay
4fc8aaab02
if mktg, redirects faq to mktg. else, to '/help'
2013-08-13 16:13:42 -04:00
Lyla Fischer
f8ef72cd5b
added video changes to the changelog
2013-08-13 15:38:11 -04:00
Miles Steele
5410e43694
Merge pull request #660 from edx/feature/msteele/enable-dev
...
Enable instructor dashboard in lms/envs/dev
2013-08-13 12:23:34 -07:00
cahrens
e0aa46ab2d
Make split mongo read-only API consistent with other modulestores.
2013-08-13 15:06:08 -04:00
marco
ab81000665
visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins.
2013-08-13 14:42:34 -04:00
Joe Blaylock
d6530fa633
Anonymized ID mapping fixups
...
Fixups to Nate's anonymized id mapper, repairing pep8 and pylint errors,
and rebasing on recent master.
2013-08-13 11:39:50 -07:00
