Commits · 134f2f7af7fea76a8f70e8cf4f19a456f209bd3e · edx / edx-platform · GitLab

05 Feb, 2013 5 commits
- Fix tests, bugfix for problem url error · 134f2f7a
  Vik Paruchuri committed Feb 05, 2013
  
  134f2f7a Browse Files
- Test fixes, err response fixes, address review comments · e13de754
  Vik Paruchuri committed Feb 05, 2013
  
  e13de754 Browse Files
- Fix some issues with peer grading service · 34dc6e63
  Vik Paruchuri committed Feb 05, 2013
  
  34dc6e63 Browse Files
- Move over grading service to xmodule · 7984c4df
  Vik Paruchuri committed Feb 05, 2013
  
  7984c4df Browse Files
- Update peer grading tests · e8a690df
  Vik Paruchuri committed Feb 05, 2013
  
  e8a690df Browse Files
04 Feb, 2013 35 commits
- Tests for peer grading service may be fixed. · 443c3eda
  Vik Paruchuri committed Feb 04, 2013
  
  443c3eda Browse Files
- Make things slightly robust · 18814196
  Vik Paruchuri committed Feb 04, 2013
  
  18814196 Browse Files
- Remove get statements, fix module_render · 725f0c63
  Vik Paruchuri committed Feb 04, 2013
  
  725f0c63 Browse Files
- Fix issue with passing rubric scores back to controller · 009a8c5f
  Vik Paruchuri committed Feb 04, 2013
  
  009a8c5f Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule · bf97a6a9
```
Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py
```
  Vik Paruchuri committed Feb 04, 2013
  bf97a6a9 Browse Files
- Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging · fb777de1
```
Feature/vik/peer grading flagging
```
  Diana Huang committed Feb 04, 2013
  fb777de1 Browse Files
- Fix accidental commit of dev.py · 1dab4aba
  Vik Paruchuri committed Feb 04, 2013
  
  1dab4aba Browse Files
- Fix JS on after event handling · e8803985
  Vik Paruchuri committed Feb 04, 2013
  
  e8803985 Browse Files
- Merge pull request #1419 from MITx/debug/dave/sass · 4999a8e9
```
Remove compressed flag from SASS call in pipeline so we can diff the gen...
```
  David Ormsbee committed Feb 04, 2013
  4999a8e9 Browse Files
- Remove compressed flag from SASS call in pipeline so we can diff the generated CSS · 9f634aba
  David Ormsbee committed Feb 04, 2013
  
  9f634aba Browse Files
- Fix a function call · d89ab000
  Vik Paruchuri committed Feb 04, 2013
  
  d89ab000 Browse Files
- Fix reloading · f019225d
  Vik Paruchuri committed Feb 04, 2013
  
  f019225d Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging · eb049bda
  Vik Paruchuri committed Feb 04, 2013
  
  eb049bda Browse Files
- Address review comments · 7f96fbb3
  Vik Paruchuri committed Feb 04, 2013
  
  7f96fbb3 Browse Files
- Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display · d7570de5
```
fix bug in conditional - videos were not playing, because a js function changed syntax
```
  Victor Shnayder committed Feb 04, 2013
  d7570de5 Browse Files
- XModule.loadModules only takes @el as argument now · 0c07f03d
  ichuang committed Feb 04, 2013
  
  0c07f03d Browse Files
- Explain django settings imports · 5d8aade8
  Vik Paruchuri committed Feb 04, 2013
  
  5d8aade8 Browse Files
- Remove unneccesary imports · c4c67436
  Vik Paruchuri committed Feb 04, 2013
  
  c4c67436 Browse Files
- Fix CSS to fit all elements on the page · 83b7533a
  Vik Paruchuri committed Feb 04, 2013
  
  83b7533a Browse Files
- Add in single peer grading problem view · cbd0895a
  Vik Paruchuri committed Feb 04, 2013
  
  cbd0895a Browse Files
- Add in score return · c9f75f8b
  Vik Paruchuri committed Feb 04, 2013
  
  c9f75f8b Browse Files
- Merge pull request #1417 from MITx/feature/christina/misc2 · 2306e7c1
```
Try, try again.
```
  Christina Roberts committed Feb 04, 2013
  2306e7c1 Browse Files
- Merge pull request #1416 from MITx/feature/dhm/dnd · 43c2acdb
```
Brian's CSS updates.
```
  Christina Roberts committed Feb 04, 2013
  43c2acdb Browse Files
- Try, try again. · aac179f1
  cahrens committed Feb 04, 2013
  
  aac179f1 Browse Files
- Merge pull request #1414 from MITx/feature/victor/showanswer-past-due · 25bede90
```
Feature/victor/showanswer past due
```
  Sarina committed Feb 04, 2013
  25bede90 Browse Files
- fix typo, add comment · fe42d8e9
  Victor Shnayder committed Feb 04, 2013
  
  fe42d8e9 Browse Files
- Add in methods to query data from the controller for student grading · af6123a1
  Vik Paruchuri committed Feb 04, 2013
  
  af6123a1 Browse Files
- Start to fix up instance states · 4c5e59e8
  Vik Paruchuri committed Feb 04, 2013
  
  4c5e59e8 Browse Files
- studio - resolved safari/webkit display issue with unit editing window's wrapper background color · ffd585ae
  Brian Talbot committed Feb 04, 2013
  
  ffd585ae Browse Files
- studio - overview drag and drop: removed unused scss and hid new unit button while dragging · 6ca55b84
  Brian Talbot committed Feb 04, 2013
  
  6ca55b84 Browse Files
- Proper handling of submissions · ed282c05
  Vik Paruchuri committed Feb 04, 2013
  
  ed282c05 Browse Files
- Trim unneeded files · 6cf2742e
  Vik Paruchuri committed Feb 04, 2013
  
  6cf2742e Browse Files
- Retrack dev · 81b86bb8
  Vik Paruchuri committed Feb 04, 2013
  
  81b86bb8 Browse Files
- Proper redirect behavior · 43ddf1fb
  Vik Paruchuri committed Feb 04, 2013
  
  43ddf1fb Browse Files
- Untrack dev.py, add in redirect code for peer grading · 14676d1c
  Vik Paruchuri committed Feb 04, 2013
  
  14676d1c Browse Files