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

56 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
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
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
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
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
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
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
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
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
5729d013f4 in DEBUG mode, fail gracefully if a problem file is missing (capa_module) 2012-05-28 11:02:33 -04:00
ichuang
41a539ed1f html_module should render_to_string from namespace "course", not "main" 2012-05-27 20:07:38 -04:00
Piotr Mitros
2c2072dae3 Converted to use more semantic tags. Working snapshot. 2012-05-27 07:39:09 -04:00
Piotr Mitros
32c50090eb Very draft/prototype edits. Moving CMS components in LMS. 2012-05-21 19:27:00 -04:00
Piotr Mitros
0e3349706a Fix minor bugs, commenting out future code 2012-05-17 15:48:47 -04:00
Piotr Mitros
cad13b30a1 Passing i4x system deeper into capa_problem 2012-05-17 15:37:08 -04:00
Isaac Chuang
ad44882835 Ike's changes to enable multicourse, new response types, etc. 2012-05-16 21:18:47 -04:00
Calen Pennington
02bb23f46a Minor formatting cleanup 2012-05-15 10:55:57 -04:00
Piotr Mitros
85079da3a7 Minor bug fix/conflict between grades and i4xsystem 2012-05-12 15:03:20 -04:00
Isaac Chuang
668062a19b Minor cleanups to capa_module (comments, formatting, etc.) 2012-05-11 17:02:06 -04:00
Lyla Fischer
72dee8ba14 merge with master 2012-05-11 13:17:52 -04:00
pmitros
de4e22a344 Merge pull request #39 from MITx/ps-fix-reset-answer 
Do not double-append the XML path in caps module
 2012-05-10 16:32:05 -07:00
Prem Sichanugrist
d879db5e10 Do not double-append the XML path in caps module 
This fixes the bug in answers reset feature
 2012-05-10 19:08:51 -04:00
Lyla Fischer
a4dae57751 merge with master 2012-05-10 12:25:33 -04:00
Calen Pennington
5011f60d45 Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py
 2012-05-10 09:17:26 -04:00
Calen Pennington
6b10c0760b Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/student/views.py
 2012-05-08 13:54:57 -04:00
Lyla Fischer
eb95ea9e2f Merge branch 'master' into MC 2012-05-07 22:17:37 -04:00
Piotr Mitros
f187a9e312 Capa no longer requires local filestore 2012-05-07 21:24:40 -04:00
Lyla Fischer
13a095fc1e checkboxes 2012-05-07 21:04:10 -04:00
Piotr Mitros
aab9b15cd4 Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename. 2012-05-07 20:59:08 -04:00
Piotr Mitros
e1ac5e9f30 Moved extra settings into state. Added fs module for aux content 2012-05-07 20:13:30 -04:00
Calen Pennington
49f402e3e7 Remove debug print statements 2012-05-07 14:56:27 -04:00
Piotr Mitros
ddcf68362a Videos now support annotations w/o verticals 2012-05-07 10:42:48 -04:00
Calen Pennington
0871d95f98 Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository 2012-04-30 15:18:47 -04:00