Commit Graph

1808 Commits

Author SHA1 Message Date
Vik Paruchuri
1af35582fd Merge branch 'master' into vik/modify_open_ended 2013-01-03 12:08:51 -05:00
Vik Paruchuri
b01666f6d6 Fix error messages 2013-01-03 11:52:35 -05:00
Vik Paruchuri
5567477c67 Pass through initial display and answer 2013-01-03 11:52:35 -05:00
Vik Paruchuri
0c3eb67d5c More descriptive error message 2013-01-03 11:52:35 -05:00
Vik Paruchuri
cce6b70103 Fixes to log entire state on errors, format feedback better 2013-01-03 11:52:05 -05:00
Vik Paruchuri
68f0f7e0a8 Handle unicode feedback 2013-01-03 11:50:57 -05:00
Vik Paruchuri
a4eb76017b Display max score as well as score 2013-01-03 11:50:57 -05:00
Vik Paruchuri
9559c7b426 Patch "correct" answer display 2013-01-03 11:50:57 -05:00
Vik Paruchuri
37af39ef8d Change names 2013-01-03 11:50:57 -05:00
Vik Paruchuri
11c330bf52 Fix rebase issues 2013-01-03 11:50:22 -05:00
Vik Paruchuri
2c469cad75 Wire in submit message 2013-01-03 11:49:01 -05:00
Vik Paruchuri
1ac75b9420 Add in message passing pipeline 2013-01-03 11:47:41 -05:00
Diana Huang
09ed3d12a2 Hook up the backend into the new feedback response for scores 2013-01-03 11:40:41 -05:00
Diana Huang
c87d0f11d6 Show error when no score selected 2013-01-03 11:40:41 -05:00
Diana Huang
de7d6f184a Parse out the score given into an int. 2013-01-03 11:40:41 -05:00
Diana Huang
8f4efb0456 Hook up new radio buttons to the Javascript 2013-01-03 11:40:41 -05:00
Diana Huang
69ae1cc268 Clean up the styling and make the evaluation parts collapsible. 2013-01-03 11:40:41 -05:00
Diana Huang
54c541de45 Fix up the feedback-on-feedback styling and add radio button score selection. 2013-01-03 11:40:41 -05:00
Vik Paruchuri
fa97187a31 Patch naming issue 2013-01-03 11:40:41 -05:00
Vik Paruchuri
ad41558379 Hide submit button 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b06ce84afd Wire in submit message 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b71233fd50 Add in message passing pipeline 2013-01-03 11:40:41 -05:00
Vik Paruchuri
ce3b84d0e5 Message passing in lms 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b782f712b9 Add in more js to handle student feedback 2013-01-03 11:40:41 -05:00
Vik Paruchuri
634b586085 Integrate new ajax action 2013-01-03 11:40:41 -05:00
Vik Paruchuri
d663d23257 Work on adding in a new ajax post type 2013-01-03 11:40:41 -05:00
valera-rozuvan
62271fe5c6 Added namespaced RequireJS. 2013-01-03 10:14:06 +02:00
David Ormsbee
8bf393fbba Merge pull request #1182 from MITx/bridger/feature/ungraded_course
Visual changes for ungraded courses
2013-01-02 07:19:34 -08:00
Carlos Andrés Rocha
1ac41787a7 Fix broken display of courses in university profile 2012-12-21 16:38:17 -05:00
David Ormsbee
8532d79ea5 Merge pull request #1198 from MITx/feature/ichuang/update-tracking-log-sql-schema
update schema for tracking sql logs - larger fields; add hostname
2012-12-21 12:23:45 -08:00
David Ormsbee
241b4eb0fe Merge pull request #1196 from MITx/feature/rocha/change-courses-layout
New Layout for course listings with new course graphical overlay
2012-12-21 12:18:05 -08:00
ichuang
320f1b4141 update schema for tracking sql logs - larger fields; add hostname 2012-12-21 08:44:40 -05:00
Carlos Andrés Rocha
22de7cbb4e Add logic to display courses by start date and show the new overlay 2012-12-20 20:05:11 -05:00
Carlos Andrés Rocha
3a4b626e62 Remove unused code from accounts login page 2012-12-20 14:19:06 -05:00
Carlos Andrés Rocha
5d85fab283 Fix django auth login redirection
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.

We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.

[#41499213]
2012-12-19 18:48:30 -05:00
Bridger Maxwell
f23bf85199 Added config to grader to hide averages of pset scores. 2012-12-19 11:44:32 -05:00
David Ormsbee
8373ee4bf6 Basic support for freeform advertised_start dates like 'Spring' 2012-12-19 04:01:37 -05:00
David Ormsbee
0ddea6d0ae Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx
Feature/alex/video timeframe mitx
2012-12-17 13:20:47 -08:00
Jay Zoldak
cc54c37359 Exclude settings.py files from coverage reports and configure titles for the reports. 2012-12-17 15:00:11 -05:00
Diana Huang
3b805fac1a Merge pull request #1123 from MITx/bugfix/victor/open-ended-parsing
Fix for issues in open ended parsing
2012-12-11 10:24:53 -08:00
Vik Paruchuri
b4fffc798c Fix for issues in open ended parsing 2012-12-11 13:14:34 -05:00
Victor Shnayder
df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling
Updates to the styling of open ended problems
2012-12-10 11:36:04 -08:00
Vik Paruchuri
ab84042435 Fix raised error 2012-12-10 14:24:00 -05:00
Diana Huang
7279d11cf2 Add a reload button to open-ended input problems 2012-12-10 14:16:00 -05:00
Victor Shnayder
ed1f4bdd85 Check for none. 2012-12-10 14:10:19 -05:00
Diana Huang
3156c2b393 Add icon to the grading message 2012-12-10 12:29:46 -05:00
Diana Huang
cc72870aac Make oepn-ended responses and self-assessment answers use
the same CSS
2012-12-10 11:00:28 -05:00
David Ormsbee
e3b4d78d87 IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object. 2012-12-07 16:03:05 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading
Feature/victor/instructor grading
2012-12-07 08:44:58 -08:00
Victor Shnayder
bd94474a50 improve docstring 2012-12-07 10:35:44 -05:00