- 15 Sep, 2013 1 commit
-
-
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
Giulio Gratta committed
-
- 13 Sep, 2013 39 commits
-
-
keep-bson-in-mongo-code
Ned Batchelder committed -
Conflicts: common/lib/xmodule/xmodule/modulestore/mongo/draft.py lms/djangoapps/courseware/tests/modulestore_config.py
Diana Huang committed -
Hotfix 09/13/2013
Diana Huang committed -
Don't try and modify the location proproperty
Calen Pennington committed -
fix-setattr-and-getattr
Ned Batchelder committed -
Jarv/grade dump
John Jarvis committed -
Send JSON messages to Software Secure in UTF-8, without escaping
David Ormsbee committed -
LMS: Header Logo/Brand alt Attribute Value Fix
Brian Talbot committed -
Verification: Copy/Instruction Edits
Brian Talbot committed -
David Ormsbee committed
-
Brian Talbot committed
-
Calen Pennington committed
-
Brian Talbot committed
-
Ned Batchelder committed
-
Ned Batchelder committed
-
Make URL patterns to exclude from tracking configurable
Gabe Mulley committed -
Add ARIA dialog role to Markdown editor dialogs
Greg Price committed -
Show order errors in page instead of in an alert.
Diana Huang committed -
Fix/vik/pg hotfix
Vik Paruchuri committed -
Frances Botsford committed
-
Small fixes for unicode
David Ormsbee committed -
fix default for VERIFY_STUDENT in lms/envs/aws.py
Jason Bau committed -
Frances Botsford committed
-
David Ormsbee committed
-
David Ormsbee committed
-
* Add unit test coverage for this "exclusion from tracking" logic * Exclude based on regex match instead of raw string comparison * Exclude heartbeat requests from tracking
Gabe Mulley committed -
Help Modal - Accessibility Fixes
James Tauber committed -
Conflicts: common/lib/xmodule/xmodule/tests/test_peer_grading.py
Vik Paruchuri committed -
Vik Paruchuri committed
-
Vik Paruchuri committed
-
Vik Paruchuri committed
-
Vik Paruchuri committed
-
Verification Process: Copy Changes
Brian Talbot committed -
define a unseeding forums permissions and call into it from delete_cours...
chrisndodge committed -
Brian Talbot committed
-
refactor some code out of the django-admin entry point into a help function in CMS. Update tests to use new method
Chris Dodge committed -
Removed an inclusion of t-copy-sub1 in SCSS for Video.
Valera Rozuvan committed -
This line was not doing anything and simply causing a warning while SASS was compiling. The following is the warning: --- WARNING on line 35 of /home/valera/edx_all/edx-platform/common/static /xmodule/descriptors/css/_000-5df8e10160f918d31f2b2e8be3ce247d.scss: ".xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .edit-header .component-name" failed to @extend ".t-copy-sub1". The selector ".t-copy-sub1" was not found. Use "@extend .t-copy-sub1 !optional" if the extend should be able to fail. ---
Valera Rozuvan committed -
fix bug with anonymous access to / with future start courses
Jason Bau committed
-