Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

7928 Commits

Author SHA1 Message Date
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
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
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
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
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
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
ichuang
c56982e6f0 fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes 2013-01-25 16:45:16 -05:00
Diana Huang
9f6afcb606 Add some more tests 2013-01-25 16:33:45 -05:00
Victor Shnayder
87e92644b6 Make all tests pass 
caveat: with a bit of hackery.  Need to do better testing once things are live.
 2013-01-25 16:13:55 -05:00
Ned Batchelder
08acf43575 Don't store first_time_user any more, instead interested observers 
can examine whether .position is None or not.
 2013-01-25 15:49:29 -05:00
Diana Huang
a26006f7c3 Add new test for the CombinedOpenEndedModule 2013-01-25 15:09:01 -05:00
Diana Huang
5e34f38ca9 Better error handling. 2013-01-25 13:46:57 -05:00
Diana Huang
47c24d8e7e Raise smarter exceptions when parsing rubrics. 2013-01-25 13:33:35 -05:00
Diana Huang
115f6c3acf Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-25 11:19:38 -05:00
Diana Huang
71d27def0d Fix tests and add new documentation 2013-01-25 11:18:30 -05:00
Diana Huang
3ec2a83ec1 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests 
Fix

Conflicts:
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-01-25 10:35:55 -05:00
Diana Huang
bb521a20b7 fix a bug caught with testing and update some tests 
(the last couple are still broken, though)
 2013-01-25 10:19:09 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
Diana Huang
bb60dde45e Add OpenEndedModule tests 2013-01-24 17:09:19 -05:00
Jay Zoldak
896933a3c4 Fix broken IE 2013-01-24 17:02:18 -05:00