Commit Graph

3122 Commits

Author SHA1 Message Date
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
Brian Wilson
15a11e9cb7 add validation of accommodation codes 2013-01-29 11:16:23 -05:00
Brian Wilson
69ff879e95 add more validation for countries 2013-01-29 10:41:41 -05:00
John Jarvis
0f39e04697 Adding certificate restriction lookup
If certificate status is 'restricted' the grade
and survey link will be shown, the download link will not
2013-01-29 10:27:53 -05:00
Brian Wilson
09ab52bc94 fix log message in pearson import 2013-01-29 10:21:41 -05:00
Chris Dodge
5a4c0fb907 imports should have a marketing video. Treat it as a warning as every course might not have one. 2013-01-29 09:38:59 -05:00
John Jarvis
289301e0ea adding more to help string 2013-01-28 19:38:51 -05:00
John Jarvis
0c43e69c00 command for certificate restriction (embargoed countries) 2013-01-28 19:30:40 -05:00
John Jarvis
7e033d0265 django command for certificate restriction 2013-01-28 19:28:24 -05:00
Brian Wilson
bae2162fa0 add pearson_dump command. Modify rule for determining authorization transaction type. 2013-01-28 18:29:34 -05:00
John Jarvis
fba88db5fa Adding django-admin command for certificate_restriction 2013-01-28 15:10:35 -05:00
Victor Shnayder
734a8bd6e5 make tests pass with cms config as well as lms 2013-01-28 15:07:44 -05:00
Diana Huang
14d9633fa6 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests 2013-01-28 14:58:50 -05:00
Diana Huang
7d82b6cb0e Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-28 13:49:37 -05:00
John Jarvis
5d5642673c Add new field to disable certificate download 2013-01-28 12:58:02 -05:00
Brian Wilson
9cf0f0900b Fix Pearson unit tests. 2013-01-28 12:56:26 -05:00
Diana Huang
ffbda8a0be Update test 2013-01-28 11:52:15 -05:00
Diana Huang
1d4b674c79 Address code review feedback 2013-01-28 10:57:06 -05:00
Diana Huang
fe4dc7622e Updates to combined open ended tests 2013-01-28 10:18:01 -05:00
Diana Huang
0852af3f35 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-28 08:28:39 -05:00