Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

3715 Commits

Author SHA1 Message Date
Kevin Chugh
3009acbb10 showing group names 2013-02-04 14:50:53 -05:00
Vik Paruchuri
6cf2742e32 Trim unneeded files 2013-02-04 14:22:57 -05:00
Vik Paruchuri
81b86bb8fe Retrack dev 2013-02-04 14:16:26 -05:00
Vik Paruchuri
43ddf1fbcf Proper redirect behavior 2013-02-04 14:14:15 -05:00
Vik Paruchuri
14676d1c32 Untrack dev.py, add in redirect code for peer grading 2013-02-04 14:05:02 -05:00
Vik Paruchuri
3380745692 About to trim some lines 2013-02-04 13:54:27 -05:00
Vik Paruchuri
c6c89e4216 Make peer grading xmodule work with notifications 2013-02-04 13:16:05 -05:00
Vik Paruchuri
7263cbfcca Fixes to make peer grading show up in notifications 2013-02-04 12:41:14 -05:00
Your Name
bdfc9d9784 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-02-04 12:30:48 -05:00
Vik Paruchuri
f742b7d865 Start to integrate peer grading xmodule back into notifications 2013-02-04 12:07:03 -05:00
Vik Paruchuri
8bd7b60aca Add in key to mock peer grading service 2013-02-04 10:50:07 -05:00
Vik Paruchuri
c991c0489c Fix open ended test with flagging 2013-02-04 10:26:25 -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
Kevin Chugh
69225f6435 cohort ID showing, have to translate to display text 2013-02-04 08:33:33 -05:00
Brian Wilson
1685f302ab add TimerModule to courseware 2013-02-04 02:22:24 -05:00
ichuang
ddc8bf2b42 add instructor dashboard feature to download profile & problem state 2013-02-04 04:47:27 +00:00
ichuang
363ca7031e add coffeescript/js for conditional module, does XModule.loadModules 2013-02-03 18:53:51 -05:00
ichuang
19051e40d2 use ajax for doing conditional_module 2013-02-03 18:53:51 -05:00
ichuang
8db96abb18 conditional_module.html 2013-02-03 18:53:51 -05:00
Kevin Chugh
fcbd4bd1cd produce and consume group_id from dropdowns 2013-02-02 05:46:11 -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
d9517877a4 Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging 2013-02-01 18:32:48 -05:00
Brian Wilson
9d98b7055d add course navigation back into timed exam. Add initial timer styling. 2013-02-01 17:52:14 -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
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
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00
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
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
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
e0d
969737c58e service variant code for loading different config 2013-01-31 21:43:35 -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
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
bdb82cda65 Strip out JS, old urls 2013-01-31 18:23:30 -05: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
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
b22bad7fa1 Add in some removed imports (fix tests) 2013-01-31 17:11:44 -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
Vik Paruchuri
f3f509da3b Fix input area styling 2013-01-31 12:45:48 -05:00
Vik Paruchuri
63d4ac8c44 Working on some flagging coffeescript 2013-01-31 12:17:21 -05:00