Commits · release-2014-04-15 · edx / edx-ora2

15 Apr, 2014 2 commits
- changing semantic name of xblock editing actions to '.xblock-actions' · 88e8633d
  Brian Talbot committed Apr 15, 2014
  
  88e8633d Browse Files
- Update HTML for custom edit modal buttons · 6222ed72
  Andy Armstrong committed Apr 15, 2014
  
  6222ed72 Browse Files
14 Apr, 2014 1 commit

Conflicts:
	apps/openassessment/assessment/peer_api.py
	apps/openassessment/assessment/test/test_peer.py
	apps/openassessment/xblock/test/test_peer.py

committed Apr 14, 2014

45b51c2e Browse Files

10 Apr, 2014 2 commits
- Merge pull request #270 from edx/sanchez/TIM-267-Student-State · 8c0e01b1
```
WIP: Removing the peer uuid from the assessment api
```
  Stephen Sanchez committed Apr 10, 2014
  8c0e01b1 Browse Files
- Removing the peer uuid from the assessment api · 9605ed9c
```
Changing the Peer API signatures to use submission UUID instead of student items. This will greatly simplify our APIs uses and queries.
```
  Stephen Sanchez committed Apr 10, 2014
  9605ed9c Browse Files
09 Apr, 2014 2 commits
- Do not use the submission_uuid from a response for peer · 418da06d
```
The Workflow API was still using the submission_uuid within a peer response.  Removed this, and updated tests accordingly.
```
  Stephen Sanchez committed Apr 09, 2014
  418da06d Browse Files
- Merge pull request #268 from edx/sanchez/fix_submission_uuid_use · ff52a5c4
```
Do not use the submission_uuid from a response for peer
```
  Stephen Sanchez committed Apr 09, 2014
  ff52a5c4 Browse Files
08 Apr, 2014 10 commits
- Do not use the submission_uuid from a response for peer · 131cf5b4
```
The Workflow API was still using the submission_uuid within a peer response.  Removed this, and updated tests accordingly.
```
  Stephen Sanchez committed Apr 08, 2014
  131cf5b4 Browse Files
- Merge pull request #266 from edx/will/criterion-name-in-dom · d256f056
```
Will/criterion name in dom
```
  Will Daly committed Apr 08, 2014
  d256f056 Browse Files
- Merge pull request #247 from edx/will/i18n · 85ff715c
```
Tag i18n strings in templates
```
  Will Daly committed Apr 08, 2014
  85ff715c Browse Files
- Tag i18n strings in templates · 13e007a1
  Will Daly committed Apr 08, 2014
  
  13e007a1 Browse Files
- Fix for TIM-449. Do not use Peer UUID · d504cf67
```
Conflicts:
	apps/openassessment/assessment/peer_api.py
```
  Stephen Sanchez committed Apr 08, 2014
  d504cf67 Browse Files
- Merge pull request #265 from edx/will/fix-master · 5e916fdb
```
Fix tests that broke during text updates
```
  Will Daly committed Apr 08, 2014
  5e916fdb Browse Files
- Merge pull request #264 from edx/sanchez/TIM-449-No-Sub-Matching-UUID · 313a6c1e
```
Fix for TIM-449. Do not use Peer UUID
```
  Stephen Sanchez committed Apr 08, 2014
  313a6c1e Browse Files
- Fix for TIM-449. Do not use Peer UUID · 904f0749
  Stephen Sanchez committed Apr 08, 2014
  
  904f0749 Browse Files
- Use criterion and option order num instead of name in HTML attributes · 691dbe16
  Will Daly committed Apr 08, 2014
  
  691dbe16 Browse Files
- Fix tests that broke during text updates · 1f808622
  Will Daly committed Apr 08, 2014
  
  1f808622 Browse Files
07 Apr, 2014 6 commits
- Fix tests that broke during text updates · df16c5c0
  Will Daly committed Apr 07, 2014
  
  df16c5c0 Browse Files
- Merge pull request #255 from edx/sylvia/docs/API-UI-text · e90a7b73
```
Sylvia/docs/api ui text
```
  srpearce committed Apr 07, 2014
  e90a7b73 Browse Files
- UI and error message text updates · 2b822399
  Sylvia Pearce committed Apr 07, 2014
  
  2b822399 Browse Files
- Review error messages and UI text · 46d0e021
```
Edit error messages in .py files
Corrected tiny typo in models.py
Revise UI and error message text in .js files
Updated "Could not contact server" error messages
```
  Sylvia Pearce committed Apr 07, 2014
  46d0e021 Browse Files
- Merge pull request #262 from edx/will/utc-now · 60ac0ee2
```
Use UTC when finding the current time
```
  Will Daly committed Apr 07, 2014
  60ac0ee2 Browse Files
- Use UTC when finding the current time · 43e1fe82
  Will Daly committed Apr 07, 2014
  
  43e1fe82 Browse Files
06 Apr, 2014 3 commits
- Merge pull request #260 from edx/will/submission-unavailable-2 · 604b0849
```
Submission step unavailable and Display Timezone UTC
```
  Will Daly committed Apr 06, 2014
  604b0849 Browse Files
- Update the due date parsing script to display properly. · 5302db3a
```
Conflicts:
	apps/openassessment/xblock/peer_assessment_mixin.py
	apps/openassessment/xblock/self_assessment_mixin.py
```
  Stephen Sanchez committed Apr 06, 2014
  5302db3a Browse Files
- Add tests for submission step rendering · a179657e
```
Add unavailable state for submission step

Refactor save status context

Refactor date format
```
  Will Daly committed Apr 06, 2014
  a179657e Browse Files
03 Apr, 2014 9 commits
- Merge pull request #257 from edx/jrbl/420-triage-tiny-screens · 1806f657
```
TIM-420: Format default prompts with long lines
```
  Joe Blaylock committed Apr 03, 2014
  1806f657 Browse Files
- TIM-420: Format default prompts with long lines · 315bda57
```
* Format the default prompts and options with long lines so that they
  don't look like they have weird wrapping in narrow edit displays.
* Remove some unused UI mockups
* Silence a small number of nitpicky pylint warnings
```
  Joe Blaylock committed Apr 03, 2014
  315bda57 Browse Files
- Merge pull request #256 from edx/jrbl/435-no_whitespace_submissions · 7915014f
```
TIM-435: Prevent whitespace-only submissions
```
  Joe Blaylock committed Apr 03, 2014
  7915014f Browse Files
- TIM-435: Prevent whitespace-only submissions · 958060a0
  Joe Blaylock committed Apr 03, 2014
  
  958060a0 Browse Files
- Merge pull request #254 from edx/sanchez/TIM-415-Enable-Turbo-Grading · 86c20003
```
Updating the peer assessment mixin to allow continued grading at any tim...
```
  Stephen Sanchez committed Apr 03, 2014
  86c20003 Browse Files
- Merge pull request #253 from edx/will/relax-date-validation · fd435437
```
Gracefully handle Studio authors setting invalid problem dates
```
  Will Daly committed Apr 03, 2014
  fd435437 Browse Files
- Gracefully handle Studio authors setting invalid problem dates. · 14ca6c25
```
Add submission_start attribute to problem definition XML.
```
  Will Daly committed Apr 03, 2014
  14ca6c25 Browse Files
- Updating the peer assessment mixin to allow continued grading at any time · 5f5f5f93
  Stephen Sanchez committed Apr 03, 2014
  
  5f5f5f93 Browse Files
- Merge pull request #249 from edx/will/accurate-answer-size-metric · 9dfb1928
```
Serialize answer dict before calculating size for datadog
```
  Will Daly committed Apr 02, 2014
  9dfb1928 Browse Files
02 Apr, 2014 5 commits
- Merge pull request #251 from edx/will/date-template-fixes · eee39004
```
Date fixes
```
  Will Daly committed Apr 02, 2014
  eee39004 Browse Files
- Self-assessment not yet started should be unavailable. · 86949c8b
```
Display submission deadline in template, not problem deadline.
```
  Will Daly committed Apr 02, 2014
  86949c8b Browse Files
- Merge pull request #252 from edx/sanchez/remove_unused_query · f2129e8c
```
Remove an unused query.
```
  Stephen Sanchez committed Apr 02, 2014
  f2129e8c Browse Files
- Merge pull request #250 from edx/will/fix-metric-typo · dc8cad8f
```
Fix typo in self-api datadog metric
```
  Will Daly committed Apr 02, 2014
  dc8cad8f Browse Files
- Merge pull request #245 from edx/will/remove-lettuce · 5d1594c5
```
Remove lettuce tests
```
  Will Daly committed Apr 02, 2014
  5d1594c5 Browse Files