Commits · b4394e285557b4a7a557a8eaa34771999faebd14 · edx / edx-ora2 · GitLab

25 Feb, 2014 13 commits
- Changing score logic (incomplete) · b4394e28
  Stephen Sanchez committed Feb 25, 2014
  
  b4394e28 Browse Files
- Updating templates based on merge from master. · 6cba22a4
  Stephen Sanchez committed Feb 25, 2014
  
  6cba22a4 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 24 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
- Changing the if else in submission for clarity. · 14f1ccb9
  Stephen Sanchez committed Feb 24, 2014
  
  14f1ccb9 Browse Files
- More docstrings to clarify peer models. · 4dcc2c71
  David Ormsbee committed Feb 24, 2014
  
  4dcc2c71 Browse Files
- Code Review changes. · b49fc125
  Stephen Sanchez committed Feb 24, 2014
  
  b49fc125 Browse Files
- Adding date time formatting. · e7f7bcda
  Stephen Sanchez committed Feb 24, 2014
  
  e7f7bcda Browse Files
- Merge branch 'master' into store_rubrics · 1c84bf4f
```
Conflicts:
	apps/openassessment/xblock/assessment_mixin.py
	apps/openassessment/xblock/peer_assessment_mixin.py
	apps/openassessment/xblock/self_assessment_mixin.py
	apps/openassessment/xblock/test/test_openassessment.py
```
  David Ormsbee committed Feb 24, 2014
  1c84bf4f Browse Files
- Add docstrings for Peer models. · 6194d195
  David Ormsbee committed Feb 24, 2014
  
  6194d195 Browse Files
- Some additional doc around all the functions in the front end. · 095e1f0c
```
We will want to flesh out the specifics of each Mixin, and associated UI models, as we complete each associated UI story.
```
  Stephen Sanchez committed Feb 24, 2014
  095e1f0c Browse Files
- Remove leftover test_models.py code · 6c5c9e43
  David Ormsbee committed Feb 24, 2014
  
  6c5c9e43 Browse Files
- Remove unimplemented test. · 41145d22
  David Ormsbee committed Feb 24, 2014
  
  41145d22 Browse Files
- Re-add valid assessments JSON file. · 3ec4a3a0
  David Ormsbee committed Feb 24, 2014
  
  3ec4a3a0 Browse Files
- Fix broken Peer API tests · 01fa7f2a
  David Ormsbee committed Feb 24, 2014
  
  01fa7f2a Browse Files
- Merge pull request #38 from edx/sanchez/template-first-crack · b491ad87
```
WIP: UI Architecture for Module UI Components
```
  Stephen Sanchez committed Feb 24, 2014
  b491ad87 Browse Files
- Merge branch 'master' into sanchez/template-first-crack · 6ac00039
```
Conflicts:
	apps/openassessment/peer/api.py
	apps/openassessment/xblock/openassessmentblock.py
	apps/openassessment/xblock/static/html/oa_rubric.html
	apps/openassessment/xblock/static/js/src/oa_submission.js
```
  Stephen Sanchez committed Feb 24, 2014
  6ac00039 Browse Files
- Fix broken XML parsing tests. · a6249bc1
  David Ormsbee committed Feb 24, 2014
  
  a6249bc1 Browse Files
- Renaming render() to render_assessment() to avoid collision · 2c98839a
  Stephen Sanchez committed Feb 24, 2014
  
  2c98839a Browse Files
- Quick code review changes to clean up empty files and move functions · b784cb28
  Stephen Sanchez committed Feb 24, 2014
  
  b784cb28 Browse Files
21 Feb, 2014 3 commits
- Merge pull request #36 from edx/talbs/styling-architecture · 4053e448
```
Sass/Styling Architecture
```
  Brian Talbot committed Feb 21, 2014
  4053e448 Browse Files
- adding Sass architecture: · afcd7c9c
```
* import order - with base blocks, theming, and specific app layers
* base utilities/tools
* notes/starters for each Sass partial imported

TIM-127
```
  Brian Talbot committed Feb 21, 2014
  afcd7c9c Browse Files
- More admin pieces to see peer info. · b4808a54
  David Ormsbee committed Feb 21, 2014
  
  b4808a54 Browse Files