Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

10211 Commits

Author SHA1 Message Date
Vik Paruchuri
b1726dae99 Fix prompt UI in combined open ended to close by default and be collapsible 2013-02-07 13:48:32 -05:00
Vik Paruchuri
5ef4af5afd Fix peer and staff grading interfaces 2013-02-07 12:54:36 -05:00
Vik Paruchuri
ade44c330d Make staff grading interface much nicer 2013-02-07 12:45:08 -05:00
Vik Paruchuri
baba8d3a36 Add collapse action into staff grading view 2013-02-07 12:42:05 -05:00
Vik Paruchuri
3457b86bd0 Fix JS, style student response box 2013-02-07 12:36:57 -05:00
Brian Talbot
6d4cb558d3 lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav 2013-02-07 12:35:52 -05:00
David Ormsbee
1c07fae501 Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump 
add instructor dashboard feature to download profile & problem state
 2013-02-07 08:19:52 -08:00
David Ormsbee
b947b88453 Merge pull request #1460 from MITx/fix/cdodge/remove-csrf-cookie-domain 
remove CSRF cookie domain setting in aws.py
 2013-02-07 08:17:34 -08:00
Chris Dodge
0394e33652 remove CSRF cookie domain setting in aws.py 2013-02-07 11:15:23 -05:00
Vik Paruchuri
c195fe65cd Restyle rubric list, submission container 2013-02-07 11:10:29 -05:00
Vik Paruchuri
aa699905d6 Feedback and view only rubric restyle 2013-02-07 10:32:39 -05:00
Chris Dodge
faf7c64ea5 add try/catch and fallback to returning a path to the root of the course 2013-02-07 10:32:13 -05:00
Vik Paruchuri
f22849ebdd Re-arrange feedback, fix rubric HTML issue 2013-02-07 10:29:58 -05:00
Vik Paruchuri
b30407d7c8 Work on showing results properly 2013-02-07 10:22:33 -05:00
Vik Paruchuri
de8e1e9472 Change around some names, restyle rubric 2013-02-07 09:57:41 -05:00
Vik Paruchuri
03a6572bbe Restyle status, get rubric to work properly 2013-02-07 09:49:56 -05:00
Diana Huang
e6957a01a4 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-07 09:44:31 -05:00
Diana Huang
97655d0358 Remove the requirement that the problem peer grading module 
has to have a certain naming structure
 2013-02-07 09:40:30 -05:00
Vik Paruchuri
2542b6cb72 Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui 2013-02-07 09:26:40 -05:00
Vik Paruchuri
6a6962df9e Alter rubric list, restyle rubric 2013-02-07 09:26:27 -05:00
ichuang
bf17341fdb add select_related("profile") 2013-02-06 23:16:44 -05:00
David Ormsbee
a6b35853f9 Merge pull request #1455 from MITx/hotfix/dave/youtube_object 
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
 2013-02-06 19:47:25 -08:00
David Ormsbee
976776643b Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue. 2013-02-06 22:46:22 -05:00
Victor Shnayder
37b735d708 Merge pull request #1454 from MITx/hotfix/dave/youtube_object 
Hack to disable YouTube <iframe> API when they break it.
 2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12 Hack to disable YouTube <iframe> API when they break it. 2013-02-06 22:37:41 -05:00
Kevin Chugh
d047d826c7 update coffeescript to hide cohort choice if first commmentable is not cohorted 2013-02-06 22:00:03 -05:00
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9 Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 965e3b4c49, reversing
changes made to 1a7d2a06a8.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
 2013-02-06 20:27:01 -05:00
Victor Shnayder
edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean 2013-02-06 18:53:14 -05:00
Victor Shnayder
965e3b4c49 Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes 
addressed somme comments in pull request and instructor fixes and blank ...
 2013-02-06 15:40:33 -08:00
Kevin Chugh
1dd0ef274d addressed somme comments in pull request and instructor fixes and blank group fix 2013-02-06 18:26:41 -05:00
Victor Shnayder
1a7d2a06a8 Merge pull request #1442 from MITx/marketing/reg-tweak 
Fix placeholder email in signup form
 2013-02-06 15:26:26 -08:00
Kevin Chugh
55c205b9b4 merged master 2013-02-06 17:13:52 -05:00
Vik Paruchuri
83608fd983 Restyle lists 2013-02-06 16:58:59 -05:00
Vik Paruchuri
28a0e44120 Quick rubric restyle 2013-02-06 16:57:10 -05:00
Vik Paruchuri
8bc98b2ff8 Fix sass 2013-02-06 16:32:16 -05:00
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
Chris Dodge
114d800c6a need to make path_to_location a dictionary since it needs to be keyed by the location 2013-02-06 15:17:47 -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
Chris Dodge
5a25d7fa6e Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-discussion-modules 
Conflicts:
	lms/djangoapps/django_comment_client/utils.py
 2013-02-06 14:05:56 -05:00
Vik Paruchuri
02ac72d0af Doing some restyling on peer grading 2013-02-06 13:49:59 -05:00
Chris Dodge
6ed2737c36 make LMS forum subsystem more robust in case of orphaned discussion modules. Given our draft/non-draft duality, we don't currently have a means to always do proper housekeeping at this point in time. However, we have to stop the LMS Forums from blowing up when encoutering one of these. 2013-02-06 13:32:50 -05:00
Diana Huang
4adf2f6180 Merge branch 'master' into diana/rubric-ui-improvements 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
 2013-02-06 13:16:24 -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