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

4084 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
8428119856 Merge pull request #1696 from MITx/feature/will/coderesponse_lettuce_tests 
Feature/will/coderesponse lettuce tests
 2013-03-20 10:20:11 -07:00
Jay Zoldak
5eba299dca Move course and item factories to xmodule.modulestore.tests 2013-03-20 12:10:18 -04:00
Jay Zoldak
192b991334 Pylint for lettuce factory refactor. 2013-03-20 11:52:15 -04:00
Jay Zoldak
6048bc2832 Pep8 fixes for factory refactor 2013-03-20 11:31:12 -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
Will Daly
5411fc765e Refactored lettuce test of capa problems to use 
world.css_click() helper instead of directly
calling splinter.
 2013-03-20 11:27:28 -04:00
Jay Zoldak
e45ccbf389 Leave CourseEnrollment factor refactoring as a TODO. 2013-03-20 11:12:54 -04:00
Diana Huang
2415680efd Merge pull request #1677 from MITx/victor/fix-auto-cohorting 
Fix randomness bug in cohort placement
 2013-03-20 07:50:43 -07:00
Brian Talbot
9069d822a4 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-20 10:38:07 -04:00
Diana Huang
10c6e7615b More polish for matlab input type 2013-03-20 10:09:44 -04:00
Jay Zoldak
16773aac63 More factory refactoring. 2013-03-20 09:38:53 -04:00
Jay Zoldak
3576a3154b Repoint factory references in lettuce tests to world. 2013-03-20 09:38:52 -04:00
Jay Zoldak
1c4ffcf122 Fix import statement for test.py 2013-03-20 09:38:52 -04:00
Jay Zoldak
74653ff8ad Factory refactor working for lms lettuce tests. 2013-03-20 09:38:52 -04:00
Diana Huang
57f7acf863 Unbreak grading for capa problems 
Clean up some pylint errors
 2013-03-20 09:23:25 -04:00
Diana Huang
a2957cb3b7 Add in some JS messages for when things go wrong. 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
45d8086e1c Set up ajax to submit to XQueue. Add some unit tests to make sure 
this is working properly
 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
Will Daly
66434d7d05 Moved XQueue mock from terrain into LMS, so that the 
server is not created for cms tests.
 2013-03-19 15:55:05 -04:00
Will Daly
20ccf5937b Implemented CodeResponse lettuce tests 2013-03-19 15:55:05 -04:00
Will Daly
2087b81573 Created MockXQueueServer which listens on a local port 
and simulates an XQueue.
 2013-03-19 15:53:06 -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
e0d
39d451d92a Merge pull request #1687 from MITx/hotfix/edz/pinning 
Allow backwards compatibility for forums pinning UI.
 2013-03-19 09:31:14 -07: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
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
Jay Zoldak
a70a23a48e Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests 
Feature/will/courseware lettuce tests
 2013-03-18 12:24:19 -07: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
VikParuchuri
9a59336b5e Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite 
Fix version handling for combined open ended
 2013-03-18 11:58:38 -07:00
Jay Zoldak
b6e82afb0e Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests 
Fix/will/fix broken jasmine lms tests
 2013-03-18 11:53:22 -07:00
Will Daly
568f557dfc Pep8 fixes 
Changed constant to uppercase
 2013-03-18 13:57:26 -04:00