Commits · 7d28235a19cc2c127041d70c514ac2114d9eb108 · edx / edx-ora2 · GitLab

27 Feb, 2014 1 commit
- 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 20 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
- Merge pull request #43 from edx/will/fix-template-path · 7285887e
```
Will/fix template path
```
  Will Daly committed Feb 25, 2014
  7285887e Browse Files
- Merge branch 'master' into sanchez/TIM-171-Submission-UI · 49185e22
```
Conflicts:
	apps/openassessment/xblock/ui_models.py
```
  Stephen Sanchez committed Feb 25, 2014
  49185e22 Browse Files
- Merge pull request #44 from edx/sanchez/refactor-ui-models · c80522da
```
Removing the UI Models in favor of a simple dictionary.
```
  Stephen Sanchez committed Feb 25, 2014
  c80522da Browse Files
- Add comments and doc to the new functionality in the XBlock · fdbf7a10
  Stephen Sanchez committed Feb 25, 2014
  
  fdbf7a10 Browse Files
- Changing my dictionary combination from add operator to splat. · 02f5d182
  Stephen Sanchez committed Feb 25, 2014
  
  02f5d182 Browse Files
- Adding back name attribute parsing · 71b74934
  Stephen Sanchez committed Feb 25, 2014
  
  71b74934 Browse Files
- Missed a line in a test · bdbea0c2
  Stephen Sanchez committed Feb 25, 2014
  
  bdbea0c2 Browse Files
- Removing the UI Models in favor of a simple dictionary. · 5267e7af
  Stephen Sanchez committed Feb 25, 2014
  
  5267e7af Browse Files
- Fix template path · 9f71da30
  Will Daly committed Feb 25, 2014
  
  9f71da30 Browse Files
- Template-tizing the tempalates · 52c800ac
  Stephen Sanchez committed Feb 25, 2014
  
  52c800ac Browse Files
24 Feb, 2014 8 commits
- Fixing a javascript loading issue · 50dae8c2
  Stephen Sanchez committed Feb 24, 2014
  
  50dae8c2 Browse Files
- Merge branch 'master' into sanchez/TIM-171-Submission-UI · 9adbf2a5
  Stephen Sanchez committed Feb 24, 2014
  
  9adbf2a5 Browse Files
- Creating a number of templates for response. Requires cleanup. · 6a74d0be
  Stephen Sanchez committed Feb 24, 2014
  
  6a74d0be Browse Files
- Merge pull request #39 from edx/store_rubrics · 435f6d5d
```
Store rubrics, assessments by part against rubric
```
  David Ormsbee committed Feb 24, 2014
  435f6d5d Browse Files
- Renamed Rubric.content_hash_for_rubric_dict to Rubric.content_hash_from_dict and… · fe949b17
```
Renamed Rubric.content_hash_for_rubric_dict to Rubric.content_hash_from_dict and added more comments.
```
  David Ormsbee committed Feb 24, 2014
  fe949b17 Browse Files
- Merge branch 'master' into sanchez/TIM-171-Submission-UI · a2709bd9
```
Conflicts:
	apps/openassessment/xblock/submission_mixin.py
```
  Stephen Sanchez committed Feb 24, 2014
  a2709bd9 Browse Files
- Merge pull request #42 from edx/sanchez/base_template_cleanup · 229b719b
```
Some additional doc around all the functions in the front end.
```
  Stephen Sanchez committed Feb 24, 2014
  229b719b Browse Files
- Deleting the base error in submissions mixin. · 3cd1bdb0
  Stephen Sanchez committed Feb 24, 2014
  
  3cd1bdb0 Browse Files