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

4029 Commits

Author SHA1 Message Date
Victor Shnayder
68902b8039 Merge pull request #1747 from MITx/fix/cdodge/should-return-404-on-bad-asset-request 
if we parse an invalid location in the content store middleware, then re...
 2013-03-27 07:09:38 -07:00
Christina Roberts
d4eca16f04 Merge pull request #1745 from MITx/feature/rocha/fix-advertised-start 
Display advertised date correctly if it is an ISO date
 2013-03-27 06:23:57 -07:00
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
Chris Dodge
b0e2c82ad3 actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test. 2013-03-26 20:02:29 -04:00
Chris Dodge
a44ecdfcd6 if we parse an invalid location in the content store middleware, then return a 404, not a 500 2013-03-26 16:45:47 -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
84f2cc8af6 Display advertised date correctly if it is an ISO date 2013-03-26 15:08:44 -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
Mark L. Chang
d7057ef56d Merge pull request #1732 from MITx/bug/christina/studio 
Upadate link to static documentation.
 2013-03-25 07:58:14 -07:00
Victor Shnayder
235cce1323 Merge pull request #1713 from MITx/jmclaus/edit-molecule-css-fix 
CSS from JSME doesn't affect surrounding content now
 2013-03-25 07:51:02 -07: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
cahrens
a2a1478d92 Fix caching bug on back button. 2013-03-22 09:51:45 -04:00
Carlos Andrés Rocha
4d266fa3ca Merge pull request #1718 from MITx/victor/fewer-phds-more-associates 
In sign up form, merge PhD-science and PhD-other, add Associate's degree
 2013-03-21 14:35:16 -07:00
Victor Shnayder
3f18e5c3d7 In sign up form, merge PhD-science and PhD-other, add Associate's degree 
Includes corresponding documentation changes.

Per request from Harvard: LH #276
 2013-03-21 17:23:46 -04:00
Chris Dodge
63fc2eecaf drive by fix to get proper error handling 2013-03-21 16:32: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
Brian Talbot
caae29a8ac studio - fixing a default mixin value used when defining font-size for elements 2013-03-21 12:21:02 -04:00
Christina Roberts
e8401cf2bb Merge pull request #1643 from MITx/fix/btalbot/studio-sasscleanup 
Studio Sass Cleanup
 2013-03-21 08:45:48 -07: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
jmclaus
d763a6fc3a CSS from JSME doesn't affect surrounding content now 2013-03-21 12:19:40 +01: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
Brian Talbot
2876554cd7 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-20 17:09:38 -04:00
Will Daly
7a282a9c54 Edited comments, ran pep8 2013-03-20 17:08:19 -04:00
Will Daly
f69778b367 Changed lettuce test log_in step to log in programatically 
rather than using the login dialog.
 2013-03-20 17:08:19 -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