Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,917 Commits 1 Branch 0 Tags
04fcebaf4740586c67fdbebf0c8a31db26d95f83
Commit Graph

55 Commits

Author SHA1 Message Date
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks 
[LMS-179]
[LMS-209]
[LMS-1345]
 2014-02-05 13:02:40 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00
cahrens
367ea683bd Support non-ascii chars as arguments to format. 
We've had errors in export related to non-ascii chars being passed to format. Proactively making these usages of format robut to non-ascii chars.

Part of STUD-868
 2013-12-20 14:55:07 -05:00
Calen Pennington
b4a1840344 Move xmodule_runtime.xmodule_instance registration earlier 
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).

[LMS-1493]
 2013-11-20 10:15:09 -05:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class 
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
 2013-10-08 15:29:17 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Felix Sun
444f51d6de Fixed some pep/pylint violations. 2013-08-27 09:46:02 -04:00
Felix Sun
74ed2dafb3 Improved docstrings. 2013-08-26 09:40:06 -04:00
Felix Sun
e6067d8814 Addressed PR comments. 
Fixed coffeescript event logging error.

Fixed crowdsourced hinter dependence on self.field.append() not working.
 2013-08-26 09:40:05 -04:00
Felix Sun
f3c3436f41 Addressing more PR comments. Fixed a test that broke when new code came in. 2013-08-26 09:40:04 -04:00
Felix Sun
d6715749dc Addressed pull request comments. 
Fixed broken tests.
 2013-08-26 09:40:04 -04:00
Felix Sun
e6db6e9ea3 Fixed bug where user isn't asked to submit a hint unless he's seen a hint. 2013-08-26 09:40:04 -04:00
Felix Sun
544aa55e43 Added comments to explain confusing field names in crowdsource_hinter. 
Fixed some pep8 errors.
 2013-08-26 09:40:04 -04:00
Felix Sun
e2aea75f16 Fixed a bug in recording hints shown. 
Removed the answer display next to voting.  (This was deemed distracting.)
 2013-08-26 09:40:04 -04:00
Felix Sun
d9517ea13e Fixed tests for removing hash access to hints. Fixed instructor view for same. 2013-08-26 09:40:04 -04:00
Felix Sun
8ce53ed8eb Got rid of answer signatures - these don't work with approximate answers at all. Instead, implemented comparison-based hint matching. 
Tests are broken, hint manager is probably broken.
 2013-08-26 09:40:03 -04:00
Felix Sun
4ee8111cf4 Fixed monkey-patching persistent state bug. 2013-08-26 09:40:03 -04:00
Felix Sun
6b40c5cf13 Changed hint voting ui to show all hints on one page. 
Fixed broken tests for hint manager.
 2013-08-26 09:40:03 -04:00
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
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
Felix Sun
6c55726134 Fixed naming error in crowdsource_hinter. (Introduced in git merge.) 2013-07-09 14:34:21 -04:00
Felix Sun
596e1ead29 Merge branch 'felix/hinter2' of https://github.com/edx/edx-platform into felix/hinter2 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
 2013-07-09 13:28:27 -04:00
Felix Sun
3418feba52 Added error logging for unparsable answers. 2013-07-09 13:26:02 -04:00
Carlos Andrés Rocha
dd8f1f5385 Rename get to data in crowdsourced hinter module 2013-07-08 09:55:06 -04:00
Felix Sun
bc1dea3de1 Fixed bug: When student submits empty string, hinter returns a 500 error. 
Added tests to catch said bug.

Fixed some pylint violations.
 2013-07-08 09:55:06 -04:00
Felix Sun
b68c117854 Fixed bug: When student submits empty string, hinter returns a 500 error. 
Added tests to catch said bug.

Fixed some pylint violations.
 2013-07-08 09:05:29 -04:00
Felix Sun
560cd9b068 Fixed bug when user votes w/o permission - now displays a friendly error message instead of failing. 
Fixed bug when hinter module displays a hint, then is asked to display nothing.  (Used to not update in this case.)
 2013-07-02 09:54:56 -04:00
Felix Sun
09d3ca0ab6 Fixed bug when user votes w/o permission - now displays a friendly error message instead of failing. 
Fixed bug when hinter module displays a hint, then is asked to display nothing.  (Used to not update in this case.)
 2013-07-02 09:40:47 -04:00
Felix Sun
15317de252 Made explanation for hints field in crowdsource_hinter.py more clear. 
Fixed various commenting things.

Removed an unused function in the crowdsourced module coffeescript.

Improved commenting in hint_manager.

Fixed pep and pylint violations.
 2013-07-01 19:05:31 -04:00
Carlos Andrés Rocha
d6631e5c3d Improve styling of the crowdsource hinter 2013-07-01 19:05:31 -04:00
Felix Sun
728ccd4bca Fixed some docstring formatting things. 
Expanded test coverage a little.
 2013-07-01 18:03:36 -04:00
Felix Sun
4071a57f68 Fixed broken tests. Made the hint manager enabled in testing environments - this lets us test the hint manager. 2013-07-01 18:03:36 -04:00
Felix Sun
696cc3a4db Fixed numerous code-formatting issues and pep8 violations. 
Began enforcing one-vote-per-person.  This can be disabled with debug="True" in the <crowdsource_hinter> tag.

Started tests of the hint manager.
 2013-07-01 18:03:36 -04:00
Felix Sun
d57380dd2e Moved the hinter rendering onto a mako template. 
Hinter now displays vote count after voting.

Began testing templates.
 2013-07-01 18:03:36 -04:00
Felix Sun
4a406901b3 Moved the crowdsourced hinter module into mako template form. 
Fixed some bugs in the tests for crowdsourced hinter.
 2013-07-01 18:03:36 -04:00
Felix Sun
93d457de54 Fixed epic git rebase meltdown. No new features. 2013-07-01 18:03:35 -04:00
Felix Sun
2088da4edc Made tests of the crowdsource hinter module more standardized and easier to read. Fixed database non-initialization bug in crowdsource hinter module. 2013-07-01 18:03:35 -04:00
Felix Sun
0c0de20a2f Began work on instructor view to hinting system. 
Added moderation feature - you can now choose to hold all hints for moderator approval before showing.
 2013-07-01 18:03:35 -04:00
Felix Sun
415ea63bc0 Working prototype of crowdsourced hinting module. 
Conflicts:
	common/static/coffee/src/logger.coffee
 2013-07-01 18:03:35 -04:00
Felix Sun
0c4d6ba6d9 Made explanation for hints field in crowdsource_hinter.py more clear. 
Fixed various commenting things.

Removed an unused function in the crowdsourced module coffeescript.

Improved commenting in hint_manager.

Fixed pep and pylint violations.
 2013-07-01 11:52:52 -04:00
Carlos Andrés Rocha
0b25e76194 Improve styling of the crowdsource hinter 2013-07-01 10:34:20 -04:00
Felix Sun
970a7f0916 Fixed some docstring formatting things. 
Expanded test coverage a little.
 2013-07-01 10:25:04 -04:00
Felix Sun
6890563d43 Fixed broken tests. Made the hint manager enabled in testing environments - this lets us test the hint manager. 2013-07-01 10:25:04 -04:00
Felix Sun
ab303e7567 Fixed numerous code-formatting issues and pep8 violations. 
Began enforcing one-vote-per-person.  This can be disabled with debug="True" in the <crowdsource_hinter> tag.

Started tests of the hint manager.
 2013-07-01 10:25:04 -04:00
Felix Sun
c79ca38f6e Moved the hinter rendering onto a mako template. 
Hinter now displays vote count after voting.

Began testing templates.
 2013-07-01 10:25:04 -04:00