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

22621 Commits

Author SHA1 Message Date
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
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Diana Huang
95d3957377 Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule 
Patch peer grading tab to work
 2013-02-06 06:07:18 -08: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
Victor Shnayder
739938f35f add readme for symbolicresponse implementation (thanks Ike!) 2013-02-05 20:15:48 -05:00
David Ormsbee
a3a886bd0f Revert "Add tests for django-comment-client models" (which actually had 
a model change as well)

This reverts commit 053547453e.
 2013-02-05 18:51:16 -05:00
David Ormsbee
119b4206a4 Revert "Fix permissions bug and add test cases for django comment client permissions." 
This reverts commit e745087455.
 2013-02-05 18:42:01 -05:00
Your Name
d5b70d7bfc inline cohorting working 2013-02-05 18:38:06 -05:00
Brian Wilson
1b465d1beb implement testcenter_login 2013-02-05 18:01:55 -05:00
Vik Paruchuri
0133c7c669 Patch peer grading tab to work 2013-02-05 16:32:40 -05:00
David Ormsbee
b68aff72f2 Merge pull request #1436 from MITx/debug/dave/sass 
undo pipeline changes
 2013-02-05 13:26:22 -08:00
David Ormsbee
1ef9d6388f re-add compression flag to sass 2013-02-05 16:25:59 -05:00
David Ormsbee
706a1072b9 undo pipeline changes 2013-02-05 16:24:53 -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
Vik Paruchuri
ce87e6f221 Skip two tests 2013-02-05 14:57:59 -05:00
Vik Paruchuri
8027cc7024 Fix some issues with tests 2013-02-05 14:35:44 -05:00
Vik Paruchuri
134f2f7af7 Fix tests, bugfix for problem url error 2013-02-05 14:21:08 -05:00
Vik Paruchuri
e13de7543f Test fixes, err response fixes, address review comments 2013-02-05 14:12:11 -05:00
Vik Paruchuri
34dc6e6320 Fix some issues with peer grading service 2013-02-05 13:37:55 -05:00
David Ormsbee
74c112e5cc Merge pull request #1373 from MITx/feature/zoldak/django-comment-client-tests 
Add unit tests for django comment client
 2013-02-05 10:37:18 -08:00
Vik Paruchuri
7984c4dfcb Move over grading service to xmodule 2013-02-05 13:10:56 -05: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
Calen Pennington
4d8165b2b6 Remove bad import of replace_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
2551243dfa Install the static_replace app for the management command 2013-02-05 11:06:46 -05:00
Calen Pennington
5eae9c3a40 Make lms and cms coverage reports cover common/djangoapps 2013-02-05 11:06:46 -05:00
Calen Pennington
401f564e6a Fix data directory passed to replace_static_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
Vik Paruchuri
e8a690df5e Update peer grading tests 2013-02-05 10:46:00 -05:00
Diana Huang
f3be02d772 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-05 09:13:14 -05:00
David Ormsbee
ecce3e5761 Merge pull request #1426 from MITx/debug/dave/sass 
Comment out YUI compressor (cause *something* is still causing CSS compression)
 2013-02-05 05:59:59 -08:00
David Ormsbee
818cd3aa48 Comment out YUI compressor (cause *something* is still causing CSS compression) 2013-02-05 08:58:59 -05:00
Your Name
837f54c055 inline cohorting almost done 2013-02-04 20:10:08 -05:00
ichuang
8ff3dde605 for require_attempted display "attempted" instead of "completed" 2013-02-04 19:54:36 -05:00
ichuang
630607d345 fix forum management commands (assign_default_role moved); add reload_forum_users 2013-02-05 00:24:43 +00:00
John Hess
6b8edde601 removed un-enroll all button for fear of disaster 2013-02-04 19:13:01 -05:00
Vik Paruchuri
443c3eda4f Tests for peer grading service may be fixed. 2013-02-04 18:37:28 -05:00