Vik Paruchuri
21e13e44af
Pep8 and pylint fixes
2013-08-22 14:29:39 -04:00
Vik Paruchuri
a06801432e
Fix staff grading test
2013-08-22 14:12:12 -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
a084d4486d
Get rid of labels
2013-08-15 14:28:52 -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
Jay Zoldak
bbb5059d36
Merge branch 'release'
2013-08-15 10:59:09 -04:00
Jay Zoldak
0350dea2eb
Merge pull request #682 from edx/sarina/hotfix/fix-combinedopenended
...
Fix error seen in combinedopenended modules
2013-08-15 07:48:55 -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
Vik Paruchuri
6f657c1124
Import to fix internationalization
2013-08-15 10:30:16 -04: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
chrisndodge
0db4c98782
Merge pull request #658 from edx/bugfix/ichuang/delete_course_group_not_exist
...
catch error in delete_course management script when group does not exist
2013-08-15 04:57:43 -07: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
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
