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
Name |
Last commit
|
Last update |
---|---|---|
.tx | Loading commit data... | |
cms | Loading commit data... | |
common | Loading commit data... | |
conf/locale | Loading commit data... | |
docs | Loading commit data... | |
i18n | Loading commit data... | |
jenkins | Loading commit data... | |
lms | Loading commit data... | |
proxy | Loading commit data... | |
rakelib | Loading commit data... | |
requirements | Loading commit data... | |
scripts | Loading commit data... | |
test_root | Loading commit data... | |
ws_migrations | Loading commit data... | |
.gitattributes | Loading commit data... | |
.gitignore | Loading commit data... | |
.pep8 | Loading commit data... | |
.reviewboardrc | Loading commit data... | |
.ruby-gemset | Loading commit data... | |
.ruby-version | Loading commit data... | |
AUTHORS | Loading commit data... | |
CHANGELOG.rst | Loading commit data... | |
Gemfile | Loading commit data... | |
LICENSE | Loading commit data... | |
README.md | Loading commit data... | |
Vagrantfile | Loading commit data... | |
manage.py | Loading commit data... | |
package.json | Loading commit data... | |
pylintrc | Loading commit data... | |
rakefile | Loading commit data... | |
setup.cfg | Loading commit data... |