Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,979 Commits 1 Branch 0 Tags
cf81fb27e80fdc7bb71ad1ac1f418aed48d46259
Commit Graph

3015 Commits

Author SHA1 Message Date
Vik Paruchuri
cf81fb27e8 Add in close date to metadata 2013-02-06 15:55:39 -05:00
Vik Paruchuri
733faebaf0 Fix git issue 2013-02-06 15:28:05 -05:00
Vik Paruchuri
5a51d142bb Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
 2013-02-06 15:26:01 -05:00
Vik Paruchuri
f568e49265 Fix oe version tests 2013-02-06 15:20:02 -05:00
Diana Huang
f42f84d9e8 Merge pull request #1440 from MITx/diana/rubric-ui-improvements 
Rubric UI updates
 2013-02-06 11:04:44 -08:00
Diana Huang
f3fa438018 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/timeparse.py
 2013-02-06 13:26:22 -05:00
Vik Paruchuri
ddda9ba55d Try to fix tests 2013-02-06 13:19:37 -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
Vik Paruchuri
96636681e9 Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:16:02 -05:00
Diana Huang
1f5beba383 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-06 13:12:04 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Jay Zoldak
fde6d1ba1c Refactor tests for cms contentstore. 2013-02-06 10:42:21 -05:00
Jay Zoldak
2c5a7ccdf7 Rearrange factories and clean up imports 2013-02-06 10:36:28 -05:00
Diana Huang
f9304a88cb Remove unneeded error type. 2013-02-06 09:15:24 -05:00
Vik Paruchuri
94e6346cf2 Fix combined open ended tests 2013-02-05 19:04:30 -05:00
Vik Paruchuri
a1e73392c1 Fix descriptor creation 2013-02-05 19:02:21 -05:00
Vik Paruchuri
0fc50095d9 Fix combined open ended tests 2013-02-05 18:53:53 -05:00
Vik Paruchuri
8877ec3500 More robust default version 2013-02-05 18:38:21 -05:00
Diana Huang
6e7287dd8e Fix some bugs in the peer grading problem code. 2013-02-05 17:36:06 -05:00
Vik Paruchuri
1d3f8f0655 Pass display name and content link rewriting down the chain 2013-02-05 16:54:57 -05:00
Vik Paruchuri
8e7fa6c90c Support due date and display name 2013-02-05 16:48:21 -05:00
Vik Paruchuri
e6770bcaa7 Parse and pass metadata 2013-02-05 16:42:56 -05:00
Christina Roberts
0d8cfb9baa Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404 
change from throwing a Http404 exception, which I believe will try to re...
 2013-02-05 13:36:28 -08:00
Chris Dodge
3fa1fe0cd6 change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404. 2013-02-05 16:26:07 -05:00
Vik Paruchuri
3dc05aa904 Make some bug fixes, alter definition passing to work 2013-02-05 16:25:46 -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
Vik Paruchuri
ce0b31465c Add in methods to interact with xmodule, change descriptor 2013-02-05 16:17:55 -05:00
Christina Roberts
8c4b661292 Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote 
studio - resolved HTML display issue with bold and blockquote
 2013-02-05 13:13:44 -08:00
Diana Huang
a7588410b2 Fix tests 2013-02-05 16:11:04 -05:00
Vik Paruchuri
8ab76f72ad Switching over to a versioning system 2013-02-05 16:07:35 -05:00
Diana Huang
31c89e6d03 Consolidate error messages. 2013-02-05 16:06:14 -05:00
Diana Huang
c70531ae27 Move closed check logic into the OpenEndedChild 2013-02-05 16:00:16 -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
Diana Huang
018412ca26 Return False to make this code clearer 2013-02-05 15:41:23 -05:00
Diana Huang
37900c3f76 Add more error logging for date parsing and make 
the closure checking more robust
 2013-02-05 15:37:20 -05:00
Brian Talbot
d713b288b5 studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style 2013-02-05 15:21:41 -05:00
Vik Paruchuri
ce87e6f221 Skip two tests 2013-02-05 14:57:59 -05:00
Vik Paruchuri
cae65706fd Pare down on peer grading service 2013-02-05 14:37:08 -05:00
Vik Paruchuri
8027cc7024 Fix some issues with tests 2013-02-05 14:35:44 -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
Vik Paruchuri
7984c4dfcb Move over grading service to xmodule 2013-02-05 13:10:56 -05:00
Calen Pennington
0350d15e29 Make static_replace fall back to data_directory prefix, if it doesn't find the file anywhere else 2013-02-05 11:06:46 -05:00
Calen Pennington
90107fa88f Import cache function correctly 2013-02-05 11:06:46 -05:00
Calen Pennington
10f8dbfa46 Handle options passed to clear_collectstatic_cache 2013-02-05 11:06:46 -05:00
Calen Pennington
ae5d3cbc57 Add admin command to flush the staticfiles cache 2013-02-05 11:06:46 -05:00
Calen Pennington
8592db92bf Add more tests of static_replace 2013-02-05 11:06:46 -05:00
Calen Pennington
f1f2bd8fd2 Start adding tests for static replacement 2013-02-05 11:06:46 -05:00
Calen Pennington
ba7bd9022b Replace the correct /course/ urls, rather than /courses/ 2013-02-05 11:06:46 -05:00
Calen Pennington
0da1467a90 Pull out missing variable 2013-02-05 11:06:46 -05:00