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

4251 Commits

Author SHA1 Message Date
Chris Dodge
133bd767d5 small refactoring to use a better semantic with regards to the parameter 2013-03-20 15:26:29 -04:00
Chris Dodge
f462cd6efa if we're loading a course module with depth = 0, then we don't need to fetch/compute inherited metadata 2013-03-20 15:14:14 -04:00
Chris Dodge
5dbb153abe ooops. didn't clean up the merge conflicts 2013-03-20 14:32:18 -04:00
Chris Dodge
8849ce084f Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/disable-metadata-inheritence-computation-on-import 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-20 14:29:43 -04:00
Diana Huang
af1af8c6d1 Address code review feedback: 
- improve docstrings
- only pass in the state for a particular input and
not the whole dictionary
- refactor some common code
- minor syntax cleanup
 2013-03-20 14:14:54 -04:00
Jay Zoldak
23364d8b0f Merge branch 'master' into feature/zoldak/refactor-factories 2013-03-20 13:36:01 -04:00
Jay Zoldak
5eba299dca Move course and item factories to xmodule.modulestore.tests 2013-03-20 12:10:18 -04:00
chrisndodge
f7700dfc6a Merge pull request #1700 from MITx/feature/christina/mongo-debug-toolbar 
Reduce pep8 warnings.
 2013-03-20 08:27:32 -07:00
Diana Huang
57f7acf863 Unbreak grading for capa problems 
Clean up some pylint errors
 2013-03-20 09:23:25 -04:00
Diana Huang
f4d68d77f6 Add Javascript for new button and fix Python backend issues 2013-03-20 09:23:25 -04:00
Diana Huang
8649d67b9d Force the progress bar update when we get a code response answer. 2013-03-20 09:23:25 -04:00
Diana Huang
521c469a35 Add the ability for input types to have their own state 
and add in a handler for ungraded responses via xqueue
 2013-03-20 09:23:25 -04:00
Diana Huang
eda6169b8b Pass along a url creator as opposed to just a url through 
the ModuleSystem.
 2013-03-20 09:23:25 -04:00
Diana Huang
58e8f7db12 - Pep8 and pylint fixes 
- beginnings of new Matlab input type
- update progress after getting a response from xqueue
 2013-03-20 09:23:25 -04:00
Alexander Kryklia
05ba082c8f Merge pull request #1692 from MITx/fix/valera/polls_firefox_button_not_blue 
Bug fix for Polls tool.
 2013-03-20 01:53:15 -07:00
Mark L. Chang
10ac7e04f8 copy finalized 2013-03-19 21:31:59 -04:00
Chris Dodge
e0d1449e91 add a finally statement to be sure to turn back on event firing on writes in case an import throws an exception 2013-03-19 17:42:21 -04:00
cahrens
f5bae8d8e3 Reduce pep8 warnings. 2013-03-19 17:29:06 -04:00
cahrens
b5a587d8d0 Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False. 2013-03-19 16:57:19 -04:00
Valera Rozuvan
0884051b32 Fixed bug where in firefox a marked poll button was not highlighted in blue. 2013-03-19 19:29:09 +02:00
Vasyl Nakvasiuk
3c645de43f extend xmodule.ConditionalModule docstrings 2013-03-19 17:29:28 +02:00
Calen Pennington
8fda5af4e4 Comment cleanup 2013-03-19 10:54:46 -04:00
Calen Pennington
0209c883bb Remove trailing whitespace 2013-03-19 10:41:38 -04:00
Calen Pennington
94d3ccf674 Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data 2013-03-19 10:41:12 -04:00
cahrens
dc89a4b3d5 Beginning of Selenium test, updates to work with master. 2013-03-18 21:25:44 -04:00
Arthur Barrett
1b08071fdc merged from master and resolved conflict with annotatable module. 2013-03-18 15:51:27 -04:00
Arthur Barrett
7507f91d22 Added TODO and explanation for the top-level scss variables. 2013-03-18 15:43:43 -04:00
cahrens
49ee903eda Merge branch 'master' into feature/btalbot/studio-checklists 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/template_loader.js
 2013-03-18 15:30:19 -04:00
cahrens
f6fb64f130 Saving checkbox state, client template for individual checklist. 2013-03-18 15:03:54 -04:00
Chris Dodge
e59b650fab add an array of courses to not refresh the metadata cache on writes. This is needed for imports where we are doing bulk updates otherwise, the DB gets thrashed and the import takes too long, timing out the browser 2013-03-18 15:02:49 -04:00
Vasyl Nakvasiuk
f172405c9a remove xml documentation from docs/source/ 2013-03-18 15:37:29 +02:00
Chris Dodge
9a18685c1c add a discussion module write through cache to speed up Forum rendering 2013-03-18 09:01:54 -04:00
Chris Dodge
3e65a68828 auto generate the discussion id on create. Also add 'discussion_id' to the list of 'system-metadata' so that end users cannot edit it 2013-03-15 23:01:03 -04:00
Chris Dodge
b54ebb3460 make discussion module use MetadataOnlyEditingDescriptor which will not present a code edit region and only display the metadata editor 2013-03-15 22:43:20 -04:00
Chris Dodge
03caf94c98 remove redundent XML attribtues which are in metadata 2013-03-15 16:26:39 -04:00
Vik Paruchuri
e4efda9a47 Reformat code 2013-03-15 16:21:36 -04:00
Vik Paruchuri
cd3e88fdd5 Fix version tuples to be a dictionary 2013-03-15 16:05:38 -04:00
Vik Paruchuri
500c4ab86e Convert versions to tuples 2013-03-15 15:40:04 -04:00
Vik Paruchuri
01b1974f50 Address review comment 2013-03-15 15:15:23 -04:00
Vik Paruchuri
b609ab0e6a Convert to using versioninteger class 2013-03-15 15:05:47 -04:00
Vik Paruchuri
405ea8d675 Remove copy.copy 2013-03-15 14:57:48 -04:00
Vik Paruchuri
97839d9de5 Fix default version string integer issues 2013-03-15 14:52:55 -04:00
Vik Paruchuri
c34666af80 Fix version handling 2013-03-15 14:20:55 -04:00
Calen Pennington
9f99c9004b Fix up capa tests 2013-03-15 11:28:33 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
 2013-03-15 09:46:47 -04:00
Calen Pennington
116ecf2a50 Disable sequence nav buttons when the sequence is empty 2013-03-15 08:39:24 -04:00
Calen Pennington
44e6572e12 Make StringyInteger and StringyFloat return None when they can't parse the string from json, and don't try to overwrite max_attempts if it's '' 2013-03-15 08:25:27 -04:00
Will Daly
ce5e86895a Fixed pep8 2013-03-14 14:45:08 -04:00
Will Daly
5e433cda2e Clarified comments about the logic of showing the save button 2013-03-14 14:43:04 -04:00