Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -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
Deena Wang
25aca5866d Merge branch 'master' into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_access.py
 2013-02-01 10:19:40 -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
Vik Paruchuri
5ac6439cc0 Xmodule working...need to work on some issues (rubric scores not passing properly), and also fix notifications 2013-01-31 20:22:35 -05:00
Vik Paruchuri
d1c55208c1 Clean up response code 2013-01-31 20:08:55 -05:00
Vik Paruchuri
c1583dbba2 Properly load javascript, fix templates to work with xmodule, modify AJAX handlers 2013-01-31 19:57:35 -05:00
Vik Paruchuri
c2f644656d Fix HTML return 2013-01-31 19:12:49 -05:00
Vik Paruchuri
d8b94f91bd Don't pass course to templates 2013-01-31 18:53:17 -05:00
Vik Paruchuri
4608bb274e Fix system passing issues 2013-01-31 18:43:13 -05:00
Arthur Barrett
48bb447fbd Adding basic annotatable module and related files. 2013-01-31 18:42:11 -05:00
Vik Paruchuri
edce6edb99 Clean up peer grading service imports 2013-01-31 18:38:55 -05:00
Vik Paruchuri
4825ad7a15 Fix module imports 2013-01-31 18:35:11 -05:00
Brian Wilson
07638440ac rename testcenter_exam to timed_exam, and read duration from metadata (policy.json) 2013-01-31 18:33:22 -05:00
Vik Paruchuri
59ba308354 Add in peer grading entry point 2013-01-31 18:28:15 -05:00
Vik Paruchuri
bdb82cda65 Strip out JS, old urls 2013-01-31 18:23:30 -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
52f3e9daaf Start moving peer grading to xmodule 2013-01-31 18:05:57 -05:00
Your Name
da1660a043 fix get_cohorted_commentables 2013-01-31 17:34:37 -05:00
Vik Paruchuri
c5e80b9543 Fix open ended module tests 2013-01-31 17:34:33 -05:00
Your Name
f2f7459656 remove more prints 2013-01-31 17:24:08 -05:00
Your Name
c25cd33214 remove print 2013-01-31 17:22:54 -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
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -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
Deena Wang
7908d87902 more tests for views.py 2013-01-31 15:58:14 -05:00
cahrens
d52be03446 Add ACE Editor (contents of src-min-noconflict). 
last commit: 75ba742f4f00cefadfef1ae451cfb2a4280ad367

 package 01.27.2013
 2013-01-31 14:52:06 -05:00
cahrens
c956555da4 Note the codemirror version. 2013-01-31 14:50:21 -05:00
Deena Wang
abc3e5b09d more tests in test_views.py 2013-01-31 14:47:59 -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
cahrens
b613bdc336 Fixes date bug (#149). 2013-01-31 13:37:45 -05:00