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

7928 Commits

Author SHA1 Message Date
Vik Paruchuri
dc7913dc1e Add in a log debug message for except clause. 2013-04-16 10:55:58 -04:00
Vik Paruchuri
0d4b9d26cf Add in a test, rescale preview images 2013-04-16 10:51:23 -04:00
Vik Paruchuri
9acc592279 Comments for hotkeys 2013-04-16 10:23:08 -04:00
Brian Wilson
7486e0f637 cope with ErrorModule as source (or required) module, and add tests. 2013-04-16 01:00:46 -04:00
Chris Dodge
8ece663284 more drive by violation fixes 2013-04-12 15:45:27 -04:00
Chris Dodge
6d6b3a59fe violation fixes 2013-04-12 15:27:36 -04:00
Chris Dodge
1a3c622bb6 actually the query parameter is '_id.revision' not just 'revision' 2013-04-11 22:32:35 -04:00
Chris Dodge
cf7d7bd2d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 2013-04-11 22:12:17 -04:00
Chris Dodge
8fd8574357 get_items has an query ambiguity with respect to revision=None. None has a special semantic in get_items as a wildcard, so if we query with 'None' then we'll get back both draft and non-draft items. 2013-04-11 22:10:30 -04:00
Christina Roberts
c455710cca Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements 
Fix/cdodge/studio forum improvements
 2013-04-11 10:37:49 -07:00
Vik Paruchuri
358482c55b Add in test for child weight 2013-04-11 11:54:00 -04:00
Vik Paruchuri
4d3b4a60d6 Significantly less verbose test code 2013-04-11 11:51:27 -04:00
Vik Paruchuri
442d0fcf4f Add tests for orderings with only one task 2013-04-10 17:41:10 -04:00
Vik Paruchuri
09e18cb815 Add in tests for alternate xml orderings 2013-04-10 17:38:31 -04:00
Vik Paruchuri
ca2eb9cd1b Add in tests for combinedopenended scoring 2013-04-10 17:33:43 -04:00
Vik Paruchuri
820a2b407a Add in js image upload preview 2013-04-10 17:06:02 -04:00
Vik Paruchuri
9f04769c00 Better confirmation for flagging 2013-04-10 16:16:13 -04:00
Don Mitchell
f6434ed4fb Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules 
Fix/cdodge/export draft modules
 2013-04-10 13:12:09 -07:00
Vik Paruchuri
a64d57ae1d Add popup when flag box is checked 2013-04-10 16:01:56 -04:00
Vik Paruchuri
2a5631da86 Code cleanup 2013-04-10 15:26:45 -04:00
Vik Paruchuri
cef4d0cb09 Display instructor feedback 2013-04-10 15:25:05 -04:00
Vik Paruchuri
799c8282bc Fix hotkeys for combined open ended 2013-04-10 15:15:22 -04:00
Vik Paruchuri
d0ecbbb4cf Fix hotkeys in peer and staff grading to use ctrl prefix 2013-04-10 15:10:48 -04:00
cahrens
40adfa950d Get the "Edit High Level Source" link back in. Broken with xblock work. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
 2013-04-10 14:53:26 -04:00
Chris Dodge
0a2937311d remove commented out code. Also fix up indents and other violations 2013-04-10 12:34:18 -04:00
Chris Dodge
d9fa723eb2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2013-04-10 12:02:16 -04:00
Chris Dodge
5e3ca48c8d address some violations 2013-04-10 09:40:23 -04:00
Chris Dodge
07b9d6353e Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 2013-04-10 09:26:51 -04:00
Vik Paruchuri
463a88ccfb Display rubric to students after calibration 2013-04-09 16:54:27 -04:00
Vik Paruchuri
7d38147490 Remove attempts field from peer grading template 2013-04-09 15:34:35 -04:00
Vik Paruchuri
418f218eec Fix some templates, minor code reformats 2013-04-09 15:33:11 -04:00
Vik Paruchuri
247ccc37a6 Code reformat, patch score gen 2013-04-09 14:47:26 -04:00
Vik Paruchuri
112fb4539b Correctly calculate score for combinedopenended and peer assessment 2013-04-09 14:43:41 -04:00
Vik Paruchuri
45a3dd4ee0 Fix file uploads to work after error 2013-04-09 14:13:29 -04:00
Vik Paruchuri
448c8121c3 Patch combinedopenended to work if self assessment is not first 2013-04-09 13:37:37 -04:00
Sarina
74104d6081 Merge pull request #1831 from MITx/vik/fix/pg-and-progress 
Fix weighting and score generation
 2013-04-08 14:37:07 -07:00
Vik Paruchuri
7d09617ec9 Fix weighting and score generation 2013-04-08 16:52:18 -04:00
Chris Dodge
54afc5eb63 seems like we need to purge 'filename' from both _model_data as well as xml_attributes 2013-04-08 16:09:41 -04:00
Chris Dodge
a0f5a51135 wip to fix broken test 2013-04-08 15:34:12 -04:00
Chris Dodge
4cbb92533f fix broken unit test 2013-04-08 15:08:05 -04:00
Chris Dodge
d7b148d0d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/draft.py
 2013-04-08 15:02:47 -04:00
Chris Dodge
c12d265a21 calling update_item implicitly already puts the data in definition.data, so we want to make sure we don't end up nesting definition.data.data 2013-04-08 15:00:54 -04:00
Chris Dodge
0b26cc2635 fix line breaks per Cale 2013-04-08 14:48:16 -04:00
Chris Dodge
069f997595 import was putting the xml data into definition.data.data rather than definition.data 2013-04-08 14:33:46 -04:00
chrisndodge
9a405ff44c Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through 
extend the list of container module names to our comuputation of inherit...
 2013-04-08 11:11:14 -07:00
Chris Dodge
7cd4310c32 extend the list of container module names to our comuputation of inherited metadata 2013-04-08 12:12:23 -04:00
chrisndodge
a57e0fa2c5 Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl 
make "edit" links work - fixes giturl (was broken by xblocks migration)
 2013-04-08 08:17:31 -07:00
Don Mitchell
c6bec6bcad Merge pull request #1812 from MITx/feature/christina/gmt 
Display UTC on the end of dates (that are in UTC).
 2013-04-08 07:00:08 -07:00
cahrens
c4befa136f pep8 2013-04-08 09:15:07 -04:00
cahrens
f0d2ff7ba4 Change display_timezone to show_timezone. 2013-04-08 09:11:10 -04:00