Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9,776 Commits 1 Branch 0 Tags
97a32f8ced0d4979022c5513eedeec4f4e0a9ee1
Commit Graph

9776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
97a32f8ced Remove extra styling. 2013-02-04 12:45:40 -05:00
Diana Huang
4b59e7d551 Fix max score check for the updated rubric UI stuff. 2013-02-04 10:34:00 -05:00
Diana Huang
f49b5ec771 Merge branch 'master' into diana/rubric-ui-improvements 
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
 2013-02-04 09:11:28 -05:00
Diana Huang
d4481fa918 Merge branch 'diana/rubric-ui-improvements' of github.com:MITx/mitx into diana/rubric-ui-improvements 2013-02-04 09:07:19 -05:00
VikParuchuri
01fab2ec68 Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes 
Feature/vik/combined xmodule changes
 2013-02-01 15:46:33 -08:00
Vik Paruchuri
9310dcbe0d Remove reload test 2013-02-01 18:31:50 -05:00
Vik Paruchuri
b609bbeeed Fix JS tests 2013-02-01 15:36:05 -05:00
Diana Huang
a85d43a817 Make rubrics spacing smaller and 
fix a bug in the grading service renderer
 2013-02-01 15:15:42 -05:00
Diana Huang
71c233af15 Fix bug in the callback 2013-02-01 15:15:42 -05:00
Diana Huang
1c5c54c862 Make the rubric for self-assessment selectable and remove the 
separate grade selection.
 2013-02-01 15:15:42 -05:00
Diana Huang
68fc794a97 Add in some better encouragement to write feedback 2013-02-01 15:15:42 -05:00
Diana Huang
745c052775 Remove duplicate Javascript and remove total grade selection. 2013-02-01 15:15:42 -05:00
Diana Huang
ba30c2ce58 Calculate the total score from the rubric. 2013-02-01 15:15:42 -05:00
Diana Huang
0bae983982 Visual updates to rubric 2013-02-01 15:15:42 -05:00
Diana Huang
92b7dbdc69 Refactor rubric JS so that we don't have to keep duplicating this code. 2013-02-01 15:15:42 -05:00
Diana Huang
1fde3c5ec5 Make rubric cleaner and visually simpler 2013-02-01 15:15:42 -05:00
Diana Huang
7e345ce512 Add scores to the top of the rubric, remove from individual cells 2013-02-01 15:15:42 -05:00
Diana Huang
69d5c005c3 Refactor rubric CSS into a single file. 2013-02-01 15:15:42 -05:00
Diana Huang
00ffbc070a Make rubrics spacing smaller and 
fix a bug in the grading service renderer
 2013-02-01 14:34:09 -05:00
John Jarvis
1c09d9cacb For prod environments only log info and up 2013-02-01 13:34:29 -05:00
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00
John Jarvis
8b01298969 Removing duplicate loggers 2013-02-01 13:11:14 -05:00
John Jarvis
4a08bc7759 Adding service_variant and a little pep8 cleanup 2013-02-01 13:10:26 -05:00
Diana Huang
91d9bc05be Fix bug in the callback 2013-02-01 13:06:12 -05:00
Diana Huang
2b764eebad Make the rubric for self-assessment selectable and remove the 
separate grade selection.
 2013-02-01 11:27:53 -05:00
Diana Huang
1fef6b161b Add in some better encouragement to write feedback 2013-02-01 11:21:56 -05:00
Ned Batchelder
6b6d8a94d0 Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems. 2013-02-01 10:50:01 -05:00
Diana Huang
cb44918f49 Remove duplicate Javascript and remove total grade selection. 2013-02-01 10:31:46 -05:00
Diana Huang
0ec3be1815 Calculate the total score from the rubric. 2013-02-01 10:17:16 -05:00
Christina Roberts
14ca42a5dc Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists 
temporary style sync up for course info lists
 2013-02-01 06:51:35 -08:00
Calen Pennington
dce65f2ab7 Merge pull request #1404 from MITx/feature/edz/service-variant 
service variant code for loading different config
 2013-02-01 06:49:51 -08:00
Brian Talbot
61de4c028a temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog) 2013-02-01 09:41:51 -05:00
Vik Paruchuri
c4b9288c6d Add comment describing why commented out code is there 2013-02-01 09:32:29 -05:00
Vik Paruchuri
78dda49764 Fix jasmine tests? 2013-02-01 09:28:52 -05:00
Diana Huang
f05bda7644 Visual updates to rubric 2013-02-01 08:44:08 -05:00
Diana Huang
6575386d69 Refactor rubric JS so that we don't have to keep duplicating this code. 2013-02-01 08:43:55 -05:00
e0d
969737c58e service variant code for loading different config 2013-01-31 21:43:35 -05:00
David Ormsbee
a89503431f Merge pull request #1403 from MITx/style/btalbot/lms-calendartables 
lms - syllabus/calendar table styling fixes
 2013-01-31 15:17:38 -08:00
Brian Talbot
f6cd4c75b8 lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling 2013-01-31 18:15:20 -05:00
Vik Paruchuri
c5e80b9543 Fix open ended module tests 2013-01-31 17:34:33 -05:00
Vik Paruchuri
d6f8def733 Move over rubric parsing logic to rubric module 2013-01-31 17:18:32 -05:00
Vik Paruchuri
b22bad7fa1 Add in some removed imports (fix tests) 2013-01-31 17:11:44 -05:00
Vik Paruchuri
5eff483c76 Fix max score in combined xmodule tests 2013-01-31 17:08:13 -05:00
Vik Paruchuri
524047a11e Fix key error in open ended child 2013-01-31 17:06:37 -05:00
Vik Paruchuri
01cdc6e7f8 Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes 
Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
 2013-01-31 16:50:10 -05:00
Diana Huang
2e0f90081e Make rubric cleaner and visually simpler 2013-01-31 14:23:17 -05:00
Don Mitchell
aad5015a82 Merge pull request #1398 from MITx/feature/christina/misc2 
Fixes date bug (#149).
 2013-01-31 10:59:07 -08:00
Don Mitchell
fbd9a126ba Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs 
add exporting of course info
 2013-01-31 10:55:45 -08:00
Christina Roberts
5f170d118f Merge pull request #1395 from MITx/bug/dhm/mar13 
Remove format field as it's the one for grading type.
 2013-01-31 10:51:44 -08:00
Jay Zoldak
c590c24e25 Add vendor files to files.json for the cms jasmine tests to work. 2013-01-31 13:48:38 -05:00