Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

19363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felix Sun
a730f9189b Fixed numerous 500 errors that result from mal-formatted post requests. 
Fixed tests to work with symbolic answer changes.
 2013-08-26 09:40:03 -04:00
Felix Sun
199b632513 Crowdsourced hinter now supports formula responses. Tests still broken. 2013-08-26 09:40:03 -04:00
Felix Sun
b88c6b8d68 Hinter now works with formula responses. Tests broken. 2013-08-26 09:40:02 -04:00
Felix Sun
c34a81a845 Refactored formula response grader to expose formula-evaluating to outside world. 
In preparation for adding hints to formula response.
 2013-08-26 09:40:02 -04:00
Felix Sun
69380756d2 Fixed tests to work with new vote-tabbing method. Fixed some string-int incompatibility errors. 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/tests/test_crowdsource_hinter.py
 2013-08-26 09:40:02 -04:00
Felix Sun
fc8acb61a3 Changed voting dialog to only display one tab per answer. 
No tests for this, yet.

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/templates/hinter_display.html
 2013-08-26 09:40:02 -04:00
Adam Palay
d347390c24 fix error logging for unenrolling if enrollment not found 2013-08-26 09:39:16 -04:00
jkarni
87500a47fb Merge pull request #674 from edx/jkarni/feature/chunkedupload 
Jkarni/feature/chunkedupload
 2013-08-25 20:06:17 -07:00
Julian Arni
1e44e01629 Remove assert2xx 2013-08-25 22:50:26 -04:00
Julian Arni
03b140d538 Review fixes 2013-08-25 22:40:11 -04:00
Julian Arni
509a861459 Clear contentstore 
Signed-off-by: Julian Arni <julian@edx.org>
 2013-08-25 22:40:11 -04:00
Julian Arni
a28b02ae2c Pep8 and pylint fixes 2013-08-25 22:40:11 -04:00
Julian Arni
fcd11d93d5 Handle nginx 499s and double requests 2013-08-25 22:40:11 -04:00
Julian Arni
8a8bcf289f remove repeated warnings 2013-08-25 22:40:10 -04:00
Julian Arni
ef0828fc66 Behave properly on non-tar-gz files 2013-08-25 22:40:10 -04:00
Julian Arni
eaa4b3ef99 Pep8 and pylint fixes 2013-08-25 22:40:10 -04:00
Julian Arni
d991595ecb Split import-export into new file 2013-08-25 22:40:10 -04:00
Julian Arni
993b92bc47 Add import tests 2013-08-25 22:40:10 -04:00
Julian Arni
7666aad042 Check download integrity 2013-08-25 22:40:10 -04:00
Julian Arni
513b6cab3e Small review fixes. 
Comments, httpresponse -> jsonresponse; make sure errors get relayed.
 2013-08-25 22:40:09 -04:00
Julian Arni
798d07a8d9 Fix confusing message 2013-08-25 22:40:09 -04:00
Julian Arni
3aaa2868c0 Process uploaded chunks. 
Also adds lockfile for asynchronous status updates.
 2013-08-25 22:40:09 -04:00
Julian Arni
50934d4d45 Make client-side use jquery-file-upload 2013-08-25 22:40:09 -04:00
Julian Arni
b6795b4e88 Add jquery-file-upload 2013-08-25 22:40:09 -04:00
Frances Botsford
b5302a192f refinements to the vcert requirements page 2013-08-23 16:49:01 -04:00
caesar2164
a902201f06 Merge pull request #720 from edx/akshay/order-commentables 
Bug fix -- subcategories in forums topic list should now be sorted alphabetically
 2013-08-23 13:01:06 -07:00
Giulio Gratta
44f4e7b10a refatoring tests and added to changelog 2013-08-23 12:59:14 -07:00
Giulio Gratta
4e77098859 added course level feature flag for forum alpha sorting as well as tests 2013-08-23 12:59:13 -07:00
Giulio Gratta
e0471007d8 removed sort in HTML and instead added conditional to use subcategory titles as sort_key 2013-08-23 12:59:13 -07:00
Akshay Jagadeesh
8cac4ebae2 Working on sorting dropdown commentables 2013-08-23 12:59:13 -07:00
Peter Fogg
5cb1b2594f Merge pull request #787 from edx/peter-fogg/static-page-delete 
Add delete confirmation to static pages.
 2013-08-23 11:52:37 -07:00
Peter Fogg
07d9106c09 Merge pull request #769 from edx/peter-fogg/studio-error-descriptor 
Allow Studio to display error modules.
 2013-08-23 11:51:57 -07:00
Vik Paruchuri
dfb8e9f0e3 Fix max score calculation 2013-08-23 13:48:59 -04:00
David Ormsbee
da829b1681 Make client-side capture work for photo IDs 2013-08-23 13:20:25 -04:00
Frances Botsford
0fabba1553 added vcert images and some fake js functionality for photos 2013-08-23 13:08:05 -04:00
Vik Paruchuri
7ff03124d2 pep8, pylint, and more tests 2013-08-23 12:30:18 -04:00
Will Daly
d89279f6b3 Merge pull request #773 from edx/lapentab/fix_network_tests 
Remove network calls in tests
 2013-08-23 09:07:31 -07:00
Will Daly
42ac76ce0c Merge branch 'master' into lapentab/fix_network_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
 2013-08-23 11:48:38 -04:00
Jonah Stanley
bda814fb8c Merge pull request #785 from edx/jonahstanley/fix-image-upload 
Changed error message on failure and made test more robust
 2013-08-23 08:48:00 -07:00
Vik Paruchuri
734843c377 Confirm changed to alert 2013-08-23 11:42:30 -04:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests 
Will/use mixed modulestore in tests
 2013-08-23 08:38:09 -07:00
David Ormsbee
3c79e81c9d default to a min price if we loose track of how much they wanted to pay 2013-08-23 11:37:34 -04:00
JonahStanley
473cc3624b Changed error message on failure and made test more robust 
Better error message
 2013-08-23 11:33:52 -04:00
Vik Paruchuri
e142023eed Add in Studio confirmation box before editing OE problems 2013-08-23 11:32:38 -04:00
Vik Paruchuri
b210346f62 Add in more tests 2013-08-23 11:17:03 -04:00
David Ormsbee
cbb259eb1f Allow amounts specified to actually work for purchasing certificates 2013-08-23 11:07:06 -04:00
Vik Paruchuri
4e8b839d14 Merge remote-tracking branch 'origin/master' into fix/vik/oe-state 2013-08-23 10:40:19 -04:00
Frances Botsford
cb16852313 completed styling on select a track for verification 2013-08-23 10:17:52 -04:00
David Ormsbee
2cdddef924 Remove useless critical log, remove unnecessary course_id escaping. 2013-08-23 01:27:08 -04:00
David Ormsbee
8ee9a96766 quick experiment to force student verification urls to be active 2013-08-23 01:02:23 -04:00