| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| admin | ||
| candy_res | ||
| coffee | ||
| contrib | ||
| css/vendor | ||
| files | ||
| fonts | ||
| images | ||
| img | ||
| js | ||
| maintenance | ||
| sass | ||
| scripts | ||
| staff | ||
| .gitignore | ||
| .hgignore | ||
| green-pointer.png | ||
| js_test.yml | ||
| pixel.jpg | ||
| xmodule_js |
Squashed commits to facilitate cherry-picking. Committers and original commit messages are: - ==> @caesar2164, * ==> @jrbl, ~ ==> @jbau - Added boolean to OE problem CMS settings to turn on ICE track changes - Added ICE init and tracking start/stop to HTML - Conditional in Peer Grading HTML for ICE container - CSS styling for ICE container and insertion/deletion elements - Added class to track changes HTML - Added ice.min.js as well as included it in the js requirements for peer grading - Use track_changes in peer_grading_problem * Refactor peer_grading_problem to lookup track_changes variable by problem location. * Whitelist ICE insert, delete tags * Adds ICE multi-user-editor insert and delete tags to the peer grading sanitize_html whitelist. - add reset button * Introduction ICE means we need its inline tags to get passed through to the feedback target, but we don't want malicious peer feedback providers introducing <script>, etc, so we use lxml.html.clean to scrub peer grading input. * Adds feedback URL autoheating. * Allows ICE <insert> and <delete> tags but not others. ~ add helptext re: EXPERIMENTAL FEATURES ~ address a bunch of @VikParuchuri review comments on ICE for OEE ~ remove extraneous code ~ change to new xmodule accessors ~ refactor filtering ~ fix broken test test_peer_grading_problem ~ Create track_changes.coffee and remove <script> from peer_grading_problem.html ~ Remove all reliance on id in favor of local scoping and classes ~ bring up test coverage somewhat ~ remove superflous $.scrollTo ~ TODO: Filtering Conflicts: common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee common/lib/xmodule/xmodule/peer_grading_module.py lms/templates/peer_grading/peer_grading_problem.html
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| admin | Loading commit data... | |
| candy_res | Loading commit data... | |
| coffee | Loading commit data... | |
| contrib | Loading commit data... | |
| css/vendor | Loading commit data... | |
| files | Loading commit data... | |
| fonts | Loading commit data... | |
| images | Loading commit data... | |
| img | Loading commit data... | |
| js | Loading commit data... | |
| maintenance | Loading commit data... | |
| sass | Loading commit data... | |
| scripts | Loading commit data... | |
| staff | Loading commit data... | |
| .gitignore | Loading commit data... | |
| .hgignore | Loading commit data... | |
| green-pointer.png | Loading commit data... | |
| js_test.yml | Loading commit data... | |
| pixel.jpg | Loading commit data... | |
| xmodule_js | Loading commit data... |