Vik Paruchuri
21e13e44af
Pep8 and pylint fixes
2013-08-22 14:29:39 -04:00
Vik Paruchuri
a6cc30d1fe
Fix tests, address review feedback
2013-08-22 13:51:27 -04:00
marco
d782278d5c
minor cleanup of pull request comments within scss files, along with removal of some whitespace in text fixture file for rubrics
2013-08-20 01:33:06 -04:00
Vik Paruchuri
f17987c13a
Fix flagging, select rubric labels in peer grading
2013-08-16 17:37:53 -04:00
Vik Paruchuri
59336ee03c
Fix prompt hiding issue in peer grading
2013-08-16 15:24:38 -04:00
Vik Paruchuri
48b0e570bc
Disable submit buttons until rubric totally filled out
2013-08-16 15:10:55 -04:00
Vik Paruchuri
8248c33138
Grab the correct location to report data for
2013-08-16 14:48:11 -04:00
Vik Paruchuri
bc8244b709
Rename reset to try again, hide and disable submit buttons
2013-08-16 14:43:37 -04:00
Vik Paruchuri
4f3ec68fb7
Scroll to top in peer and staff grading, preserve line breaks in submissions
2013-08-16 14:12:37 -04:00
Vik Paruchuri
be3291eeb0
Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work
2013-08-16 13:22:34 -04:00
Vik Paruchuri
7b9dde78fe
Fetch the correct rubric
2013-08-15 19:21:28 -04:00
Vik Paruchuri
8218a4a220
Show the right rubric, be more explicit about "next step"
2013-08-15 19:09:09 -04:00
Vik Paruchuri
b97dbc37a6
Fix test, strip out more of show results
2013-08-15 18:57:32 -04:00
Vik Paruchuri
a49da5d530
Fix rubrics, strip out get results
2013-08-15 18:55:42 -04:00
Vik Paruchuri
b6a5808548
Show submit button correctly for self assessment
2013-08-15 17:50:36 -04:00
Vik Paruchuri
35a540a0f6
Fix bug with leaving open ended response page and coming back
2013-08-15 17:25:04 -04:00
Vik Paruchuri
f8b5e67363
Text and styling cleanup
2013-08-15 14:52:51 -04:00
Vik Paruchuri
ac4d312415
Make rubric text generic, fix right arrow
2013-08-15 14:26:42 -04:00
Vik Paruchuri
b817f4caad
Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui
2013-08-15 14:15:50 -04:00
Vik Paruchuri
f8dab92ba6
Hide submit button after student submits
2013-08-15 14:15:19 -04:00
marco
72bb93d436
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-15 13:57:05 -04:00
marco
7865fbe0df
cleaned up padding for peer review training and grading states, removed extraneous response label,fixed style issue on rubric for peer grading where rubric items had a background color overridding the intended style
2013-08-15 13:56:17 -04:00
Vik Paruchuri
9211a38374
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-08-15 11:36:11 -04:00
Vik Paruchuri
c9e0d36d16
Merge pull request #621 from edx/fix/vik/oe-issues
...
Fix/vik/oe issues
2013-08-15 08:27:34 -07:00
Peter Baratta
55b67e39bb
Merge pull request #680 from edx/peterb/move-numpy-seterr
...
Move the silencing of numpy's warnings into test_calc.py
2013-08-15 07:31:03 -07:00
Peter Baratta
5f3dd37f98
Move the silencing of numpy's warnings into test_calc.py
...
..because that is where it is the most annoying/visible. Otherwise it really
has no effect on the LMS or anything else.
2013-08-15 08:54:43 -04:00
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
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
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
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
Anton Stupak
b4df2c4d73
Add filter for playback rates.
2013-08-14 18:15:18 +03: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
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
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
Nate Hardison
e4994b15cd
Add mgmt cmd to generate anonymized ID mapping
...
So that instructors have easy access to the mapping from anonymized
IDs (a simple MD5 hash of the user ID that's used when integrating
with third-party services like Qualtrics) to user IDs, we have a
simple Django management command to generate a CSV mapping. To run,
use the following:
rake django-admin[anonymized_id_mapping,<system>,<env>,<course_id>]
And, of course, substitute the appropriate values for <system>, <env>,
and <course_id>. (E.g., lms, dev, and MITx/6.002x/Circuits)
2013-08-13 11:10:05 -07:00
John Jarvis
d0a64f2c2a
adding django-admin commands to dump grades to a csv file
2013-08-13 13:29:48 -04:00
chrisndodge
cd838e2652
Merge pull request #644 from edx/fix/cdodge/remove-unused-import-code
...
remove unused code from xml_import.py
2013-08-13 09:57:40 -07:00
Adam
8951ab7a66
Merge pull request #650 from edx/fix/adam/i18n-templates
...
Fix/adam/i18n templates
2013-08-13 08:39:46 -07:00
Adam Palay
5d4edc61a7
add settings.PLATFORM_NAME to password_reset_confirm context
2013-08-13 11:30:51 -04:00
Christina Roberts
f88de3920a
Merge pull request #627 from edx/christina/restful-url
...
Change locators to a restful interface.
2013-08-13 07:34:22 -07:00
