Commits · ac8e41f02b7f7e5c9dbb4653e8eadcf4a137ee77 · edx / edx-ora2 · GitLab

28 Feb, 2014 11 commits
- Merge pull request #60 from edx/will/no-xml-in-studio-errors · ac8e41f0
```
Remove XML tags from error messages, so they display correctly in Studio
```
  Will Daly committed Feb 28, 2014
  ac8e41f0 Browse Files
- Remove XML tags from error messages, so they display correctly in Studio · b3af3952
  Will Daly committed Feb 28, 2014
  
  b3af3952 Browse Files
- Merge pull request #57 from edx/will/studio-integration-full · 1ef7ddda
```
Add editing view for Open Assessment block in Studio
```
  Will Daly committed Feb 28, 2014
  1ef7ddda Browse Files
- Pretty-print XML in Studio edit · 4f63fb69
  Will Daly committed Feb 28, 2014
  
  4f63fb69 Browse Files
- Add editing view for Open Assessment block in Studio · ec889c39
  Will Daly committed Feb 28, 2014
  
  ec889c39 Browse Files
- Merge pull request #59 from edx/will/fix-coveralls-link · b7417383
```
Point coverage badge link to master
```
  Will Daly committed Feb 28, 2014
  b7417383 Browse Files
- Merge pull request #58 from edx/will/fix-preview-errors · ef220715
```
Will/fix preview errors
```
  Will Daly committed Feb 28, 2014
  ef220715 Browse Files
- Point coverage badge link to master · 44a6e8ac
  Will Daly committed Feb 27, 2014
  
  44a6e8ac Browse Files
- Fix syntax error caused by AJAX request parsing response as JSON · 74d0e168
  Will Daly committed Feb 27, 2014
  
  74d0e168 Browse Files
- Fix error caused by milliseconds in timestamp · 3cdda99b
  Will Daly committed Feb 27, 2014
  
  3cdda99b Browse Files
- Fix error when rendering XBlock in preview · 95e1a581
  Will Daly committed Feb 27, 2014
  
  95e1a581 Browse Files
27 Feb, 2014 8 commits
- Merge pull request #55 from edx/ormsbee/btalbs_xblock_wb_fix · be916197
```
Update workbench and XBlock versions to grab workbench HTML fix.
```
  David Ormsbee committed Feb 27, 2014
  be916197 Browse Files
- Update workbench and XBlock versions to grab workbench HTML fix. · 1766b277
  David Ormsbee committed Feb 27, 2014
  
  1766b277 Browse Files
- Merge pull request #53 from edx/will/coveralls-integration · d035f7b1
```
Report coverage to coveralls.io
```
  Will Daly committed Feb 27, 2014
  d035f7b1 Browse Files
- Report coverage to coveralls.io · 57be692b
  Will Daly committed Feb 27, 2014
  
  57be692b Browse Files
- Merge pull request #52 from edx/will/travis-badge · 89a12ef1
```
Add Travis build status badge
```
  Will Daly committed Feb 27, 2014
  89a12ef1 Browse Files
- Merge pull request #51 from edx/will/js-test-setup · b033a966
```
Added Karma configuration for running JS tests
```
  Will Daly committed Feb 27, 2014
  b033a966 Browse Files
- Add Travis build status badge · d6881528
  Will Daly committed Feb 26, 2014
  
  d6881528 Browse Files
- Added Karma configuration for running JS tests · 7d28235a
  Will Daly committed Feb 26, 2014
  
  7d28235a Browse Files
26 Feb, 2014 11 commits
- Merge pull request #48 from edx/sanchez/TIM-171-Submission-UI · e58391d8
```
Sanchez/tim 171 submission ui
```
  Stephen Sanchez committed Feb 26, 2014
  e58391d8 Browse Files
- Renaming a dupe named test · 50d04441
  Stephen Sanchez committed Feb 26, 2014
  
  50d04441 Browse Files
- Changing the start due date logic to be its own function · 764ae02e
  Stephen Sanchez committed Feb 26, 2014
  
  764ae02e Browse Files
- Added back some dearly missed unit tests, and refactored the median score code a little more · a70972d6
  Stephen Sanchez committed Feb 26, 2014
  
  a70972d6 Browse Files
- Refactor the methods for creating median scores · 696b0cf4
  Stephen Sanchez committed Feb 26, 2014
  
  696b0cf4 Browse Files
- Code Review changes · 468cf9db
  Stephen Sanchez committed Feb 26, 2014
  
  468cf9db Browse Files
- Missed a file.. · 4f428554
  Stephen Sanchez committed Feb 25, 2014
  
  4f428554 Browse Files
- Merge branch 'master' into sanchez/TIM-171-Submission-UI · 495e34cd
```
Conflicts:
	apps/openassessment/xblock/peer_assessment_mixin.py
	apps/openassessment/xblock/submission_mixin.py
```
  Stephen Sanchez committed Feb 25, 2014
  495e34cd Browse Files
- Code Review Tweaks · 20ed9fb7
  Stephen Sanchez committed Feb 25, 2014
  
  20ed9fb7 Browse Files
- Code Review tweaks · 9656880c
  Stephen Sanchez committed Feb 25, 2014
  
  9656880c Browse Files
- Cleanup and tests · 883f6ba3
  Stephen Sanchez committed Feb 25, 2014
  
  883f6ba3 Browse Files
25 Feb, 2014 10 commits
- Working approach to new scores and displaying them. · 45399b9b
  Stephen Sanchez committed Feb 25, 2014
  
  45399b9b Browse Files
- Changing score logic (incomplete) · b4394e28
  Stephen Sanchez committed Feb 25, 2014
  
  b4394e28 Browse Files
- Merge pull request #47 from edx/will/namespace-templates · 80a39cd1
```
Namespace templates to openassessmentblock
```
  Will Daly committed Feb 25, 2014
  80a39cd1 Browse Files
- Namespace templates to openassessmentblock · 64f62d58
  Will Daly committed Feb 25, 2014
  
  64f62d58 Browse Files
- Merge pull request #45 from edx/will/template-move-fixup · fca3a9a6
```
Fix duplicate line from bad rebase
```
  Will Daly committed Feb 25, 2014
  fca3a9a6 Browse Files
- Updating templates based on merge from master. · 6cba22a4
  Stephen Sanchez committed Feb 25, 2014
  
  6cba22a4 Browse Files
- Merge pull request #46 from edx/sanchez/fix_default_peer_assessment · fbd0e2fd
```
Adding some required attributes to the peer assessment module
```
  Stephen Sanchez committed Feb 25, 2014
  fbd0e2fd Browse Files
- Adding some required attributes to the peer assessment module · 79e860a0
  Stephen Sanchez committed Feb 25, 2014
  
  79e860a0 Browse Files
- Fix duplicate line from bad rebase · 00aeb3f4
  Will Daly committed Feb 25, 2014
  
  00aeb3f4 Browse Files
- Merge branch 'master' into sanchez/TIM-171-Submission-UI · b3249c01
```
Conflicts:
	apps/openassessment/xblock/submission_mixin.py
```
  Stephen Sanchez committed Feb 25, 2014
  b3249c01 Browse Files