Commits · a64111a6e789a08e179ad953f0c2b1f320fadf3e · edx / edx-platform · GitLab

14 Jan, 2013 12 commits
- Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe · a64111a6
```
Feature/vik/integrate sa and oe
```
  VikParuchuri committed Jan 14, 2013
  a64111a6 Browse Files
- Prune deleted remote branches · 19f79fa3
  Calen Pennington committed Jan 14, 2013
  
  19f79fa3 Browse Files
- Merge pull request #1274 from MITx/fix/vik/staff-grading-settings · 0c00923a
```
Fix/vik/staff grading settings
```
  Calen Pennington committed Jan 14, 2013
  0c00923a Browse Files
- Minor naming fix · 1316728a
  Vik Paruchuri committed Jan 14, 2013
  
  1316728a Browse Files
- Fix staff and peer grading settings to not fail catastrophically · 0e11deff
  Vik Paruchuri committed Jan 14, 2013
  
  0e11deff Browse Files
- Integrate rubric into self assessment · a6480665
  Vik Paruchuri committed Jan 14, 2013
  
  a6480665 Browse Files
- Fix some minor html · 16f06ae7
  Vik Paruchuri committed Jan 14, 2013
  
  16f06ae7 Browse Files
- Make rubric render more nicely · 3e0cf9d2
  Vik Paruchuri committed Jan 14, 2013
  
  3e0cf9d2 Browse Files
- Proper rubric rendering for self assessment · 59e5b494
  Vik Paruchuri committed Jan 14, 2013
  
  59e5b494 Browse Files
- Fix up rubric rendering · 2b492956
  Vik Paruchuri committed Jan 14, 2013
  
  2b492956 Browse Files
- Factor out rubric rendering · 0567e8f0
  Vik Paruchuri committed Jan 14, 2013
  
  0567e8f0 Browse Files
- Minor bug fix · c7339ee6
  Vik Paruchuri committed Jan 14, 2013
  
  c7339ee6 Browse Files
11 Jan, 2013 28 commits
- Minor string to boolean fix · 7d0bb7b3
  Vik Paruchuri committed Jan 11, 2013
  
  7d0bb7b3 Browse Files
- Address some comments from code review, fix rubric display · 682ac345
  Vik Paruchuri committed Jan 11, 2013
  
  682ac345 Browse Files
- Fix rubric return, add in score field · 9a752f51
  Vik Paruchuri committed Jan 11, 2013
  
  9a752f51 Browse Files
- Integrate minimal rubric display · 7febe2c2
  Vik Paruchuri committed Jan 11, 2013
  
  7febe2c2 Browse Files
- Fix self.get call in peer grading service · 52164f58
  Vik Paruchuri committed Jan 11, 2013
  
  52164f58 Browse Files
- Better initial documentation of combined open ended · 1dca370a
  Vik Paruchuri committed Jan 11, 2013
  
  1dca370a Browse Files
- Code reformat, line length fix, change text names to variables · bcbf65e2
  Vik Paruchuri committed Jan 11, 2013
  
  bcbf65e2 Browse Files
- Change value passing to hidden input type · 8dbbb021
  Vik Paruchuri committed Jan 10, 2013
  
  8dbbb021 Browse Files
- Roll back hidden input changes · c76786ae
  Vik Paruchuri committed Jan 10, 2013
  
  c76786ae Browse Files
- Change hidden div to input name · ee2990da
  Vik Paruchuri committed Jan 10, 2013
  
  ee2990da Browse Files
- Use include clearfix in css · e4568c3a
  Vik Paruchuri committed Jan 10, 2013
  
  e4568c3a Browse Files
- Fix feedback response for peer grading so that students can respond to multiple feedback items · b0d3bcc5
  Vik Paruchuri committed Jan 10, 2013
  
  b0d3bcc5 Browse Files
- Fix spacing error · f4968e1e
  Vik Paruchuri committed Jan 10, 2013
  
  f4968e1e Browse Files
- Better error messages · cb203a6f
  Vik Paruchuri committed Jan 10, 2013
  
  cb203a6f Browse Files
- Fix score passing from controller · 62e93870
  Vik Paruchuri committed Jan 10, 2013
  
  62e93870 Browse Files
- Parse int from score · 742d9475
  Vik Paruchuri committed Jan 10, 2013
  
  742d9475 Browse Files
- Correct peer grading score parsing · c4b1c8d0
  Vik Paruchuri committed Jan 10, 2013
  
  c4b1c8d0 Browse Files
- Add in a comment · c267efb4
  Vik Paruchuri committed Jan 10, 2013
  
  c267efb4 Browse Files
- Support formatting of peer grading feedback · 5a3a537c
  Vik Paruchuri committed Jan 10, 2013
  
  5a3a537c Browse Files
- Document open ended child · 4a2875cc
  Vik Paruchuri committed Jan 10, 2013
  
  4a2875cc Browse Files
- Document self assessment · f858dce7
  Vik Paruchuri committed Jan 10, 2013
  
  f858dce7 Browse Files
- Start commenting open ended module · 5303086a
  Vik Paruchuri committed Jan 10, 2013
  
  5303086a Browse Files
- Document open ended descriptor · 134c3f3d
  Vik Paruchuri committed Jan 10, 2013
  
  134c3f3d Browse Files
- Document combined open ended module · 2f841c8a
  Vik Paruchuri committed Jan 10, 2013
  
  2f841c8a Browse Files
- Remove open ended grading stuff, fix JS variable · 38a81b46
  Vik Paruchuri committed Jan 10, 2013
  
  38a81b46 Browse Files
- Next step logic · bc97a507
  Vik Paruchuri committed Jan 10, 2013
  
  bc97a507 Browse Files
- Fix reset · adcbfbb6
  Vik Paruchuri committed Jan 10, 2013
  
  adcbfbb6 Browse Files
- Add in allow reset action · b13f9479
  Vik Paruchuri committed Jan 10, 2013
  
  b13f9479 Browse Files