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

6046 Commits

Author SHA1 Message Date
Valera Rozuvan
ba954ff164 Fixing code as per suggestions on PR 771. 2013-08-28 17:01:02 +03:00
Valera Rozuvan
e788d6ce37 Added Jasmine test for bug fix. Updated comments. 2013-08-28 17:01:02 +03:00
Valera Rozuvan
4936b5044b Fix for bug BLD-277 
"There is a white panel over a non-youtube video."
When the captions file is not specified, we simply do not render the captions panel.
 2013-08-28 17:01:02 +03:00
Ned Batchelder
3194e54400 Merge pull request #805 from edx/ned/fix-allow-comments-in-capa-xml 
Keep comments in capa XML from causing failures
 2013-08-28 06:58:51 -07:00
ichuang
493d8d26e5 add sample tabs to test_import_course 2013-08-27 20:04:55 -04:00
ichuang
d8345b4b39 fix course tabs from being imported with display_name=None due to overwriting policy 2013-08-27 19:39:40 -04:00
Will Daly
4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed 
Integrate js-test-tool into testing infrastructure
 2013-08-27 14:09:13 -07:00
Jay Zoldak
c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools 
Cleaned up files with muliline imports

Cleaned up files that do not use these imports

Misread comment
 2013-08-27 16:21:33 -04:00
chrisndodge
e3810b7576 Merge pull request #799 from edx/fix/ichuang/inheritance-needs-videosequence 
FIX: videosequence was not inheriting metadata, eg start date
 2013-08-27 13:07:58 -07:00
Calen Pennington
4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup 
One time startup centralization
 2013-08-27 12:19:42 -07:00
Will Daly
88b28ae0b6 Merge pull request #808 from edx/will/randomize-cms-mongo-collections 
Use randomized mongo collection names in Studio tests
 2013-08-27 10:58:49 -07:00
Felix Sun
b5e1d57e28 Merge pull request #442 from edx/felix/formula-hints 
Crowdsourced Hints - "0.2 release"
 2013-08-27 10:26:25 -07:00
Will Daly
e50a2414b2 Studio ModuleStoreTestCase subclasses now use randomized Mongo 
collection names
 2013-08-27 12:57:14 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
Ned Batchelder
2c544cb0bd A test that our XML-comments fix works. 2013-08-27 11:44:41 -04:00
Ned Batchelder
ca7c002ca9 Keep comments in capa XML from causing failures 
Comments (and processing instructions!) are handled oddly in lxml.
This change will keep them from causing failures.  They will be omitted
from the HTML generated, which is fine, since they aren't needed there.
 2013-08-27 11:08:22 -04:00
Vik Paruchuri
0e4b114278 Merge pull request #633 from edx/fix/vik/oe-state 
Fix/vik/oe state
 2013-08-27 07:01:32 -07:00
Felix Sun
444f51d6de Fixed some pep/pylint violations. 2013-08-27 09:46:02 -04:00
Anton Stupak
dd9b16c2cf Replace the description in the studio editing module. 2013-08-27 15:22:47 +03:00
ichuang
83f8b033ea fix common/lib/xmodule/xmodule/modulestore/mongo/base.py 2013-08-26 20:23:11 -04:00
ichuang
4d73961a44 'videosequence' and 'proctor' need to be in inheritable moduletypes in 
modulestore/mongo/base.py
 2013-08-26 20:22:25 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Vik Paruchuri
3c55a44b6b Address review comments 2013-08-26 10:36:24 -04:00
Felix Sun
74ed2dafb3 Improved docstrings. 2013-08-26 09:40:06 -04:00
Felix Sun
1f9eafeede Addressed some minor PR comments. 2013-08-26 09:40:06 -04:00
Felix Sun
68bb45ab67 Added jasmine tests to crowdsource_hinter. UI is not covered; only event-inteception is covered. 2013-08-26 09:40:05 -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
69fbe77dcb Fixed a rebase error in responsetypes. 
Fixed a css bug in the hinter.
 2013-08-26 09:40:05 -04:00
Felix Sun
4220252055 Fixed terribly annoying issues with back button. Back button is now on 
the bottom of the hint div, no matter what.
 2013-08-26 09:40:05 -04:00
Felix Sun
2d1c9158d8 Added fancy sliding transitions into hint collection page. 2013-08-26 09:40:05 -04:00
Felix Sun
35a8e9be32 Some fixes on hint ui. 2013-08-26 09:40:05 -04:00
Felix Sun
7c93b45d0c Added wizard / slideshow style hint collection script. 
Still requires a little polishing, I think.
 2013-08-26 09:40:05 -04:00
Felix Sun
64c91cf239 UX improvements to hinting. Interface is now less cluttered. 
Hint submission is hidden behind a link, if there are hints to vote on.
 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
eb5a90a3ed Added tests for validate_answer in response types. 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
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