Commit Graph

7216 Commits

Author SHA1 Message Date
Your Name
df5a62305c update 2012-12-11 15:51:17 -05:00
Your Name
41167a49a1 Merge branch 'master' into bugfix/kevin/mathjax-rendering 2012-12-11 15:47:43 -05:00
Your Name
343dde6e29 fixed coffeescript to render mathjax correctly 2012-12-11 15:47:20 -05:00
Victor Shnayder
785974da67 Merge pull request #1126 from MITx/diana/open-ended-tests
Merge in updates to tests for open ended grading
2012-12-11 12:31:26 -08: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
Diana Huang
370dfc77ea Merge branch 'master' into diana/open-ended-tests 2012-12-11 09:53:05 -05:00
Carlos Andrés Rocha
5cf9982c4a Merge pull request #1121 from MITx/feature/jarv/ipython
Adding ipython to requirements
2012-12-10 14:26:34 -08:00
John Jarvis
8aebb14eea Adding ipython to requirements
We had this before as a python dependency but it was dropped
when we switched to virtual environments
2012-12-10 17:15:31 -05:00
Diana Huang
4a2dabd30a new test for problem lists 2012-12-10 16:31:43 -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
VikParuchuri
a651a7798e Merge pull request #1118 from MITx/bugfix/victor/open-ended-parsing
Check for none.
2012-12-10 11:27:39 -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
Victor Shnayder
c5c4305f9e Merge pull request #1110 from MITx/diana/instructor-grading-styling
Updates to the instructor grading pages
2012-12-10 10:39:19 -08: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
Victor Shnayder
85b5190c29 fix login hack. Uses new return-error-msg-if-not-logged-in behavior 2012-12-10 10:41:40 -05:00
Diana Huang
c9d399d3bd Update instructor grading message with more accurate information 2012-12-10 09:35:30 -05:00
Carlos Andrés Rocha
faae6a36dc Merge pull request #1107 from MITx/content/btalbot/new-universities
Add Georgetown news announcement, landing page and updated FAQ

[Finished cd#40805397 #40805401]
2012-12-10 03:32:41 -08:00
Diana Huang
76f76a4ff8 Update tests and mock objects to work with the new API 2012-12-07 17:30:03 -05:00
David Ormsbee
b069f95c07 Merge pull request #1109 from MITx/feature/dave/pearson_ie7
IE7 compatibility
2012-12-07 14:08:46 -08:00
Diana Huang
4ccf7c351d Fix service errors so that individual problems can now be displayed
and graded
2012-12-07 17:01:27 -05:00
Diana Huang
7f9fcfffdf Add support for the new staff grading views on the backend 2012-12-07 17:01:27 -05:00
Diana Huang
5030c9d35b Cleanup of the meta information styles and make
the feedback box less important.
2012-12-07 17:01:27 -05:00
Diana Huang
1026c64111 Fix up some more of the meta info container 2012-12-07 17:01:27 -05:00
Diana Huang
275c9ef7fd Update API with server and add new meta info box for meta information 2012-12-07 17:01:27 -05:00
Diana Huang
7c768cbbff Wire up the separate action button 2012-12-07 17:01:27 -05:00
Diana Huang
aee1e5e9a9 Updates to the list view and error container 2012-12-07 17:01:27 -05:00
Diana Huang
ef82ced2af Improve the paragraph maker on the staff grading page 2012-12-07 17:01:27 -05:00
Diana Huang
ffa42b6f11 Styles for the new instructor grading interface 2012-12-07 17:01:27 -05:00
Diana Huang
fcc1ab71f6 Update the formatting and layout of the Instructor Grading interface. 2012-12-07 17:01:27 -05:00
Diana Huang
b5f3386d27 Add breadcrumbing and clarify some of the text on the
instructor grading interface.
2012-12-07 17:01:27 -05:00
Diana Huang
5914b1cf91 Make the mock backend support different problems, and make sure
the location is passed around properly. Clarify some of the numbers for
the user
2012-12-07 17:01:26 -05:00
Diana Huang
94e1a9ffd3 Clean up some minor issues with list view
and display some new information on the problem-specific page
2012-12-07 17:01:26 -05:00
Diana Huang
48b9043213 Initial problem list functionality 2012-12-07 17:01:26 -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
Carlos Andrés Rocha
cc68ba5bc9 Add Georgetown news announcement, landing page and updated FAQ
[#40805397]
2012-12-07 11:59:13 -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
David Ormsbee
98fefd14c5 Merge pull request #1105 from MITx/feature/cale/github-status-api
Feature/cale/github status api
2012-12-07 08:09:00 -08:00
Calen Pennington
38671fc83c Move files from base.sh to test.sh 2012-12-07 11:01:58 -05:00
Calen Pennington
e2ed7d1c4e Move to a single test.sh file that only runs the relevant tests for a particular branch in the repo. In particular, don't run cms tests on branches derived from master 2012-12-07 10:56:24 -05:00
Calen Pennington
5a3cdc11cd Only mark github commit status when full test suite passes 2012-12-07 10:41:24 -05:00
Calen Pennington
d4ec5946d4 Mark failed state correctly 2012-12-07 10:37:44 -05:00
Victor Shnayder
44a8f31d06 Change are-we-logged-in detection to be less hackish.
- has matching changes in controller staff_grading view.
2012-12-07 10:35:45 -05:00
Victor Shnayder
730cdd3b4f minor changes from pull request comments
- comments
- more info in log msg
- better error
2012-12-07 10:35:44 -05:00
Victor Shnayder
53580af952 fix aws setting name 2012-12-07 10:35:44 -05:00
Victor Shnayder
bd94474a50 improve docstring 2012-12-07 10:35:44 -05:00
Victor Shnayder
7190e484f1 Use a namedtuple for parsing ScoreMessages 2012-12-07 10:35:44 -05:00