Commits · fa6df96d828b4f768e35583f366a2683fe9eb1ed · edx / edx-ora2 · GitLab

24 Jul, 2014 9 commits
- Wiring in validation JS · fa6df96d
  Stephen Sanchez committed Jul 24, 2014
  
  fa6df96d Browse Files
- First draft · 32f0c4ff
  gradyward committed Jul 24, 2014
  
  32f0c4ff Browse Files
- WIP: Alert funcitonality for Rubric/Settings crossvalidation · 7af5a24c
  gradyward committed Jul 24, 2014
  
  7af5a24c Browse Files
- Merge pull request #522 from edx/grady/ai-authoring · 59c9ba27
```
Grady/ai authoring
```
  gradyward committed Jul 24, 2014
  59c9ba27 Browse Files
- Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/ai-authoring · 58f45d79
```
Conflicts:
	openassessment/xblock/defaults.py
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment-studio.min.js
	openassessment/xblock/studio_mixin.py
	openassessment/xblock/test/data/invalid_update_xblock.json
	openassessment/xblock/test/data/update_xblock.json
	openassessment/xblock/test/test_studio.py
```
  gradyward committed Jul 24, 2014
  58f45d79 Browse Files
- Merge branch 'master' into authoring · 189d18c7
  Will Daly committed Jul 24, 2014
  
  189d18c7 Browse Files
- Merge pull request #530 from edx/will/fix-tests · 17bbb3e6
```
Fix test settings so all non-acceptance tests run
```
  Will Daly committed Jul 24, 2014
  17bbb3e6 Browse Files
- Fix test settings so all non-acceptance tests run · 76f62a02
  Will Daly committed Jul 24, 2014
  
  76f62a02 Browse Files
- Merge branch 'master' into authoring · ef0af861
  Will Daly committed Jul 24, 2014
  
  ef0af861 Browse Files
23 Jul, 2014 11 commits
- Merge pull request #525 from edx/will/update-i18n-strings · cf19d9ad
```
Update i18n strings
```
  Will Daly committed Jul 23, 2014
  cf19d9ad Browse Files
- Merge pull request #524 from edx/will/more-i18n-automation · 52820d62
```
More i18n automation
```
  Will Daly committed Jul 23, 2014
  52820d62 Browse Files
- Merge pull request #526 from edx/will/fix-makefile-test-cmd · a13cc165
```
Add phony target to Makefile for test and install
```
  Will Daly committed Jul 23, 2014
  a13cc165 Browse Files
- Fix import error caused by naming a package "selenium" · 33b9ee81
```
Install bok-choy
```
  Will Daly committed Jul 23, 2014
  33b9ee81 Browse Files
- Merge pull request #528 from edx/will/small-template-fixup · aee100b2
```
Fix a small HTML error in the editor template
```
  Will Daly committed Jul 23, 2014
  aee100b2 Browse Files
- Merge pull request #527 from edx/grady/ux-tweaks · e454e166
```
Added simple changes to correct the Problem Icon and Display Name
```
  gradyward committed Jul 23, 2014
  e454e166 Browse Files
- Fix a small HTML error in the editor template · 6611614f
  Will Daly committed Jul 23, 2014
  
  6611614f Browse Files
- Added simple changes to correct the Problem Icon and Display Name · d5cbfb67
  gradyward committed Jul 23, 2014
  
  d5cbfb67 Browse Files
- Add phony target to Makefile for test and install · a03196c7
  Will Daly committed Jul 23, 2014
  
  a03196c7 Browse Files
- Update i18n strings · 96559640
  Will Daly committed Jul 23, 2014
  
  96559640 Browse Files
- Remove i18n from test commands · 6ccb842f
```
Update i18n scripts and README
```
  Will Daly committed Jul 23, 2014
  6ccb842f Browse Files
22 Jul, 2014 7 commits
- Changed the call mechanism from examples to examples_xml to differentiate for validation · 64e90768
  gradyward committed Jul 22, 2014
  
  64e90768 Browse Files
- Reverted to some of the old logic now that we are not using codemirror · fdf7d331
  gradyward committed Jul 22, 2014
  
  fdf7d331 Browse Files
- Merge pull request #515 from edx/will/ora-673 · eefe1b46
```
Preserve the assessment order in the Studio editor.
```
  Will Daly committed Jul 22, 2014
  eefe1b46 Browse Files
- Preserve the assessment order in the Studio editor. · e54de8fc
  Will Daly committed Jul 22, 2014
  
  e54de8fc Browse Files
- Merge pull request #520 from edx/grady/styles · 12fb495a
```
Polishing Style Changes, and Resize Responsiveness
```
  gradyward committed Jul 22, 2014
  12fb495a 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
- Allowed narrow window editing, and ensured solid transitions · 6f3bb708
  gradyward committed Jul 22, 2014
  
  6f3bb708 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 3 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
- Merge pull request #513 from edx/will/student-training-test · 8b07411a
```
More selenium
```
  Will Daly committed Jul 18, 2014
  8b07411a Browse Files
17 Jul, 2014 4 commits
- Save screenshots on selenium test failure · 97eb3771
```
Add a selenium test for peer-only

Move bok-choy into its own requirements file

Fix import errors in test course

Add tests for student training

Add retry with exponential backoff
```
  Will Daly committed Jul 17, 2014
  97eb3771 Browse Files
- 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