Commits · 570d587bbb248424876970ae8385d9c19c92e700 · edx / edx-ora2 · GitLab

24 Apr, 2014 8 commits
- Merge pull request #284 from edx/jrbl/410-optional-prompts-and-instructions · 570d587b
```
Make rubric prompt display and instructions optional
```
  Joe Blaylock committed Apr 24, 2014
  570d587b Browse Files
- TIM-410: Make rubric prompt display optional · 10a7d90a
```
If users want rich prompts, they can do that with an HTML Components
above the ORA2 question, but doing this makes the prompt box look bad.
This adds a check so that the prompt box will not display if the
<prompt> XML tag is missing is empty or whitespace-only. Also extends
the serializer to serialize missing prompts distinctly from empty
prompts.

Includes tests for each of these conditions.
```
  Joe Blaylock committed Apr 24, 2014
  10a7d90a Browse Files
- Merge pull request #298 from edx/will/peer-rendering-test-cleanup · 93ef7906
```
Will/peer rendering test cleanup
```
  Will Daly committed Apr 24, 2014
  93ef7906 Browse Files
- Add test cases for all peer assessment rendering paths · 00a6943f
  Will Daly committed Apr 24, 2014
  
  00a6943f Browse Files
- Remove unnecessary submission_uuid in self assessment tests · e410a172
  Will Daly committed Apr 24, 2014
  
  e410a172 Browse Files
- Merge pull request #297 from edx/will/TIM-487 · 3ae16f20
```
TIM-487
```
  Will Daly committed Apr 24, 2014
  3ae16f20 Browse Files
- Continue showing peer assessment step as completed after the deadline passes · 5ceccba4
```
Allow continued grading after the deadline passes.
```
  Will Daly committed Apr 24, 2014
  5ceccba4 Browse Files
- Merge pull request #296 from edx/ned/django-1-4-11 · 2522b381
```
Use Django 1.4.x
```
  Ned Batchelder committed Apr 24, 2014
  2522b381 Browse Files
23 Apr, 2014 3 commits
- Use Django 1.4.x · 1c67a8b5
  Ned Batchelder committed Apr 23, 2014
  
  1c67a8b5 Browse Files
- Merge pull request #294 from edx/ormsbee/workflow_plan · 994cf3db
```
Workflow plan
```
  David Ormsbee committed Apr 23, 2014
  994cf3db Browse Files
- Add outline for overall Workflow plan to docs for review. · fa5df3dd
```
TIM-493
```
  David Ormsbee committed Apr 23, 2014
  fa5df3dd Browse Files
22 Apr, 2014 7 commits
- Update docs to reflect new modules that have been added. · e321692c
  David Ormsbee committed Apr 22, 2014
  
  e321692c Browse Files
- Merge pull request #292 from edx/sanchez/fix_grading_completed_at · 69eac7f6
```
Fix the Grading Completed At timestamp logic.
```
  Stephen Sanchez committed Apr 22, 2014
  69eac7f6 Browse Files
- Merge pull request #291 from edx/sanchez/revert_comments_naming · d40ef9df
```
Revert "Renaming feedback to comments for a peer assessment."
```
  Stephen Sanchez committed Apr 22, 2014
  d40ef9df Browse Files
- Fix the Grading Completed At timestamp logic. · 0965b164
  Stephen Sanchez committed Apr 22, 2014
  
  0965b164 Browse Files
- Revert "Renaming feedback to comments for a peer assessment." · bfc67ea7
```
This reverts commit 73df4fa7.
```
  Stephen Sanchez committed Apr 22, 2014
  bfc67ea7 Browse Files
- Merge pull request #290 from edx/will/fix-xblock-sdk-pointer · 66c3546a
```
Point xblock SDK back to the tip of master
```
  Will Daly committed Apr 22, 2014
  66c3546a Browse Files
- Point xblock SDK back to the tip of master · 67493483
  Will Daly committed Apr 22, 2014
  
  67493483 Browse Files
18 Apr, 2014 16 commits
- Merge pull request #289 from edx/sanchez/TIM-485 · f9bdc85d
```
Renaming feedback to comments for a peer assessment.
```
  Stephen Sanchez committed Apr 18, 2014
  f9bdc85d Browse Files
- Renaming feedback to comments for a peer assessment. · 73df4fa7
  Stephen Sanchez committed Apr 18, 2014
  
  73df4fa7 Browse Files
- Merge pull request #288 from edx/ormsbee/score_summary_admin · 280d7478
```
Admin screen for ScoreSummary
```
  David Ormsbee committed Apr 18, 2014
  280d7478 Browse Files
- Admin screen for ScoreSummary. · adbcdf54
  David Ormsbee committed Apr 18, 2014
  
  adbcdf54 Browse Files
- Merge pull request #280 from edx/sanchez/TIM-409-Custom-Feedback-Prompt · b9dc5971
```
Allowing the modification of the peer feedback prompt
```
  Stephen Sanchez committed Apr 18, 2014
  b9dc5971 Browse Files
- Allowing the modification of the peer feedback prompt · 3acf5609
  Stephen Sanchez committed Apr 18, 2014
  
  3acf5609 Browse Files
- Merge pull request #261 from edx/ormsbee/admin_screens · 1747a2ef
```
A more useful admin interface
```
  David Ormsbee committed Apr 18, 2014
  1747a2ef Browse Files
- Add real admin.py pages for apps. · 37bbf221
```
Models that are intended to be immutable are read-only in the
admin screens. Workflow related models are editable, though the
use cases for that are limited. It's primarily intended to be a
search/diagnosis tool.

TIM-376
```
  David Ormsbee committed Apr 18, 2014
  37bbf221 Browse Files
- Merge pull request #285 from edx/will/release-tag-script · 7f1bbf0b
```
Update the release script; add script to get deployed SHA
```
  Will Daly committed Apr 18, 2014
  7f1bbf0b Browse Files
- Merge pull request #286 from edx/will/test-course-fixture · e17faade
```
Install test course in a sandbox
```
  Will Daly committed Apr 18, 2014
  e17faade Browse Files
- Merge pull request #287 from edx/will/deprecate-fixtures · c8e462e4
```
Remove fixtures
```
  Will Daly committed Apr 18, 2014
  c8e462e4 Browse Files
- Merge pull request #283 from edx/sanchez/TIM-474 · cef7c430
```
Fix for TIM-474. Disable submit buttons during transaction.
```
  Stephen Sanchez committed Apr 18, 2014
  cef7c430 Browse Files
- Fix for TIM-474. Disable submit buttons during transaction. · fd00b4aa
  Stephen Sanchez committed Apr 18, 2014
  
  fd00b4aa Browse Files
- Remove fixtures · 6b8574d2
  Will Daly committed Apr 18, 2014
  
  6b8574d2 Browse Files
- Update the release script to create a tag but not a branch · 99821fd0
  Will Daly committed Apr 18, 2014
  
  99821fd0 Browse Files
- Install test course in a sandbox · b2eefad1
  Will Daly committed Apr 18, 2014
  
  b2eefad1 Browse Files
17 Apr, 2014 2 commits
- Merge pull request #282 from edx/will/js-debug-script · d34b5178
```
Add script for starting JS tests in Chrome for debugging
```
  Will Daly committed Apr 17, 2014
  d34b5178 Browse Files
- Add script for starting JS tests in Chrome for debugging · 950c43b1
  Will Daly committed Apr 17, 2014
  
  950c43b1 Browse Files
16 Apr, 2014 3 commits
- Merge pull request #281 from edx/sanchez/TIM-406-updating-your-grade · f2334ad9
```
TIM-406 Refresh Grade section after submission
```
  Stephen Sanchez committed Apr 16, 2014
  f2334ad9 Browse Files
- TIM-406 Refresh Grade section after submission · ca120f14
  Stephen Sanchez committed Apr 16, 2014
  
  ca120f14 Browse Files
- Merge pull request #278 from edx/sanchez/TIM-473-Get-Latest-PWI · aee5f74a
```
Fixing TIM-473 to allow re-leasing a submission
```
  Stephen Sanchez committed Apr 16, 2014
  aee5f74a Browse Files
15 Apr, 2014 1 commit
- Fixing TIM-473 to allow re-leasing a submission · 190ae53e
  Stephen Sanchez committed Apr 15, 2014
  
  190ae53e Browse Files