-

*   e1666cc Merge commit 'd89bc1a7b3f64c99038716a4150b3f9267f742b9' into edge
|\  
| * 2101916 Draft-State Quizzes - "Save It Now" should work
| * df6be76 fix issue with republish quiz not working correctly pre-draft state
| * c1b4b88 fix issue with publishing a module not publishing quiz item correctly
| * 45d19f3 validate types on polymorphic associations
* |   6886e18 (refs/remotes/sfu/shoot-the-hostage, refs/remotes/origin/shoot-the-hostage, refs/heads/shoot-the-hostage) Merge commit 'db41b7613d94f689a7415d0855c9652bf76b689c' into shoot-the-hostage
|\ \  
| * | 2d502e8 (tag: refs/tags/release/2014-06-14.08) fix issue with republish quiz not working correctly pre-draft state
| * | 2643b7f (tag: refs/tags/release/2014-06-14.03) fix issue with publishing a module not publishing quiz item correctly
| |/  
| * 62ec134 active_polymorph
| * e1381ae publish and unpublish with the api instead of changing workflow state directly
| * 828981e define exportable attributes/associations on models
|/  
* 7692af0 move all importing methods into models/importers
* e576477 make quiz assignment creation appear in main stream items in the dashboard
* e0a5065 replace usages of Quiz#find_or_create_submission with SubmissionManager#find_or_create_submission
* 1cd4974 refactor SubmissionManager#create_or_update_submission
* 9c74ee4 move find_or_create_submission to own object
* 94f3b1b add submitted/unsubmitted quiz users endpoint to quizzes api
* 6dd6129 move quiz importing to individual class
* e95305f Quiz Reports API - Index
* 2c118f7 require a quiz to be republished when 'shuffle answers' is toggled
* 9195954 disable ability to regrade a question if they change the question type
* 4748aba extract canvas sort gem
* a290dba quiz namespace translation fix
* 98f1648 fix url for undeleting quizzes
* 306678e make Quiz#context_module_tags an association after all
* 08efec0 override Quiz#context_module_tags to find both content_types
* 1551a16 fix quiz namespacing versions hackage for rails 3
* e81fa1f fix quiz build_assignment for rails 3
* 54cb3ee fix version relationship for quizzes
* fcec131 Fix quiz titles in user access reports
* e1e466b fix content tag state synchronization
* ae81442 namespace all of quiz into quizzes module
* bdbcc1d add support for respondus monitor
* c873975 fix failing spec on quiz
* c3de268 explicitly save quiz submissions for rails 3 compatibility
* 9194449 convert sanitize field plugin into proper gem: CanvasSanitize
* be8f32a escape translations when manually building html, fixes CNVS-10769
* 1e81ea7 move quiz into quizzes namespace as a precursor to enginifying