Commits · 97a32f8ced0d4979022c5513eedeec4f4e0a9ee1 · edx / edx-platform · GitLab

04 Feb, 2013 4 commits
- Remove extra styling. · 97a32f8c
  Diana Huang committed Feb 04, 2013
  
  97a32f8c Browse Files
- Fix max score check for the updated rubric UI stuff. · 4b59e7d5
  Diana Huang committed Feb 04, 2013
  
  4b59e7d5 Browse Files
- Merge branch 'master' into diana/rubric-ui-improvements · f49b5ec7
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	lms/djangoapps/open_ended_grading/grading_service.py
	lms/static/sass/course.scss
```
  Diana Huang committed Feb 04, 2013
  f49b5ec7 Browse Files
- Merge branch 'diana/rubric-ui-improvements' of github.com:MITx/mitx into… · d4481fa9
```
Merge branch 'diana/rubric-ui-improvements' of github.com:MITx/mitx into diana/rubric-ui-improvements
```
  Diana Huang committed Feb 04, 2013
  d4481fa9 Browse Files
01 Feb, 2013 33 commits
- Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes · 01fab2ec
```
Feature/vik/combined xmodule changes
```
  VikParuchuri committed Feb 01, 2013
  01fab2ec Browse Files
- Remove reload test · 9310dcbe
  Vik Paruchuri committed Feb 01, 2013
  
  9310dcbe Browse Files
- Fix JS tests · b609bbee
  Vik Paruchuri committed Feb 01, 2013
  
  b609bbee Browse Files
- Make rubrics spacing smaller and · a85d43a8
```
fix a bug in the grading service renderer
```
  Diana Huang committed Feb 01, 2013
  a85d43a8 Browse Files
- Fix bug in the callback · 71c233af
  Diana Huang committed Feb 01, 2013
  
  71c233af Browse Files
- Make the rubric for self-assessment selectable and remove the · 1c5c54c8
```
separate grade selection.
```
  Diana Huang committed Feb 01, 2013
  1c5c54c8 Browse Files
- Add in some better encouragement to write feedback · 68fc794a
  Diana Huang committed Feb 01, 2013
  
  68fc794a Browse Files
- Remove duplicate Javascript and remove total grade selection. · 745c0527
  Diana Huang committed Feb 01, 2013
  
  745c0527 Browse Files
- Calculate the total score from the rubric. · ba30c2ce
  Diana Huang committed Feb 01, 2013
  
  ba30c2ce Browse Files
- Visual updates to rubric · 0bae9839
  Diana Huang committed Feb 01, 2013
  
  0bae9839 Browse Files
- Refactor rubric JS so that we don't have to keep duplicating this code. · 92b7dbdc
  Diana Huang committed Feb 01, 2013
  
  92b7dbdc Browse Files
- Make rubric cleaner and visually simpler · 1fde3c5e
  Diana Huang committed Feb 01, 2013
  
  1fde3c5e Browse Files
- Add scores to the top of the rubric, remove from individual cells · 7e345ce5
  Diana Huang committed Feb 01, 2013
  
  7e345ce5 Browse Files
- Refactor rubric CSS into a single file. · 69d5c005
  Diana Huang committed Feb 01, 2013
  
  69d5c005 Browse Files
- Make rubrics spacing smaller and · 00ffbc07
```
fix a bug in the grading service renderer
```
  Diana Huang committed Feb 01, 2013
  00ffbc07 Browse Files
- For prod environments only log info and up · 1c09d9ca
  John Jarvis committed Feb 01, 2013
  
  1c09d9ca Browse Files
- pep8 cleanup · f525b17b
  John Jarvis committed Feb 01, 2013
  
  f525b17b Browse Files
- Removing duplicate loggers · 8b012989
  John Jarvis committed Feb 01, 2013
  
  8b012989 Browse Files
- Adding service_variant and a little pep8 cleanup · 4a08bc77
  John Jarvis committed Feb 01, 2013
  
  4a08bc77 Browse Files
- Fix bug in the callback · 91d9bc05
  Diana Huang committed Feb 01, 2013
  
  91d9bc05 Browse Files
- Make the rubric for self-assessment selectable and remove the · 2b764eeb
```
separate grade selection.
```
  Diana Huang committed Feb 01, 2013
  2b764eeb Browse Files
- Add in some better encouragement to write feedback · 1fef6b16
  Diana Huang committed Feb 01, 2013
  
  1fef6b16 Browse Files
- Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems. · 6b6d8a94
  Ned Batchelder committed Feb 01, 2013
  
  6b6d8a94 Browse Files
- Remove duplicate Javascript and remove total grade selection. · cb44918f
  Diana Huang committed Feb 01, 2013
  
  cb44918f Browse Files
- Calculate the total score from the rubric. · 0ec3be18
  Diana Huang committed Feb 01, 2013
  
  0ec3be18 Browse Files
- Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists · 14ca42a5
```
temporary style sync up for course info lists
```
  Christina Roberts committed Feb 01, 2013
  14ca42a5 Browse Files
- Merge pull request #1404 from MITx/feature/edz/service-variant · dce65f2a
```
service variant code for loading different config
```
  Calen Pennington committed Feb 01, 2013
  dce65f2a Browse Files
- temporary style sync up for course info lists - more work needs to be done once… · 61de4c02
```
temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog)
```
  Brian Talbot committed Feb 01, 2013
  61de4c02 Browse Files
- Add comment describing why commented out code is there · c4b9288c
  Vik Paruchuri committed Feb 01, 2013
  
  c4b9288c Browse Files
- Fix jasmine tests? · 78dda497
  Vik Paruchuri committed Feb 01, 2013
  
  78dda497 Browse Files
- Visual updates to rubric · f05bda76
  Diana Huang committed Feb 01, 2013
  
  f05bda76 Browse Files
- Refactor rubric JS so that we don't have to keep duplicating this code. · 6575386d
  Diana Huang committed Feb 01, 2013
  
  6575386d Browse Files
- service variant code for loading different config · 969737c5
  e0d committed Jan 31, 2013
  
  969737c5 Browse Files
31 Jan, 2013 3 commits
- Merge pull request #1403 from MITx/style/btalbot/lms-calendartables · a8950343
```
lms - syllabus/calendar table styling fixes
```
  David Ormsbee committed Jan 31, 2013
  a8950343 Browse Files
- lms - revising xmodule HTML display styles and overwriting some to retain old… · f6cd4c75
```
lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling
```
  Brian Talbot committed Jan 31, 2013
  f6cd4c75 Browse Files
- Fix open ended module tests · c5e80b95
  Vik Paruchuri committed Jan 31, 2013
  
  c5e80b95 Browse Files