Commits · 87294f386487b7b5b866eeafeadbe3fc035fb952 · edx / edx-ora2

14 Jul, 2014 3 commits

Merge pull request #491 from edx/grady/assessment-reorder · 87294f38
```
Render Assessment Templates in the order in which they are included
```
gradyward committed Jul 14, 2014
87294f38 Browse Files
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/assessment-reorder · 195dc62e
gradyward committed Jul 14, 2014

195dc62e Browse Files

Merge remote-tracking branch 'origin/master' into authoring · 0c026056

Conflicts:
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment.min.js
	openassessment/xblock/static/js/src/oa_server.js
	openassessment/xblock/static/sass/oa/utilities/_developer.scss
	openassessment/xblock/student_training_mixin.py
	openassessment/xblock/test/data/invalid_rubric.xml
	openassessment/xblock/test/test_student_training.py
	openassessment/xblock/test/test_studio.py
	openassessment/xblock/test/test_xml.py
	openassessment/xblock/xml.py

committed Jul 14, 2014

0c026056 Browse Files

11 Jul, 2014 11 commits
- Attempting to fix the template rendering · 9d60aef7
  gradyward committed Jul 11, 2014
  
  9d60aef7 Browse Files
- Merge pull request #490 from edx/grady/assessment-reorder · 9c0c1566
```
Grady/assessment reorder
```
  gradyward committed Jul 11, 2014
  9c0c1566 Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/assessment-reorder · 218d7513
```
Conflicts:
	openassessment/xblock/static/js/openassessment-lms.min.js
	openassessment/xblock/static/js/openassessment-studio.min.js
```
  gradyward committed Jul 11, 2014
  218d7513 Browse Files
- A refactoring of the Drag and Drop changes which now encorporates the OAEdit refactor. · e26f6eff
  gradyward committed Jul 11, 2014
  
  e26f6eff Browse Files
- Merge pull request #488 from edx/will/data-download-uses-read-replica · c3b36f0a
```
Use the read replica in the download data management command.
```
  Will Daly committed Jul 11, 2014
  c3b36f0a Browse Files
- Use the read replica in the download data management command. · 899ea6e0
  Will Daly committed Jul 11, 2014
  
  899ea6e0 Browse Files
- Merge pull request #489 from edx/will/move-authoring-js-files · 78078148
```
Authoring: Move JS server to common directory
```
  Will Daly committed Jul 11, 2014
  78078148 Browse Files
- Move JS server object into a common directory so it's shared with LMS and Studio · 5d6bcbbe
  Will Daly committed Jul 11, 2014
  
  5d6bcbbe Browse Files
- Update i18n translations · c4b88102
  Will Daly committed Jul 11, 2014
  
  c4b88102 Browse Files
- Merge pull request #487 from edx/grady/fix-styles · 3e3cef09
```
Fixed a number of styles that were damaged by the javascript and HTML refactor.
```
  gradyward committed Jul 11, 2014
  3e3cef09 Browse Files
- Fixed a number of styles · 11f81d4a
  gradyward committed Jul 11, 2014
  
  11f81d4a Browse Files
10 Jul, 2014 12 commits
- Merge pull request #484 from edx/sanchez/ORA-640-Disallow-Duplicate-Essays · 77e5d8e3
```
Better handling of duplicate training essays
```
  Stephen Sanchez committed Jul 10, 2014
  77e5d8e3 Browse Files
- Better handling of duplicate training essays · fc86f455
  Stephen Sanchez committed Jul 10, 2014
  
  fc86f455 Browse Files
- Merge pull request #486 from edx/will/split-up-js · 94a8ded7
```
Separate JavaScript for the LMS and Studio
```
  Will Daly committed Jul 10, 2014
  94a8ded7 Browse Files
- Merge pull request #485 from edx/will/js-refactor-assessment-editing · 59d63178
```
JS editor refactor
```
  Will Daly committed Jul 10, 2014
  59d63178 Browse Files
- Separate JavaScript for the LMS and Studio · 29b5a672
  Will Daly committed Jul 10, 2014
  
  29b5a672 Browse Files
- Merge remote-tracking branch 'origin/authoring' into will/js-refactor-assessment-editing · 2c3e8690
```
Conflicts:
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment.min.js
	openassessment/xblock/static/js/src/oa_edit.js
```
  Will Daly committed Jul 10, 2014
  2c3e8690 Browse Files
- Merge pull request #483 from edx/grady/modal-height · 64506f31
```
Changes the Modal Height when used for OpenAssessment Editing
```
  gradyward committed Jul 10, 2014
  64506f31 Browse Files
- Integrate container and container item into the rubric editing view. · a93984c0
```
Minify CSS.
```
  Will Daly committed Jul 10, 2014
  a93984c0 Browse Files
- A first pass at containers. · 7b793ad4
```
Restructred the container to be heavily reliant on DOM structure,
largely ignoring all unique identifiers and shrinking the implicit size
of the Container Item classes

Completed the initial pass of the Container Item Class.

Added tests and fixed major and minor issues.

Conflicts:
	openassessment/xblock/static/js/openassessment.min.js
```
  gradyward committed Jul 10, 2014
  7b793ad4 Browse Files
- Split up Studio view into subviews for each tab. · 85323091
```
Implement assessment editing views
```
  Will Daly committed Jul 10, 2014
  85323091 Browse Files
- Changes the Modal Height when used for OpenAssessment Editing · ec3819cf
  gradyward committed Jul 10, 2014
  
  ec3819cf Browse Files
- Merge pull request #481 from edx/sanchez/better-image-submission-errors · f4661727
```
Fixing error toggling for server-side errors.
```
  Stephen Sanchez committed Jul 10, 2014
  f4661727 Browse Files
09 Jul, 2014 4 commits
- Fixing error toggling for server-side errors. · ccbc7ea4
  Stephen Sanchez committed Jul 09, 2014
  
  ccbc7ea4 Browse Files
- Merge pull request #480 from edx/sanchez/dynamic-html-modification · 86a5d3be
```
Updating the studio mixin to deliver context with initial rendering
```
  Stephen Sanchez committed Jul 09, 2014
  86a5d3be Browse Files
- Updating the studio mixin to deliver context with initial rendering · de75db12
  Stephen Sanchez committed Jul 09, 2014
  
  de75db12 Browse Files
- Merge pull request #479 from edx/will/authoring-schema-validation · 318341cb
```
JavaScript client data validation
```
  Will Daly committed Jul 09, 2014
  318341cb Browse Files
08 Jul, 2014 3 commits
- Merge pull request #464 from edx/sanchez/TIM-645-Image-Submissions · 359d0c39
```
Allowing file based submissions for ORA2
```
  Stephen Sanchez committed Jul 08, 2014
  359d0c39 Browse Files
- Add schema validation for input from Studio JavaScript · 31b4b455
```
Use text inputs for dates
Make feedback prompt mandatory
```
  Will Daly committed Jul 08, 2014
  31b4b455 Browse Files
- Allowing file based submissions for ORA2 · 42cf8706
  Stephen Sanchez committed Jul 08, 2014
  
  42cf8706 Browse Files
07 Jul, 2014 5 commits
- Merge pull request #463 from edx/will/0-option-criterion · e5d1d4bd
```
Feedback-only criteria
```
  Will Daly committed Jul 07, 2014
  e5d1d4bd Browse Files
- Allow criteria with no options, just written feedback. · 8b54300f
  Will Daly committed Jul 07, 2014
  
  8b54300f Browse Files
- Merge pull request #475 from edx/will/update-migration · 14bc13f3
```
Update migration to add criterion_id to AssessmentPart
```
  Will Daly committed Jul 07, 2014
  14bc13f3 Browse Files
- Merge pull request #477 from edx/grady/unify-expand-collapse · aac44d75
```
Unified our expand collapse to be in line with Studio's
```
  gradyward committed Jul 07, 2014
  aac44d75 Browse Files
- Attempting to make our expand collapse experience the same as studios. · 94112c7f
  gradyward committed Jul 07, 2014
  
  94112c7f Browse Files
06 Jul, 2014 1 commit
- Add locks and a default value for the migration that adds criterion_id to assessmentpart · 99983049
  Will Daly committed Jul 06, 2014
  
  99983049 Browse Files
03 Jul, 2014 1 commit
- Merge pull request #472 from edx/sanchez/ORA-37-Explicit-Turbo-Mode · c19de519
```
ORA-37 Explicit action to begin turbo mode.
```
  Stephen Sanchez committed Jul 03, 2014
  c19de519 Browse Files