Commits · a03bfd09cdf0d74429f9f0b71fe8dfbe9e42f35a · edx / edx-ora2

16 Jul, 2014 7 commits
- 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 13 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
- Add time fields to the OA editing views · 9e8451a1
```
Use resolve dates for default date values
```
  Will Daly committed Jul 14, 2014
  9e8451a1 Browse Files
- Remember which editor tab was last open. · fb30adba
  gradyward committed Jul 14, 2014
  
  fb30adba Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/fix-option-deletion-wrapper · 0dfc8fe6
```
Conflicts:
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment-lms.min.js
```
  gradyward committed Jul 14, 2014
  0dfc8fe6 Browse Files
- Merge pull request #494 from edx/grady/fix-delete-option · dfb87ab4
```
Narrowed the scope of selection for delete button selection.
```
  gradyward committed Jul 14, 2014
  dfb87ab4 Browse Files
- Narrowed the scope of selection for delete button selection. · 0c52251e
```
Fixed TIM-650
```
  gradyward committed Jul 14, 2014
  0c52251e Browse Files
- Changed Wrapper Template Logic to not create un-wanted divs · 0c1cee0d
  gradyward committed Jul 14, 2014
  
  0c1cee0d Browse Files
- 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 pull request #493 from edx/will/minify-css · 265c580c
```
Minify CSS
```
  Will Daly committed Jul 14, 2014
  265c580c 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
```
  Will Daly committed Jul 14, 2014
  0c026056 Browse Files
- Minify CSS · b65b6e44
  Will Daly committed Jul 14, 2014
  
  b65b6e44 Browse Files
13 Jul, 2014 1 commit

Standardize build tools using make · a291f4a9

Quiet the doc and i18n scripts
Add locale to i18n script
Use PhantomJS as the headless test runner.
Refactor file upload tests

committed Jul 13, 2014

a291f4a9 Browse Files

11 Jul, 2014 6 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