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

5499 Commits

Author SHA1 Message Date
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
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
Adam Palay
becd4c1b9a update latex problem data (TNL-264) 2014-10-21 16:58:30 -04:00
Don Mitchell
0d36dd7264 Merge pull request #5646 from edx/dhm/migrate_bug 
Fix command line migrator
 2014-10-21 16:55:59 -04:00
Mark Hoeber
c213f64d4f Merge pull request #5642 from edx/markhoeber-doc1123 
Updated max attempts advanced settings help string
 2014-10-21 11:09:34 -04:00
Oleg Marshev
f5294358a6 Do not deprecate giturl. 2014-10-21 13:21:38 +03:00
Waheed Ahmed
204b52e92d Added three missing required states for video progress slider. 
TNL-89
 2014-10-21 12:21:16 +05:00
Don Mitchell
4fc8ed8e7a Fix command line migrator 2014-10-20 14:34:33 -04:00
Mark Hoeber
67c718674f Updated max attempts advanced settings help string 2014-10-20 11:44:05 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Jesse Zoldak
f0b7850de3 Merge pull request #5609 from edx/zoldak/remove-tmp-references 
Remove references to /tmp in tests
 2014-10-17 12:12:53 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests 
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
 2014-10-17 10:00:12 -04:00
Adam
5511aba23e Merge pull request #5471 from edx/adam/thumbnail-extentions 
image files with different extensions should generate thumbnails with di...
 2014-10-17 09:18:06 -04:00
brianhw
3604dfce27 Merge pull request #5561 from edx/bugfix/ichuang/fix-invalid-key-name-child-id 
fix tracking log entry key child-id -> child_id
 2014-10-16 14:39:48 -04:00
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children 
Enable pure XBlocks to use children in edx-platform
 2014-10-16 10:23:35 -04:00
Calen Pennington
4d653d5359 Set xmodule_runtime on all XModule-like things (including pure XBlocks using the XModuleMixin) 
Expose xmodule_runtime as .runtime if it's set (otherwise, fall back to
the supplied runtime). This causes all blocks to act like XModules when
they have a ModuleSystem, and like XModuleDescriptors if they only have
a DescriptorSystem.
 2014-10-16 09:09:20 -04:00
Nimisha Asthagiri
e0f9def061 Merge pull request #5584 from edx/nimisha/val/MA-81 
MA-81 Honor video download setting with VAL-enabled videos.
 2014-10-15 10:10:13 -04:00
Nimisha Asthagiri
5355b4b96e MA-81 Honor video download setting with VAL-enabled videos. 2014-10-14 22:32:16 -04:00
Don Mitchell
7e52ba872e Merge pull request #5535 from edx/dhm/unit_perf 
Performance enhancements for unit tests
 2014-10-14 09:37:08 -04:00
ichuang
38c7832f75 fix tracking log entry key child-id -> child_id 2014-10-12 13:40:54 -04:00
Sarina Canelake
02bfe039fd Merge pull request #5431 from open-craft/datadog-wrapper 
Consistently wrap the DataDog API to prevent logged errors & missing stats data
 2014-10-10 14:59:38 -04:00
Braden MacDonald
a8f622af7f Consistently ensure dog_stats_api tags are formatted correctly 2014-10-09 12:35:26 -07:00
Don Mitchell
90723d9191 Make unit tests work on older mongo versions 2014-10-09 15:14:37 -04:00