Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,886 Commits 1 Branch 0 Tags
772e805eb69d03b4985ba4185b2abb963cd5e49f
Commit Graph

3197 Commits

Author SHA1 Message Date
Chris Dodge
195fd2d1fe optimize the result-set that gets returned from Mongo on metadata inheritence. We just need the fields which are actually inheritable, so no need to return anything else as it gets filtered out during the computation 2013-03-26 23:48:06 -04:00
Calen Pennington
e0343342b0 Fix typo during pylint fixes 2013-03-26 16:36:58 -04:00
Calen Pennington
1f11508ac6 Pylint cleanup 2013-03-26 16:30:55 -04:00
Calen Pennington
90553a1b1d Use get_many and set_many to cut down on the number of metadata trees to retrieve, and only retrieve them once per call to _load_items 2013-03-26 16:19:34 -04:00
Carlos Andrés Rocha
0612b0eb94 Add tests to advertised_start for partially parsable dates 2013-03-26 13:13:55 -04:00
Carlos Andrés Rocha
586f566b42 Use advertised_start as a simple string 
LMS Lighthouse [#297]
 2013-03-26 11:54:32 -04:00
Calen Pennington
83c0feb84c Merge pull request #1738 from MITx/fix/cdodge/too-many-depth-levels 
it appears we are taking one too many round trips to do when pre-fetchin...
 2013-03-26 03:42:19 -07:00
Chris Dodge
7dcb1bf7c6 it appears we are taking one too many round trips to do when pre-fetching children. This can be very expensive as the tree gets wider the deeper we go. For example, in courseware we want depth=2 (course, chapter, sequential). But looking at log output we were also getting verticals, which there can be a lot of. This should cut down on the total data we are grabbing from the DB. 2013-03-25 16:09:13 -04:00
Will Daly
3084361042 Updated template to correctly handle checkbox values 2013-03-25 15:12:06 -04:00
Will Daly
1df35507a3 Changed 'in' to '==' to fix bug #258 2013-03-25 14:13:47 -04:00
Carlos Andrés Rocha
a5a126ac93 Fix incorrect date in test for course xmodule 2013-03-25 11:28:40 -04:00
Victor Shnayder
f0e1b477f7 Merge pull request #1703 from MITx/feature/diana/matlab-input 
Matlab Input Type
 2013-03-25 08:27:56 -07:00
Diana Huang
4bda05d9eb Fix seed assignment priority and add clearer documentation 2013-03-25 11:22:56 -04:00
Diana Huang
cda0fa0aa5 Check for None specifically when setting a new seed. 2013-03-25 11:08:51 -04:00
cahrens
ecf395d692 Upadate link to static documentation. 2013-03-25 10:39:35 -04:00
Don Mitchell
264ca65640 Add some comments 2013-03-25 09:37:00 -04:00
Don Mitchell
884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse 
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
 2013-03-22 16:56:31 -04:00
Don Mitchell
056b7d3427 More unit tests which found another timezone assumption :-) 2013-03-22 16:45:21 -04:00
David Ormsbee
5863ba5ac4 Merge pull request #1686 from MITx/feature/vaxxxa/docs-poll-conditional-xml 
Feature/vaxxxa/docs poll conditional xml
 2013-03-22 13:30:47 -07:00
Don Mitchell
8370124e2b Make to and from json for dates use iso format esp for timezone. 2013-03-22 16:16:32 -04:00
Don Mitchell
2dcfd1eba1 Merge pull request #1719 from MITx/feature/btalbot/studio-checklists 
Add course checklists to Studio
 2013-03-22 12:49:30 -07:00
Jay Zoldak
08c5ab3cc9 pep8 fixes 2013-03-22 11:38:58 -04:00
Jay Zoldak
25ceea175c Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests 
Feature/will/speed up lettuce tests
 2013-03-21 12:17:07 -07:00
cahrens
1ae9e9bde3 Tests for opening action links. 2013-03-21 13:56:11 -04:00
cahrens
8ca6e324af Merge branch 'master' into feature/btalbot/studio-checklists 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/sass/base-style.scss
	cms/urls.py
 2013-03-21 12:23:13 -04:00
Will Daly
6728f16ae4 Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests 
Conflicts:
	lms/djangoapps/courseware/features/problems.py
 2013-03-21 10:49:04 -04:00
Chris Dodge
9cd38d115e import needs to enumerate through the fields for all content scopes. Also add unit test 2013-03-20 21:37:09 -04:00
Diana Huang
204f89d4dc Make sure we are still showing the 
message when we are queued as well.
 2013-03-20 17:16:04 -04:00
cahrens
fd9c29f449 Merge branch 'master' into feature/btalbot/studio-checklists 2013-03-20 16:37:56 -04:00
cahrens
6d6e144c35 Urls working. 2013-03-20 16:37:08 -04:00
Calen Pennington
93eebdcd97 Merge pull request #1709 from MITx/fix/cdodge/dont-compute-inherited-metadata-on-course-loads-with-depth-zero 
if we're loading a course module with depth = 0, then we don't need to f...
 2013-03-20 12:45:18 -07:00
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
10c6e7615b More polish for matlab input type 2013-03-20 10:09:44 -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