Seems like on chrome when cancel is hit in the file chooser, the 'changed' event is fired and startUpload() was being called. We need to check to see if the upload file is blank and - if so - just return immediately out of the function

Will/jenkins diff cover

Have the draft module store actively prevent non-leaf nodes from being

Fix encoding errors when hashing XML

In these tests, 'rendered_html' is neither rendered, nor HTML.  Name it context_repr, since that's what it is.

Feature user-management autoenroll

Use repr instead of str for getting context data via the system render function, so it works better for non-ASCII data.

partial fix for STUD-145, catch invalid location errors and return a HTT...

Allow a value of 0 for max attempts. STUD-264.

to `origin/master` instead of `master`)

saved as draft.

move url() wrapper into SASS variable

Merge hotfix-2013-06-07

Fix XSS vulnerability in instructor dashboard

fixing bug noticed in production

GST fixes

GST fixes. Removed red error messages preseneted to the user. The errors are now displayed when a flag is turned on. Added graphical_slider_tool tag to the list which shows staff debug info.

Valera/event tracking

We occasionally get UnicodeEncodeErrors from these two places,
because the XML is a Unicode string, and is implicitly encoded to ascii.

Jonahstanley/fix alert tests

Login/Register Page Headings Tweaks