Commits · 671a0f33ae564a984bd4c9d679fc80b9d3bbbbe9 · edx / edx-ora2

03 Mar, 2014 8 commits

Exclude design.js from test execution · 671a0f33
Will Daly committed Mar 03, 2014

671a0f33 Browse Files

Peer Assessment Template/Styling Work: · df452912

* adding basic styling for rubric-based UI
* applying rubric-based UI styling to peer assessment
* adding oa-specific Sass extend partial
* basic template indentation cleanup
* adding initial JS for all collapsed/expanded UI to use
* refactoring small Sass bits

TIM-129

committed Mar 03, 2014

df452912 Browse Files

Merge pull request #71 from edx/will/update-scenario-xml · 3e07e49f
```
Update workbench scenarios to current XML schema
```
Will Daly committed Mar 03, 2014
3e07e49f Browse Files
Update workbench scenarios to current XML schema · 524b27b3
Will Daly committed Mar 03, 2014

524b27b3 Browse Files
Merge pull request #65 from edx/will/more-test-cleanup · 64e667a4
```
More test cleanup
```
Will Daly committed Mar 03, 2014
64e667a4 Browse Files

Add view level tests for Studio view · 34893331

Deprecate scenario parser in favor of XML serializer for studio
Clean up validation logic for assessments and add tests.
Add missing test cases for XML serialization/deserialization
Increase browser timeout for Karma (prevent failure in Travis)
Erase coverage between test runs (more accurate reporting)

committed Mar 03, 2014

34893331 Browse Files

Merge pull request #66 from edx/will/js-refactor · e85718ed
```
Studio-editing JavaScript Refactor
```
Will Daly committed Mar 03, 2014
e85718ed Browse Files

Refactor Studio editing JavaScript to make it easier to test · b08164df

Add JavaScript tests for Studio editing and XBlock server interaction
Refactor student-facing JS views to use JS server interface.
manage.py test runs JavaScript tests
Fix data type issue for rendering peer/self/grade on page load

committed Mar 03, 2014

b08164df Browse Files

01 Mar, 2014 1 commit
- Added some JS testing infrastructure · 7d4952d9
  Will Daly committed Mar 01, 2014
  
  7d4952d9 Browse Files
28 Feb, 2014 31 commits
- Merge pull request #64 from edx/sanchez/ui-cleanup · c880c21c
```
Cleaning up some files that should have never made it to master
```
  Stephen Sanchez committed Feb 28, 2014
  c880c21c Browse Files
- Cleaning up some files that should have never made it to master · b72532bf
  Stephen Sanchez committed Feb 28, 2014
  
  b72532bf Browse Files
- Merge pull request #62 from edx/will/test-cleanup · 969830ce
```
Refactor test setup for XBlock rendering and handlers.
```
  Will Daly committed Feb 28, 2014
  969830ce Browse Files
- Refactor test setup for XBlock rendering and handlers. · a33ad617
  Will Daly committed Feb 28, 2014
  
  a33ad617 Browse Files
- Merge pull request #61 from edx/sanchez/render_security · e44b501c
```
Sanchez/render security
```
  Stephen Sanchez committed Feb 28, 2014
  e44b501c Browse Files
- Adding back a lost file during rebase. · 839c54a8
  Stephen Sanchez committed Feb 28, 2014
  
  839c54a8 Browse Files
- Ensure a submission has been submitted before displaying a rubric anywhere. · 635fc3fc
  Stephen Sanchez committed Feb 28, 2014
  
  635fc3fc Browse Files
- Adding all templates and rendering for peer and self assessment. · 3ea44002
  Stephen Sanchez committed Feb 28, 2014
  
  3ea44002 Browse Files
- Adding a bunch of collapsed templates and javascript to load them. · c816e1bf
  Stephen Sanchez committed Feb 28, 2014
  
  c816e1bf Browse Files
- Adding all templates and rendering for peer and self assessment. · 17d9d6da
  Stephen Sanchez committed Feb 28, 2014
  
  17d9d6da Browse Files
- Merge pull request #63 from edx/sanchez/TIM-191-Grade-UI · 69f75296
```
Sanchez/tim 191 grade ui
```
  Stephen Sanchez committed Feb 28, 2014
  69f75296 Browse Files
- Adding files lost in rebase · 6ee9936a
  Stephen Sanchez committed Feb 28, 2014
  
  6ee9936a Browse Files
- Fixing rebase · c1aaf623
  Stephen Sanchez committed Feb 28, 2014
  
  c1aaf623 Browse Files
- Adding all the grading templates, hooks, and handlers. · 0f9d60cb
  Stephen Sanchez committed Feb 28, 2014
  
  0f9d60cb Browse Files
- Adding collapse / expand functions to the javascript. Removing the collapsed templates. · c2523b6f
  Stephen Sanchez committed Feb 28, 2014
  
  c2523b6f Browse Files
- Adding all templates and rendering for peer and self assessment. · e4c5fce1
  Stephen Sanchez committed Feb 28, 2014
  
  e4c5fce1 Browse Files
- revising newly abstracted template's HTML · b27067b5
  Brian Talbot committed Feb 28, 2014
  
  b27067b5 Browse Files
- Adding all templates and rendering for peer and self assessment. · e8f0188d
  Stephen Sanchez committed Feb 28, 2014
  
  e8f0188d Browse Files
- Adding a bunch of collapsed templates and javascript to load them. · f7146529
  Stephen Sanchez committed Feb 28, 2014
  
  f7146529 Browse Files
- Merge pull request #49 from edx/talbs/styling-problem · 16c6fcf7
```
Basic + Problem View Template/Styling Work
```
  Brian Talbot committed Feb 28, 2014
  16c6fcf7 Browse Files
- resolving master rebase and test errors · 6d631658
  Brian Talbot committed Feb 28, 2014
  
  6d631658 Browse Files
- Moving a collapse function after rebase · e258afd5
  Stephen Sanchez committed Feb 28, 2014
  
  e258afd5 Browse Files
- revising markup and styling for problems further · a81a8f56
```
* markup indentation and class consistency
* basic responsive styles for response submission UI
* styling for feedback form (sans submitted/error states)
```
  Brian Talbot committed Feb 28, 2014
  a81a8f56 Browse Files
- WIP - styling rubric/complete response state · 883ab7f8
  Brian Talbot committed Feb 28, 2014
  
  883ab7f8 Browse Files
- removing xblock workbench crutch styling · 423a5ee0
  Brian Talbot committed Feb 28, 2014
  
  423a5ee0 Browse Files
- resolving stash merge conflict · 2a379887
  Brian Talbot committed Feb 28, 2014
  
  2a379887 Browse Files
- correcting color-focused variable reference · a5027d0b
  Brian Talbot committed Feb 28, 2014
  
  a5027d0b Browse Files
- refactoring is--expanded and is--collapsed markup and styling · 238f79a7
  Brian Talbot committed Feb 28, 2014
  
  238f79a7 Browse Files
- removing is--expanded class. · e4ad2b72
  Stephen Sanchez committed Feb 28, 2014
  
  e4ad2b72 Browse Files
- Adding collapse / expand functions to the javascript. Removing the collapsed templates. · cefcb85f
  Stephen Sanchez committed Feb 28, 2014
  
  cefcb85f Browse Files
- revises spacing on expanded steps and renames workbench visual selector overrides · de44c159
  Brian Talbot committed Feb 28, 2014
  
  de44c159 Browse Files