Commit Graph

6956 Commits

Author SHA1 Message Date
Vik Paruchuri
4840205554 Make CSS nicer 2013-01-30 13:00:03 -05:00
David Ormsbee
fecad2a3e1 Merge pull request #1382 from MITx/feature/brian/pearson-status
pearson_dump: prettify, add missing error, provide default filename
2013-01-30 09:55:45 -08:00
Vik Paruchuri
eb5d14a2a9 Fix string interpolation in JS 2013-01-30 12:31:02 -05:00
Brian Wilson
a6a58d0e2a pearson_dump: prettify, add missing error, provide default filename 2013-01-30 12:15:12 -05:00
Christina Roberts
91b3a220b8 Merge pull request #1367 from MITx/fix/cdodge/static-tab-reordering
support reordering of static tabs in studio
2013-01-30 08:51:36 -08:00
chrisndodge
67775fbfa9 Merge pull request #1377 from MITx/feature/christina/misc
Bug fixes for problem progress not updating.
2013-01-30 08:24:38 -08:00
Vik Paruchuri
3a2d851132 Images pass through fine 2013-01-30 11:17:38 -05:00
Vik Paruchuri
6c21469bed Fix some image upload issues 2013-01-30 11:11:23 -05:00
Vik Paruchuri
d6947f1da7 Proper image submission, error handling 2013-01-30 11:02:31 -05:00
Diana Huang
b38595f115 Fix the fixtures, add new tests, remove useless code
from the original JS
2013-01-30 10:50:47 -05:00
Vik Paruchuri
bae898edb0 Auto convert image to link, display inside student answer 2013-01-30 10:47:50 -05:00
Vik Paruchuri
012d8107fa Get image upload, check for issues, upload to S3 2013-01-30 10:04:14 -05:00
Vik Paruchuri
0c0a897127 Work on uploading image submission to S3 2013-01-30 09:36:01 -05:00
Diana Huang
4df62d968d Fix up new jasmine tests 2013-01-30 09:31:42 -05:00
Diana Huang
ce8a48405b Clean up some JS errors showing up in the xmodule jasmine tests 2013-01-30 09:31:20 -05:00
Calen Pennington
9ae83338c6 Whitespace cleanup 2013-01-30 09:12:50 -05:00
Calen Pennington
95f2c9e275 Standardize how static urls are replaced by modules in their own html 2013-01-30 09:12:50 -05:00
Vik Paruchuri
d06f5f7791 Fix file upload stuff, debug some image check routines 2013-01-30 09:02:04 -05:00
Vik Paruchuri
0622dc995d Javascript to handle file uploads 2013-01-29 22:42:08 -05:00
Vik Paruchuri
fbdc190a58 Add in file upload ability 2013-01-29 22:16:48 -05:00
Vik Paruchuri
b730c25056 Fix rubric rendering 2013-01-29 21:51:48 -05:00
Vik Paruchuri
08e06f8719 Fix some tab problems 2013-01-29 21:39:54 -05:00
Vik Paruchuri
9c5fe05689 Update reqs for pillow, work on file uploads 2013-01-29 21:29:10 -05:00
Vik Paruchuri
4d1f9d2edf Function to upload stuff to S3 2013-01-29 21:24:05 -05:00
Vik Paruchuri
929160e180 Add in ability to validate images and image paths (urls) 2013-01-29 21:24:04 -05:00
Vik Paruchuri
5d4ad4b8ca Simple method to count colors in an image 2013-01-29 21:24:04 -05:00
Vik Paruchuri
255405d0bf Automatically show results at certain points (when need to reset, when finished with a problem, etc) 2013-01-29 21:24:04 -05:00
Vik Paruchuri
9e673e8aa7 Remove wrapper p tags 2013-01-29 21:24:04 -05:00
Vik Paruchuri
fde370bd92 Fix notification issue, sanitize input html 2013-01-29 21:24:04 -05:00
Vik Paruchuri
a5daf1f34d Perhaps properly sanitize js 2013-01-29 21:24:04 -05:00
Vik Paruchuri
2f2b5fa753 Fix unicode problem 2013-01-29 21:24:04 -05:00
Vik Paruchuri
4140b74e47 Fix progress return 2013-01-29 21:24:03 -05:00
Vik Paruchuri
cee69bb765 Fix return of score to progress tab 2013-01-29 21:24:03 -05:00
Vik Paruchuri
252e54fef5 Add in is_scored boolean, remove some noisy debug statements 2013-01-29 21:24:03 -05:00
Vik Paruchuri
3531bce7d3 Fix score checking, latest post assessment scraping 2013-01-29 21:24:02 -05:00
Vik Paruchuri
29f738f7ce Minor count fix 2013-01-29 21:24:02 -05:00
Vik Paruchuri
5291271591 Add in some minimal checking to make sure that the max score and scores for each rubric point are 3 2013-01-29 19:56:13 -05:00
Diana Huang
f1973dc660 minor update to new jasmine test 2013-01-29 17:34:54 -05:00
David Ormsbee
40d59faa68 Merge pull request #1330 from MITx/diana/open-ended-ui-updates
Rubric Integration and other UI improvements
2013-01-29 14:10:18 -08:00
Diana Huang
f7424eb8d6 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-29 16:44:15 -05:00
cahrens
26cb1c5a25 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-29 16:30:41 -05:00
Jay Zoldak
3669ea5c97 Merge pull request #1375 from MITx/diana/fix-requirejs-jasmine-xmodule
Add missing requirejs for xmodule jasmine tests
2013-01-29 13:26:36 -08:00
jarv
877f757f94 Merge pull request #1369 from MITx/feature/jarv/certificate-restriction
Feature/jarv/certificate restriction
2013-01-29 13:14:41 -08:00
Diana Huang
cb77209d3c Add missing requirejs for xmodule jasmine tests 2013-01-29 16:09:27 -05:00
Diana Huang
585f1c41d6 New jasmine tests for combined open ended problems. 2013-01-29 16:04:43 -05:00
Chris Dodge
855c8bb7e7 add unit test for tab reordering 2013-01-29 13:44:42 -05:00
Don Mitchell
b3d7dc779d Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-29 13:17:15 -05:00
Don Mitchell
ba95cf2385 Auto expand on hover of drag&drop unit 2013-01-29 13:10:23 -05:00
Victor Shnayder
39a9c47512 make links look like links 2013-01-29 11:33:26 -05:00
David Ormsbee
0a1f5bc154 Merge pull request #1368 from MITx/feature/brian/pearson-status
add pearson_dump command.
2013-01-29 08:19:41 -08:00