Commits · fdf7d331562b8dfb177b05c588e5ca5ad88d6fd3 · edx / edx-ora2

22 Jul, 2014 2 commits
- Reverted to some of the old logic now that we are not using codemirror · fdf7d331
  gradyward committed Jul 22, 2014
  
  fdf7d331 Browse Files
- Preserve the assessment order in the Studio editor. · d3729038
```
Conflicts:
	openassessment/xblock/static/js/openassessment-studio.min.js
```
  Will Daly committed Jul 22, 2014
  d3729038 Browse Files
21 Jul, 2014 6 commits
- Re-created styling for AI-XML authoring · 1a9537e5
  gradyward committed Jul 21, 2014
  
  1a9537e5 Browse Files
- Merge pull request #517 from edx/grady/styles · c2751736
```
Incorporated UX styling feedback and imporoved cross browser experience
```
  gradyward committed Jul 21, 2014
  c2751736 Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/styles · 106bb601
```
Conflicts:
	openassessment/xblock/static/js/openassessment-studio.min.js
```
  gradyward committed Jul 21, 2014
  106bb601 Browse Files
- Merge pull request #518 from edx/grady/ORA-674 · 6f82ccb1
```
Sets Default problem to include Labels for Criteria and Options
```
  gradyward committed Jul 21, 2014
  6f82ccb1 Browse Files
- Sets Default problem to include Labels for Criteria and Options · f5a43b97
  gradyward committed Jul 21, 2014
  
  f5a43b97 Browse Files
- Encorporated UX styling feedback and imporoved cross browser experience · bf3cacfd
  gradyward committed Jul 21, 2014
  
  bf3cacfd Browse Files
18 Jul, 2014 2 commits
- Merge pull request #514 from edx/grady/ORA-675 · ecd135f5
```
Changed the default tab to be Prompt, not Settings
```
  gradyward committed Jul 18, 2014
  ecd135f5 Browse Files
- Changed the default tab to be Prompt, not Settings · 387122ef
  gradyward committed Jul 18, 2014
  
  387122ef Browse Files
17 Jul, 2014 4 commits
- Merge pull request #508 from edx/grady/ORA-668 · ecba779b
```
Grady/Fix Assessment Rendering
```
  gradyward committed Jul 17, 2014
  ecba779b Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ORA-668 · 6f4b3a8c
```
Conflicts:
	openassessment/xblock/test/test_studio.py
```
  gradyward committed Jul 17, 2014
  6f4b3a8c Browse Files
- Fixed the Rendering Order of Assessment Modules · caf6afea
  gradyward committed Jul 17, 2014
  
  caf6afea Browse Files
- Javascript changes for Student Training Authoring · ee97c2d6
  gradyward committed Jul 17, 2014
  
  ee97c2d6 Browse Files
16 Jul, 2014 11 commits
- Merge pull request #503 from edx/will/authoring-label-for-criteria · fbd1e989
```
Authoring: label for criteria
```
  Will Daly committed Jul 16, 2014
  fbd1e989 Browse Files
- Update the edit rubric templates to include both a name and label for criteria and options · 1e49572f
```
Update container JS to retrieve both name and label for criteria and options

Update schema to make 'name' optional and 'label' required; the XBlock editor handler assigns UUIDs to criteria and options that don't have names

Assign labels to criteria/options if they do not have any

Update the grade template to display criteria/option labels if they're provided, otherwise use the 'name' field

Update student facing rubric templates to display the label if it's available

Add label field to XML problem definition.

Add label field to assessment

Add label field to the data dump script.

Update the turbo mode template to use option labels

Exclude the "name" key for new criteria and options in the JSON dict sent to the server.
Default new option points to 1 instead of NaN

Add data migration to fill in labels with default values
```
  Will Daly committed Jul 16, 2014
  1e49572f Browse Files
- Merge pull request #505 from edx/will/ora-661 · 9e75cf97
```
Fix date format in template
```
  Will Daly committed Jul 16, 2014
  9e75cf97 Browse Files
- Merge pull request #505 from edx/will/ora-661 · 209d2fa7
```
Fix date format in template
```
  Will Daly committed Jul 16, 2014
  209d2fa7 Browse Files
- Fix date format in template · a03bfd09
  Will Daly committed Jul 16, 2014
  
  a03bfd09 Browse Files
- Merge pull request #497 from edx/sanchez/allow_image_upload_editing · e84444c8
```
Wiring the Authoring GUI for allow image submissions
```
  Stephen Sanchez committed Jul 16, 2014
  e84444c8 Browse Files
- Wiring the Authoring GUI for allow image submissions · 5be535fa
  Stephen Sanchez committed Jul 16, 2014
  
  5be535fa Browse Files
- Merge pull request #502 from edx/grady/student-training-authoring-templates · a61a5ca2
```
Grady/student training authoring templates
```
  gradyward committed Jul 16, 2014
  a61a5ca2 Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into… · 927433f5
```
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/studio_mixin.py
```
  gradyward committed Jul 16, 2014
  927433f5 Browse Files
- Merge pull request #504 from edx/will/fix-js-minification · 749ee0e0
```
Fix JS minification in Makefile to use the new directory structure
```
  Will Daly committed Jul 16, 2014
  749ee0e0 Browse Files
- Fix JS minification in Makefile to use the new directory structure · cae7b621
  Will Daly committed Jul 16, 2014
  
  cae7b621 Browse Files
15 Jul, 2014 13 commits
- Merge remote-tracking branch 'origin/master' into authoring · 4f555761
```
Conflicts:
	openassessment/xblock/static/js/openassessment.min.js
	scripts/install-js.sh
```
  Will Daly committed Jul 15, 2014
  4f555761 Browse Files
- Added in templates for Student Training Authoring · b647d067
```
Included:
- HTML Templating using current problem defininition
- Styles
Not included:
- JavaScript changes
- Python test cleanup
```
  gradyward committed Jul 15, 2014
  b647d067 Browse Files
- Merge pull request #492 from edx/will/standardize-build-tools · ac69fa52
```
WIP: Standardize build tools using make
```
  Will Daly committed Jul 15, 2014
  ac69fa52 Browse Files
- Merge pull request #499 from edx/will/authoring-student-training-schema-validation · e132d976
```
Schema validation for student training examples
```
  Will Daly committed Jul 15, 2014
  e132d976 Browse Files
- Merge pull request #500 from edx/will/authoring-submission-date-fixup · e43ad942
```
Authoring date fixups
```
  Will Daly committed Jul 15, 2014
  e43ad942 Browse Files
- Merge pull request #501 from edx/will/small-unicode-fixup · e4f4988b
```
Remove unnecessary unicode type conversion
```
  Will Daly committed Jul 15, 2014
  e4f4988b Browse Files
- Merge pull request #496 from edx/grady/tab-memory · b315a7fe
```
Remembers which editor tab was last open
```
  gradyward committed Jul 15, 2014
  b315a7fe Browse Files
- Remove unnecessary unicode type conversion · 61e1fd03
  Will Daly committed Jul 15, 2014
  
  61e1fd03 Browse Files
- Fixup: use resolved submission start/due dates; use UTC for submission start/due in template · 2dbf649b
  Will Daly committed Jul 15, 2014
  
  2dbf649b Browse Files
- Merge remote-tracking branch 'origin/master' into authoring · 97a73124
```
Conflicts:
	openassessment/xblock/static/css/openassessment.css
```
  Will Daly committed Jul 15, 2014
  97a73124 Browse Files
- Schema validation for student training examples · 5e3a16fe
  Will Daly committed Jul 15, 2014
  
  5e3a16fe Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/tab-memory · 5f1144f1
```
Conflicts:
	openassessment/xblock/static/js/openassessment-studio.min.js
```
  gradyward committed Jul 15, 2014
  5f1144f1 Browse Files
- Merge pull request #495 from edx/grady/fix-option-deletion-wrapper · 2b17d244
```
Changed Wrapper Template Logic to not create un-wanted divs
```
  gradyward committed Jul 15, 2014
  2b17d244 Browse Files
14 Jul, 2014 2 commits
- Merge pull request #498 from edx/will/authoring-datetime-fields · 5ff23b48
```
Date and time pickers
```
  Will Daly committed Jul 14, 2014
  5ff23b48 Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into… · 84b85443
```
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/static/sass/oa/utilities/_developer.scss
```
  gradyward committed Jul 14, 2014
  84b85443 Browse Files