Commit Graph

6618 Commits

Author SHA1 Message Date
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
stv
d9502e48de Fix PEP8: E301 expected 1 blank line, found 0 2014-11-10 11:00:07 -08:00
Usman Khalid
96b1a17b66 Merge pull request #5816 from edx/usman/plat71-mongo-autoreconnect-errors-2
Proxy to retry on mongo Autoreconnect errors.
2014-11-10 19:56:11 +05:00
Waheed Ahmed
c397495eb9 Fixed null answer in checkbox problem as incorrect.
TNL-765
2014-11-10 18:41:26 +05:00
chrisndodge
c4a957c159 Merge pull request #5876 from edx/cdodge/catalog-visibility
Add new course_module field which describes what the catalog visibility ...
2014-11-09 21:02:49 -05:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Waheed Ahmed
b6d4a533a9 Fixed jump_to_id in problem solution.
TNL-729
2014-11-07 19:16:49 +05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page.
TNL-683
2014-11-06 15:48:55 -05:00
Usman Khalid
5fa1104787 Wrapped Split MongoConnection in MongoProxy.
PLAT-71
2014-11-06 20:13:45 +05:00
Usman Khalid
4a969f9f1b Added autoretry_read decorator to methods which use mongo cursor.
PLAT-71
2014-11-06 20:13:45 +05:00
Usman Khalid
328a79cc60 Wrap pymongo connections in MongoProxy.
PLAT-71
2014-11-06 20:13:45 +05:00
Don Mitchell
fc83c299ca Generalize assets to any block_type but using
AssetKey and the metadata store
PLAT-204
2014-11-05 16:01:50 -05:00
Sarina Canelake
303b4e66e1 Merge pull request #5822 from edx/sarina/OPEN-303
Move all lms image files into lms/static/images [OPEN-303]
2014-11-05 10:58:02 -05:00
John Eskew
db682dae05 Merge pull request #5819 from edx/jeskew/asset_mongo_coursewide
Implement course-wide asset paging methods.
2014-11-05 10:05:32 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements
Unit Test Improvements
2014-11-05 19:55:39 +05:00
Sarina Canelake
ad8bc69f93 Move all lms image files into lms/static/images [OPEN-303] 2014-11-05 09:10:15 -05:00
John Eskew
3534ba70ca Changes for PR review: More compact tests, enumeration for metadata
sort order, etc.
https://openedx.atlassian.net/browse/PLAT-74
2014-11-04 18:49:38 -05:00
John Eskew
098bba16e1 Implement copy_all_asset_metadata for Old Mongo->Old Mongo.
Add tests for copying all asset metadata.
https://openedx.atlassian.net/browse/PLAT-74
2014-11-04 11:38:56 -05:00
John Eskew
062e0b2174 Implement course-wide asset paging methods.
Add SortedCollection class to help sort lists efficiently.
https://openedx.atlassian.net/browse/PLAT-74
2014-11-04 11:35:02 -05:00
Don Mitchell
436b32a66d Merge pull request #5800 from edx/dhm/xml_assetstore
Abstract asset methods into own interface class
2014-11-04 10:43:41 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Don Mitchell
aa07355e87 Abstract asset methods into own interface class
then impl the read ones as NotImplementedError placeholders on xml modulestore
PLAT-70
2014-11-03 14:45:30 -05:00
Martyn James
9f3b9c7ba3 Merge pull request #5818 from edx/release
Merging latest updates to release
2014-10-31 14:49:04 -04:00
Sarina Canelake
f76288c042 Merge pull request #5726 from edx/sarina/fix-wording-reset-button
Update wording per Doc
2014-10-31 13:27:51 -04:00
Calen Pennington
b4562ffe6b Merge pull request #5783 from cpennington/proxy-through-module-system-to-descriptor-system
Fix PLAT-191
2014-10-31 09:31:13 -04:00
muhammad-ammar
fcaa783e43 Unit Test Improvements
TE-489
2014-10-31 11:55:13 +00:00
Calen Pennington
4007d5ebcb Wrap ModuleSystem and DescriptorSystem into a single object, to continue holding up the XModule house of cards
[PLAT-191]
2014-10-30 14:23:16 -04:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Adam Palay
a6c31fc46b generalize draft import/export TNL-574
add test for videomodule

Import drafts handles modules w/o xml_attributes
and ones using the old parent_sequential_url pointer

Handle drafts for modules which don't define nor extract xml_attributes

Support  and  in get_items qualifiers

Unit test for   value query
2014-10-30 12:22:05 -04:00
Nimisha Asthagiri
994ac6da6d Fixes for MOB-836 and MOB-766 and MA-96. 2014-10-29 22:06:42 -04:00
John Eskew
c9071353fd Merge pull request #5742 from edx/jeskew/asset_manager_read_wrapper
Wrap all asset read operations.
2014-10-28 15:57:28 -04:00
John Eskew
1cdf84974c Merge pull request #5556 from edx/jeskew/fix_split_old_analytics_call
Fix old analytics api call for Split modulestore.
2014-10-28 15:49:59 -04:00
John Eskew
786a32e7cf Wrap all asset read operations.
First step in moving assets out of the contentstore (optionally).
https://openedx.atlassian.net/browse/PLAT-77
2014-10-28 14:20:36 -04:00
Don Mitchell
ef0111d060 Merge pull request #5759 from edx/dhm/plat-142
Add tests for clone_course
2014-10-28 13:31:06 -04:00
John Eskew
5e103a918b Fix pylint errors to get below limit. 2014-10-28 13:15:10 -04:00
Don Mitchell
6989999d8a Add tests for clone_course
PLAT-142
2014-10-28 11:09:24 -04:00
Adam
37949e07f7 Merge pull request #5345 from edx/adam/adjust-logging-level
change ItemNotFoundErrors to log.warning on bringup
2014-10-28 10:57:35 -04:00
Don Mitchell
f48289cc4f Moved assetstore tests to own file and ddt'd across stores
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
2014-10-27 10:04:10 -04:00
Don Mitchell
b6fac23960 Implement asset metadata storage in Split - per-asset functionality
PLAT-40

Conflicts:
	common/lib/xmodule/xmodule/assetstore/__init__.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
2014-10-27 10:04:09 -04:00
Sarina Canelake
5b79de580a Update wording per Doc 2014-10-24 16:21:13 -04:00
John Eskew
5ffc6ac256 Merge pull request #4854 from edx/jeskew/assetstore_modulestore_work
Phase 1 of adding asset metadata saving to old Mongo
2014-10-24 12:47:53 -04:00
Sarina Canelake
3d1c54fefa Merge pull request #5595 from Stanford-Online/caijim/resetbutton
Support and tests for adding a reset button to units
2014-10-24 11:49:24 -04:00
John Eskew
b857a0ed7b Phase 1 of adding asset metadata saving to old Mongo 2014-10-24 11:07:32 -04:00
zubair-arbi
4ea6323d96 reload video in setPlaybackRate only if speed of video is '1.0'
TNL-537
2014-10-24 12:29:06 +05:00
Jim
6d19a0c87c Support and tests for adding a reset button to units
Users may want to start anew when answering a question. This commit decouples reset from randomization while still preserving backward compatibility. Users can clear their input.
Instructors can set course-wide and problem-specific settings for reset button display.
2014-10-23 12:14:27 -07:00
Adam Palay
0be9a26521 change ItemNotFoundErrors to log.warning in x_module.py 2014-10-23 13:38:12 -04:00
Oleg Marshev
f550359d67 Merge pull request #5545 from edx/oleg/lms-dashboard-course-start-time
Add course start/end time to student dashboard.
2014-10-23 11:56:37 +03:00
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00
Adam
2bb44a001a Merge pull request #5641 from edx/adam/update-latex-data
update latex problem data (TNL-264)
2014-10-22 08:52:52 -04:00