Commit Graph

7258 Commits

Author SHA1 Message Date
Vik Paruchuri
0bc0657939 Add in support for ordering tags properly in feedback box 2012-12-07 09:21:23 -05:00
David Ormsbee
61c17cabfa Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule
Fix/brian/nonascii html xmodule
2012-12-06 15:33:21 -08:00
Brian Talbot
edbc12e1e3 homepage - added georgetown logo assets and resized other university logos to match 3x3 layout 2012-12-06 17:02:43 -05:00
Brian Talbot
cc870f8ecd homepage - changed partner university listing layout to handle 6 partners 2012-12-06 14:37:09 -05:00
Vik Paruchuri
1eaf424c20 Change some things to use format 2012-12-05 13:17:16 -05:00
Vik Paruchuri
e813dc3514 Address format issue and exception 2012-12-05 12:08:26 -05:00
Victor Shnayder
3795b3a785 Address Dave's comments
- factor out some common code
- improve variable names
2012-12-05 10:56:12 -05:00
Victor Shnayder
3b3ee2bf52 Merge branch 'feature/victor/instructor-grading' of github.com:MITx/mitx into feature/victor/instructor-grading 2012-12-05 10:37:24 -05:00
Victor Shnayder
a498377ad5 Merge pull request #1102 from MITx/diana/instructor-grading-styling
Diana/instructor grading styling
2012-12-05 06:49:47 -08:00
Diana Huang
5ebde2a93e fix comment 2012-12-05 09:42:30 -05:00
Diana Huang
cb6bb38f84 merge commit 2012-12-05 09:40:53 -05:00
Victor Shnayder
7887f556d9 Add docs on using a queue server on aws from a local LMS 2012-12-05 09:29:42 -05:00
Diana Huang
90076c39e6 add in some new mock responses for our staff grading API 2012-12-05 09:25:05 -05:00
Victor Shnayder
40f34d19a3 add initial mock of get_problems call 2012-12-04 17:46:34 -05:00
Victor Shnayder
1d87dab3a7 remove queueing spinner and polling logic, change message
- no polling, since instructors may take a long time to grade
2012-12-04 17:45:51 -05:00
Victor Shnayder
1d9d347df9 Merge pull request #1101 from MITx/bugfix/dave/remove_point_cap
Don't cap points coming back from CodeResponses
2012-12-04 13:59:06 -08:00
David Ormsbee
cee0781a20 Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit. 2012-12-04 15:51:36 -05:00
Victor Shnayder
c57b9f3240 merge prompt and ml accuracy display 2012-12-04 14:44:23 -05:00
Victor Shnayder
d4a3e4d044 fix logger name 2012-12-04 14:44:23 -05:00
Brian Wilson
70f35b2e15 remove skipped tests that use mongo 2012-12-04 13:46:32 -05:00
Brian Wilson
c2d5c04d9d Merge branch 'master' into fix/brian/nonascii-html-xmodule 2012-12-04 13:26:37 -05:00
Brian Wilson
cde20758f8 cosmetic cleanup 2012-12-04 13:25:04 -05:00
Brian Wilson
dfb9913100 clean up lms tests, and fix export/import 2012-12-04 11:52:35 -05:00
Carlos Andrés Rocha
94a12bddb6 Merge pull request #1099 from MITx/content/rocha/wellesley-announcmenent
Modify Wellesley rollover logo
2012-12-04 07:27:59 -08:00
Carlos Andrés Rocha
c702bbcd85 Modify Wellesley rollover logo 2012-12-04 10:27:23 -05:00
Carlos Andrés Rocha
4f9f17d3bb Merge pull request #1098 from MITx/content/rocha/wellesley-announcmenent
Add Wellesley College news announcement and frontpage changes
2012-12-04 07:01:47 -08:00
Carlos Andrés Rocha
4d6162b1df Fix incorrect Facebook URL for Wellesley news announcement 2012-12-04 09:58:50 -05:00
Carlos Andrés Rocha
e3d180505f Add Wellesley College news announcement and frontpage changes 2012-12-04 09:45:30 -05:00
Brian Wilson
4ebd70dcc4 add support for utf8 in sequences, verticals and custom modules. 2012-12-04 03:54:36 -05:00
Victor Shnayder
99f083e772 Merge pull request #1097 from MITx/diana/fix-open-ended-input
Diana/fix open ended input
2012-12-03 14:03:52 -08:00
Diana Huang
9b1cad90b5 Fix location that gets used for open-ended responses 2012-12-03 16:52:29 -05:00
Brian Wilson
5b02e1e3ce add additional html tests 2012-12-03 16:26:08 -05:00
Brian Wilson
1d44ebb10c Add more non-ascii characters to full dataset, and make fixes in xmodule code. 2012-12-03 16:22:25 -05:00
Diana Huang
65c56edb5c Better error logging when login into queue fails 2012-12-03 15:04:34 -05:00
Ashley Penney
e36cffa86f Merge pull request #1096 from MITx/feature/cale/bad-newrelic-logging
Don't try and send exceptions to newrelic with a busted logging interfac...
2012-12-03 11:35:53 -08:00
Calen Pennington
251f552e64 Don't try and send exceptions to newrelic with a busted logging interface 2012-12-03 14:30:36 -05:00
Victor Shnayder
cb9c71000f Merge pull request #1095 from MITx/vik/modify_open_ended
Altered staff grading to display message about ml grading performance.
2012-12-03 11:27:36 -08:00
Victor Shnayder
a44e8887a8 add docs on staff grading tab type
- also updated some out-of-date docs
2012-12-03 13:22:50 -05:00
Victor Shnayder
22ce306f64 whitespace and comments 2012-12-03 12:50:41 -05:00
Victor Shnayder
63c1a8ea10 whitespace 2012-12-03 12:50:41 -05:00
Victor Shnayder
97fbd02cb5 Merge pull request #1090 from MITx/vik/modify_open_ended
Vik/modify open ended
2012-12-03 06:10:01 -08:00
David Ormsbee
36a3aeed6a Merge pull request #1093 from MITx/bugfix/dave/pearson_compat
Don't log errors to console if there is no console (like IE8 and below).
2012-12-01 09:18:22 -08:00
David Ormsbee
3b326048f9 Don't log errors to console if there is no console (like IE8 and below). 2012-12-01 12:16:10 -05:00
David Ormsbee
597b8a245b Merge pull request #1092 from MITx/bugfix/dave/pearson_compat
IE errors if you try to use 'return' as a dict key.
2012-12-01 07:00:48 -08:00
Brian Wilson
0c1ebd8dfb add toylab test data and test changes, including fix to jump_to 2012-11-30 19:05:26 -05:00
David Ormsbee
7ffb30d0c9 IE errors if you try to use 'return' as a dict key. 2012-11-30 18:22:37 -05:00
David Ormsbee
c2c016c58b Fix MathJax S3 URL to use the standard HTTPS location 2012-11-30 18:00:45 -05:00
Victor Shnayder
e30dceb15d Merge pull request #1091 from MITx/hotfix/dave/ie8_mathjax
Switch to S3 hosted mathjax (I thought we did this ages ago).
2012-11-30 14:08:44 -08:00
David Ormsbee
0b3d739646 Switch to S3 hosted mathjax (I thought we did this ages ago). 2012-11-30 17:01:30 -05:00
Vik Paruchuri
4e4bd4aba2 Altered staff grading to display message about ml grading performance. 2012-11-30 15:52:11 -05:00