ichuang
|
b3f00a6725
|
add default message to conditional
|
2013-03-31 12:31:05 +00:00 |
|
Don Mitchell
|
c655c814e8
|
Merge pull request #1721 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
add checking for metadata that we can't support editing for in Studio. T...
|
2013-03-29 12:38:42 -07:00 |
|
Don Mitchell
|
80f57db7c3
|
Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf
Feature/cdodge/course overview perf
|
2013-03-29 12:35:41 -07:00 |
|
Chris Dodge
|
599ca4d429
|
oops. I'm not programming in C# any longer
|
2013-03-29 15:31:37 -04:00 |
|
Chris Dodge
|
3ce01882bb
|
add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict metadata on sequentials
|
2013-03-29 13:59:59 -04:00 |
|
Diana Huang
|
17adc986bd
|
Remove the default and prevent input_state from keeping around
unnecessary data.
|
2013-03-29 12:16:27 -04:00 |
|
Chris Dodge
|
c55d54b071
|
also, we don't support metadata on chapters
|
2013-03-28 13:03:34 -04:00 |
|
Don Mitchell
|
fece937669
|
Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata
Fix/cdodge/use request scoped cache for metadata inheritance
|
2013-03-28 06:51:20 -07:00 |
|
Chris Dodge
|
c7bafddace
|
DRY things out a bit and share as much code between MongoModuleStore and DraftMongoModuleStore
|
2013-03-28 09:49:55 -04:00 |
|
Chris Dodge
|
3cdd973af4
|
get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore
|
2013-03-28 09:28:19 -04:00 |
|
Chris Dodge
|
6c67ed1f57
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/course-overview-perf
Conflicts:
common/lib/xmodule/xmodule/modulestore/mongo.py
|
2013-03-28 09:28:12 -04:00 |
|
Chris Dodge
|
3f52261b5b
|
hmmm. actually, we should only write out to memcache if we've recomputed. Otherwise, a memcache hit will end up writing back to memcache...
|
2013-03-27 23:18:38 -04:00 |
|
Chris Dodge
|
d448aa1365
|
remove debug log messages
|
2013-03-27 23:13:33 -04:00 |
|
Chris Dodge
|
446397b23b
|
remove unused thread.local()
|
2013-03-27 23:12:00 -04:00 |
|
Chris Dodge
|
b609a96902
|
ummm. forgot to commit stuff
|
2013-03-27 22:51:52 -04:00 |
|
cahrens
|
227a5e8266
|
Delete converters, move unit tests to test_fields, add new additional test cases.
|
2013-03-27 12:56:06 -04:00 |
|
brianhw
|
a04881ceda
|
Merge pull request #1740 from MITx/fix/vik/peer-image-grading
Fix/vik/peer image grading
|
2013-03-27 09:06:54 -07:00 |
|
Vik Paruchuri
|
7101c76016
|
comment on rewrite links change
|
2013-03-27 12:02:32 -04: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
|
7a23893557
|
wip
|
2013-03-26 16:40:28 -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 |
|
Vik Paruchuri
|
97cb4910a7
|
Add in default bucket, edit image url checks
|
2013-03-26 11:04:14 -04:00 |
|
Vik Paruchuri
|
8afe2eb001
|
Increase max score allowed
|
2013-03-26 10:35:47 -04:00 |
|
Vik Paruchuri
|
d4615da555
|
Adjust max image dim, add in safety for rewriting links
|
2013-03-26 09:57:52 -04:00 |
|
Vik Paruchuri
|
df935d422d
|
Fix issues with open ended image grading and peer grading centralized module finder.
|
2013-03-26 09:52:26 -04: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 |
|
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 |
|
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 |
|
Chris Dodge
|
dc983cb9a5
|
add checking for metadata that we can't support editing for in Studio. This is now an error and will have to be addressed by course authors
|
2013-03-22 11:15:14 -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 |
|
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 |
|