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

6923 Commits

Author SHA1 Message Date
Vik Paruchuri
48719a7a45 Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui 
Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
	lms/static/sass/course/_staff_grading.scss
 2013-02-06 16:04:01 -05:00
Brian Wilson
aae5c7ca23 remove unneeded files 2013-02-06 15:25:25 -05:00
Brian Wilson
bfc4527590 Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages. 2013-02-06 15:23:11 -05:00
Vik Paruchuri
9e4e98ef74 Fix some css to get things to properly close/open 2013-02-06 15:13:56 -05:00
Diana Huang
6f147df7f7 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-06 14:16:18 -05:00
Vik Paruchuri
02ac72d0af Doing some restyling on peer grading 2013-02-06 13:49:59 -05:00
Diana Huang
1f5beba383 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-06 13:12:04 -05:00
Your Name
6b4a1dfd34 minor tweaks after testing 2013-02-06 12:54:06 -05:00
Diana Huang
042ae2da29 Fix some bugs with the grading module and make 
the 'closed' page a little nicer
 2013-02-06 12:51:52 -05:00
Diana Huang
78948210b8 Use different template when peer grading is closed. 2013-02-06 11:50:35 -05:00
ichuang
0936f448fc add disable_progress_graph key to course metadata 2013-02-06 03:45:10 +00:00
Kevin Chugh
c7a133470d inline discussions working 2013-02-05 22:43:09 -05:00
Victor Shnayder
219c51f898 Fix placeholder email in signup form 2013-02-05 22:24:20 -05:00
Your Name
d5b70d7bfc inline cohorting working 2013-02-05 18:38:06 -05:00
Diana Huang
51db547a63 Merge branch 'master' into diana/rubric-ui-improvements 
Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
 2013-02-05 16:18:56 -05:00
Diana Huang
120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule 
Feature/vik/peer grading xmodule
 2013-02-05 12:55:48 -08:00
Arthur Barrett
2097b69332 Added button to show/hide guided notes and discussions. 2013-02-05 13:10:23 -05:00
Arthur Barrett
45e4c0cfac Moved discussion thread html to its own template and only scroll when not in view. 2013-02-05 12:37:58 -05:00
Diana Huang
f3be02d772 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-05 09:13:14 -05:00
ichuang
8ff3dde605 for require_attempted display "attempted" instead of "completed" 2013-02-04 19:54:36 -05:00
John Hess
6b8edde601 removed un-enroll all button for fear of disaster 2013-02-04 19:13:01 -05:00
Arthur Barrett
435fd05ef4 Refactored the coffeescript behavior so it is a bit more testable. 2013-02-04 18:25:09 -05:00
Vik Paruchuri
bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule 
Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py
 2013-02-04 17:55:55 -05:00
Vik Paruchuri
eb049bda9e Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging 2013-02-04 17:18:59 -05:00
Vik Paruchuri
7f96fbb3d1 Address review comments 2013-02-04 17:15:07 -05:00
Vik Paruchuri
cbd0895aad Add in single peer grading problem view 2013-02-04 16:42:14 -05:00
Your Name
a8a9975914 Merge branch 'feature/kevin/groups_ui_changes' of github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-02-04 16:40:22 -05:00
jmvt
d6984cced8 Updated code to handle new analytics result format. 2013-02-04 16:08:37 -05:00
Brian Wilson
f8b7d5fad6 have timer redirect when it expires 2013-02-04 15:13:14 -05:00
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
c6c89e4216 Make peer grading xmodule work with notifications 2013-02-04 13:16:05 -05:00
Your Name
bdfc9d9784 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-02-04 12:30:48 -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
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
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
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
Arthur Barrett
0ca7131974 Clicking on annotation span should scroll to the discussion widget. 2013-02-01 16:08:23 -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
0bae983982 Visual updates to rubric 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
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
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