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

194 Commits

Author SHA1 Message Date
ichuang
75e36e837e fixed mistake in capa_module missing ajax_url in string format 2012-06-05 23:14:32 -04:00
ichuang
61c4a1da3d fix dogfood.views and courseware.capa.responsetypes from merge; fix main.html 2012-06-05 22:16:26 -04:00
Calen Pennington
568ebad90a Merge remote-tracking branch 'origin/dogfood' into dogfood 2012-06-05 14:40:11 -04:00
Calen Pennington
8575ed439d Merge branch 'master' into dogfood 
Conflicts:
	djangoapps/courseware/capa/responsetypes.py
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/html_module.py
	djangoapps/courseware/modules/seq_module.py
	djangoapps/courseware/modules/x_module.py
	djangoapps/courseware/views.py
	templates/main.html
	templates/problem.js
	templates/textbox.html
 2012-06-05 14:38:49 -04:00
ichuang
fc791ad852 more minor exception handling changes to capa_module 2012-06-05 13:22:24 -04:00
ichuang
c54f895199 cleaned up exception handling in capa_module 2012-06-05 13:12:04 -04:00
ichuang
b36d0dd907 raise helpful error in NumericalResponse when missing required "answer" attribute 2012-06-04 18:13:49 -04:00
ichuang
613ff49df9 use getattr(system,'DEBUG',False) in capa_problem, and log.error in responsetypes 2012-06-04 17:29:56 -04:00
ichuang
c124bb95fb move quickedit* from courseware.views to dogfood.views ; now dogfood 
is completely contained within lib/dogfood, and it can be cleanly unplugged
from the rest of the code.
 2012-06-04 17:19:05 -04:00
Calen Pennington
7cf4b1597c Be more direct about where modx_dispatch is located and where it is used 2012-06-04 09:19:00 -04:00
ichuang
dc84a20ff5 improve error handling in external response; centralize interaction 
with external server into ExternalResponse.do_external_request
 2012-06-03 07:43:18 -04:00
ichuang
1aa05fd400 externalresponse fixes; clean up semantics of interface, add command 
for getting expected answer from external server, add error handling,
extend to use json for multiple input fields, added rows & cols to
textbox inputtype for code input.
 2012-06-02 23:06:11 -04:00
ichuang
efdcf7096c symbolicresponse.xml test file 2012-06-02 18:59:54 -04:00
ichuang
164e17a8d7 symbolicresponse test cases; tests pass. improved some error handling, 
cleaned up some cruft prints -> logging
 2012-06-02 18:58:58 -04:00
ichuang
2f33bce7ad symbolic math: add <symbolicresponse> type; improve error handling in 
symmath library; add options for matrices, qubit to symmath_check
 2012-06-02 17:17:48 -04:00
ichuang
1e0475c10b minor change to capa_module: fp needs name when using stringio for error 2012-06-02 10:00:41 -04:00
ichuang
52e1f17882 if DEBUG, if one problem is bad don't crash with error message; instead 
capture the error message and traceback and show this as the problem text.
 2012-06-02 09:47:37 -04:00
ichuang
e17668540f dynamic math - changes to javascript, responsetypes, and inputtypes 
main.html now includes mathjax_include for all mathjax stuff
problem.js refreshes mathjax formulas on change
all previous *_fromjs renamed to *_dynamath, eg textline_dynamath
 2012-06-01 22:39:50 -04:00
Bridger Maxwell
e24df47b0b Small bug fix causing crash when generating problem histogram. 2012-06-01 17:34:04 -04:00
Bridger Maxwell
0ad31f556f The modx_dispatch import hack is added back in. Without it, the urls.py file was broken. 2012-06-01 17:22:34 -04:00
Calen Pennington
b2477de7b4 Remove unused imports 2012-06-01 16:37:11 -04:00
Calen Pennington
d49d0b9119 Remove render_module in favor of render_x_module 2012-06-01 16:37:03 -04:00
Calen Pennington
794022733d Do json dumping and </script> replacement as close to the template as possible 2012-06-01 16:34:00 -04:00
Piotr Mitros
16f0da19b0 Merge branch 'master' into pmitros/dexml 2012-06-01 16:00:48 -04:00
ichuang
41996faede changed another debug print to use logging (module_render) 2012-06-01 15:01:34 -04:00
ichuang
b1b08d2989 made "position" a generic parameter passed to all modules, from courseware.views.index 2012-06-01 14:34:26 -04:00
ichuang
7fbc4d7f4f removed django.settings imports from modules/* ; changed debug prints 
to use logging; added DEBUG attr to XModule class
 2012-06-01 13:49:19 -04:00
ichuang
a42ea2ca39 removed debug "if false" line in module_render 2012-06-01 13:42:50 -04:00
Piotr Mitros
be1e308dc9 Cale's fix for eval/extra json encode 2012-06-01 12:56:20 -04:00
Calen Pennington
b574dcb8e8 Check for None with is rather than == 2012-06-01 12:18:43 -04:00
Calen Pennington
71e25d9b4b According to the elementtree spec, elements with no children test as false. We only want to skip checking for module ids if the module is actually not found 2012-06-01 12:02:40 -04:00
Piotr Mitros
7567e5ebf9 Working snapshot. Simple get_children. get_module taken out of render_module. 2012-06-01 10:29:12 -04:00
Piotr Mitros
98d8f4b55b Unstable commit; syncing computers 2012-05-31 21:12:08 -04:00
Piotr Mitros
97c6a26c2b Merge master 2012-05-31 13:47:50 -04:00
Piotr Mitros
34dc32e5aa Unstable state; need to merge from master 2012-05-31 13:44:45 -04:00
Prem Sichanugrist
92971127b3 Minor code style and assets fix 
* Change looping code style in seq_module
* Clone and keep the latest version of jasmine-jquery locally
* Use django-pipeline asset tags
 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
8a87a4ba8b Make staff problem histogram work again 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
80ba9bd0ff Remove unused init_js and destroy_js 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
59b453488a Rewrite Tab module, refactor Sequence module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
1abe15d4d9 Rewrite Problem module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
80c97c6592 Refactor module loading using class detection 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
8624927fc4 Rewritten video module 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
0b26609846 Rewrite Sequence module to use unobtrusive JS 2012-05-31 13:24:23 -04:00
ichuang
3d925f29ee new "jumpto": go directly to a specific problem. changes made to 
urls, courseware.{views,module_render}, comments added to seq_module
 2012-05-29 23:32:02 -04:00
ichuang
27f5826e34 content_parser: use logging for errors 2012-05-29 23:22:10 -04:00
ichuang
bb37f2019b capa_problem: convert print of errors into log.* 2012-05-29 23:21:22 -04:00
ichuang
cc02962eb4 add @ensure_csrf_token to courseware.views.index 2012-05-29 17:54:45 -04:00
ichuang
87cda4c282 make imageinput work with dogfood, fix typo in responsetypes.imageresponse 2012-05-29 17:06:15 -04:00
ichuang
e5a7d811d7 multiplechoice inputs: allow <choice ...>item text</choice> format 2012-05-28 14:08:26 -04:00
ichuang
074fde6762 add mode and linenumbers options to textbox inputtype 2012-05-28 13:34:30 -04:00