in XML deserializations, we can get get floats for start/stop times, so ...

Conflicts:
	lms/static/sass/views/_verification.scss

Make sure audit enrollments are really marked audit.

in XML deserializations, we can get get floats for start/stop times, so we need to be able to parse those

add test video with float-based end-time

Fix forums nav sidebar overlapping content

Remove unused XModuleDescriptor.get_sample_state method

Fix/cdodge/courseware index perf tweek

we already have the descriptor, so call get_module_for_descriptor() rather than refecting that subtree which is multiple round-trips to DB

fix line indents

apache lms wsgi fix

Revert "4 OE/ORA UI fixes to make it easier to use"

This reverts commit 3b29d605.

formulaequationinput: add capital greek letters and hbar to calc preview

Simplify retry logic for ui helper functions

Verification: Switch class-based Sass @extend rules to use Sass placeholder syntax

Skip verified cert acceptance tests that upload to s3

Verification: converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax

Hotfix 2013-09-16

Handle self-signed cert from Software Secure

Don't verify SSL cert when submitting to Software Secure (they're using self-signed cert for the moment).

4 OE/ORA UI fixes to make it easier to use

Verification: Copy/Light UI Pre-Launch Edits

Verification: adds in browser support links, icon-based button help tips, and technical support help info

- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos

Disabled broken test in master.

LMS: FIX - Header Logo and Global Nav Styling

Software Secure message signing pt. 2