Commits · 9adbf2a544d345a65619833e708a1167b44d46b9 · edx / edx-ora2 · GitLab

24 Feb, 2014 23 commits
- 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 14 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
- Working end to end assessment part saving action. · a7dfb40a
  David Ormsbee committed Feb 21, 2014
  
  a7dfb40a Browse Files
- More work to hook actual choices up instead of just point values. · fbc2d492
  David Ormsbee committed Feb 21, 2014
  
  fbc2d492 Browse Files
- Fix a bunch of tests, make the rubric display real again for doing evaluations · 0a2e5efe
  David Ormsbee committed Feb 21, 2014
  
  0a2e5efe Browse Files
- Add unicode test case for new style assessment dicts. · 95e6a40e
  David Ormsbee committed Feb 21, 2014
  
  95e6a40e Browse Files
- Properly create Assessment Parts based on selected options. · fdbbe88c
  David Ormsbee committed Feb 21, 2014
  
  fdbbe88c Browse Files
- Break out Assessment into parts, Rubrics into their various pieces, with serializers. · dddf9194
  David Ormsbee committed Feb 21, 2014
  
  dddf9194 Browse Files
- First cut at serializing Rubrics · c83d5948
  David Ormsbee committed Feb 21, 2014
  
  c83d5948 Browse Files
- Some tuning for peer · d580f825
  Stephen Sanchez committed Feb 21, 2014
  
  d580f825 Browse Files
- Merge pull request #40 from edx/talbs/templates-updateterms · eb54cb73
```
HTML Templates: Update Term References & Problem Results UI
```
  Brian Talbot committed Feb 21, 2014
  eb54cb73 Browse Files
- Merge pull request #41 from edx/jrbl/125-show-users-scored-subs · a3ba60ea
```
TIM-125: Pull request fixups
```
  David Ormsbee committed Feb 21, 2014
  a3ba60ea Browse Files
- TIM-125: Pull request fixups · 4ce087e7
```
* Fixes to method names requested on the PR
```
  Joe Blaylock committed Feb 20, 2014
  4ce087e7 Browse Files
20 Feb, 2014 3 commits
- Changing to mixins · 61ab0d3a
  Stephen Sanchez committed Feb 20, 2014
  
  61ab0d3a Browse Files
- templates: adding in overall peer-based score per question to complete problem UI · 78c71eec
  Brian Talbot committed Feb 20, 2014
  
  78c71eec Browse Files
- templates: changing evaluation/evaluate copy to use assessment/assess · a2fdef8d
  Brian Talbot committed Feb 20, 2014
  
  a2fdef8d Browse Files