Commit Graph

12374 Commits

Author SHA1 Message Date
Vik Paruchuri
338a57768f Remove try except block for pg scoring 2013-04-16 11:01:57 -04:00
Vik Paruchuri
b1ea6b2012 Add in comments about max score calculation 2013-04-16 10:58:58 -04:00
Vik Paruchuri
dc7913dc1e Add in a log debug message for except clause. 2013-04-16 10:55:58 -04:00
Vik Paruchuri
0d4b9d26cf Add in a test, rescale preview images 2013-04-16 10:51:23 -04:00
Vik Paruchuri
9acc592279 Comments for hotkeys 2013-04-16 10:23:08 -04:00
Vik Paruchuri
358482c55b Add in test for child weight 2013-04-11 11:54:00 -04:00
Vik Paruchuri
4d3b4a60d6 Significantly less verbose test code 2013-04-11 11:51:27 -04:00
Vik Paruchuri
442d0fcf4f Add tests for orderings with only one task 2013-04-10 17:41:10 -04:00
Vik Paruchuri
09e18cb815 Add in tests for alternate xml orderings 2013-04-10 17:38:31 -04:00
Vik Paruchuri
ca2eb9cd1b Add in tests for combinedopenended scoring 2013-04-10 17:33:43 -04:00
Vik Paruchuri
820a2b407a Add in js image upload preview 2013-04-10 17:06:02 -04:00
Vik Paruchuri
9f04769c00 Better confirmation for flagging 2013-04-10 16:16:13 -04:00
Vik Paruchuri
a64d57ae1d Add popup when flag box is checked 2013-04-10 16:01:56 -04:00
Vik Paruchuri
2a5631da86 Code cleanup 2013-04-10 15:26:45 -04:00
Vik Paruchuri
cef4d0cb09 Display instructor feedback 2013-04-10 15:25:05 -04:00
Vik Paruchuri
799c8282bc Fix hotkeys for combined open ended 2013-04-10 15:15:22 -04:00
Vik Paruchuri
d0ecbbb4cf Fix hotkeys in peer and staff grading to use ctrl prefix 2013-04-10 15:10:48 -04:00
Vik Paruchuri
463a88ccfb Display rubric to students after calibration 2013-04-09 16:54:27 -04:00
Vik Paruchuri
7d38147490 Remove attempts field from peer grading template 2013-04-09 15:34:35 -04:00
Vik Paruchuri
418f218eec Fix some templates, minor code reformats 2013-04-09 15:33:11 -04:00
Vik Paruchuri
247ccc37a6 Code reformat, patch score gen 2013-04-09 14:47:26 -04:00
Vik Paruchuri
112fb4539b Correctly calculate score for combinedopenended and peer assessment 2013-04-09 14:43:41 -04:00
Vik Paruchuri
45a3dd4ee0 Fix file uploads to work after error 2013-04-09 14:13:29 -04:00
Vik Paruchuri
9cca3072c3 Fix skip behavior for staff 2013-04-09 13:53:51 -04:00
Vik Paruchuri
448c8121c3 Patch combinedopenended to work if self assessment is not first 2013-04-09 13:37:37 -04:00
chrisndodge
2fce096e1c Merge pull request #1834 from MITx/bug/christina/base
Need to be able to access smoothScrollTop.
2013-04-09 06:52:55 -07:00
cahrens
f36494e5dd Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way. 2013-04-09 09:41:52 -04:00
Sarina
74104d6081 Merge pull request #1831 from MITx/vik/fix/pg-and-progress
Fix weighting and score generation
2013-04-08 14:37:07 -07:00
Christina Roberts
7fd8a33b3c Merge pull request #1816 from MITx/feature/btalbot/studio-alerts
Feature/btalbot/studio-alerts
2013-04-08 14:19:12 -07:00
Brian Talbot
7882845786 studio - alerts: correcting page title 2013-04-08 17:09:43 -04:00
Brian Talbot
27871ac9c9 studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake 2013-04-08 16:55:06 -04:00
Vik Paruchuri
7d09617ec9 Fix weighting and score generation 2013-04-08 16:52:18 -04:00
Calen Pennington
45bb4d3754 Merge pull request #1828 from MITx/fix/cdodge/import-nesting-definition-data
import was putting the xml data into definition.data.data rather than de...
2013-04-08 13:50:36 -07:00
Brian Talbot
3f2e21f9dc Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-08 16:29:18 -04:00
Brian Talbot
3f22826e26 studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification 2013-04-08 16:28:31 -04:00
Chris Dodge
54afc5eb63 seems like we need to purge 'filename' from both _model_data as well as xml_attributes 2013-04-08 16:09:41 -04:00
Chris Dodge
a0f5a51135 wip to fix broken test 2013-04-08 15:34:12 -04:00
Chris Dodge
983e524158 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/import-nesting-definition-data 2013-04-08 15:14:58 -04:00
Chris Dodge
0b26cc2635 fix line breaks per Cale 2013-04-08 14:48:16 -04:00
Diana Huang
e981226d8d Merge pull request #1823 from MITx/diana/job-page-update
Make requested updates to the jobs page
2013-04-08 11:45:35 -07:00
Chris Dodge
069f997595 import was putting the xml data into definition.data.data rather than definition.data 2013-04-08 14:33:46 -04:00
Mark L. Chang
1500586f70 Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo
studio - corrected a typo and adjusted copy on the help sock
2013-04-08 11:23:16 -07:00
chrisndodge
9a405ff44c Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through
extend the list of container module names to our comuputation of inherit...
2013-04-08 11:11:14 -07:00
Brian Talbot
e3a1279c8f studio - corrected a typo and adjusted copy on the help sock 2013-04-08 14:10:38 -04:00
Mark L. Chang
caa2539893 Merge pull request #1826 from MITx/fix/cdodge/dont-blowup-index-if-no-course-is-None
mark stumble on case where he had a None course
2013-04-08 11:10:15 -07:00
Chris Dodge
472e657692 mark stumble on case where he had a None course 2013-04-08 14:07:37 -04:00
Don Mitchell
c14d046d2f Merge pull request #1824 from MITx/feature/cdodge/improve-cms-test-coverage
add a simple Studio walkthough to check page loads
2013-04-08 10:58:47 -07:00
Chris Dodge
5137119f2b add a simple Studio walkthough to check page loads 2013-04-08 13:55:38 -04:00
Brian Talbot
bcf4775610 studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling 2013-04-08 13:47:01 -04:00
Diana Huang
b1716dc2fa Make requested updates to the jobs page 2013-04-08 13:10:04 -04:00