Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,157 Commits 1 Branch 0 Tags
263dbdafb3f1051225d9efa136e7deb5ad39bec6
Commit Graph

10654 Commits

Author SHA1 Message Date
Awais Qureshi
263dbdafb3 Merge pull request #7363 from edx/awais786/ECOM-1162-ga-event 
Awais786/ecom 1162 ga event
 2015-03-18 17:47:20 +05:00
Awais
3a996155f5 ECOM-1162 2015-03-18 01:24:27 +05:00
Calen Pennington
60bbfc5a9c Add @contract to _load_item 2015-03-17 13:15:19 -04:00
Calen Pennington
11dcf12f14 Make XModule use the same get_children that XModuleDescriptor and XBlock do, and make it returned the same CombinedSystem 2015-03-17 13:15:18 -04:00
Calen Pennington
8a73a736e3 Correctly escape backslashes in docstring for get_content_titles 2015-03-17 13:15:18 -04:00
Calen Pennington
473420429d Allow MongoModuleStore to use an existing CachingDescriptorSystem. 
Prior to this change, if a CachingDescriptorSystem was prepopulated
with XBlock field data (`module_data`), then it would be used as
the DescriptorSystem for blocks loaded through it. On the other hand,
if it had to fetch new data from the modulestore, then a new
CachingDescriptorSystem would be created by the modulestore, and used
by the newly returned object.

This commit allows the modulestore get_item and get_items methods
to accept an existing CachingDescriptorSystem to augment with data
from the backing mongo store, and to use as the DescriptorSystem
for newly loaded XBlocks.
 2015-03-17 13:15:18 -04:00
Calen Pennington
4ef53135ae Add and clean up __repr__ and __str__ for XModule-related things 2015-03-17 13:15:18 -04:00
Calen Pennington
8fbb64322b Clarify grading variables in the CourseModule 2015-03-17 10:55:06 -04:00
Calen Pennington
de23d6defe Clear cached children when binding an XModuleDescriptor/XBlock to a particular user 2015-03-17 10:55:06 -04:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
Andy Armstrong
37dd0ec840 Merge pull request #7327 from edx/andya/preferences-api 
Implement full preferences API
 2015-03-17 00:57:01 -04:00
Andy Armstrong
6976a33a85 Add the preferences endpoint to the User API 
TNL-1493

See https://openedx.atlassian.net/wiki/display/TNL/User+API for details
 2015-03-16 23:34:35 -04:00
Waqas Khalid
1b44f1e237 Merge pull request #7044 from edx/waqas/make-lms-mathjax-independent 
Lms should be independent of mathjax
 2015-03-16 18:47:32 +05:00
Waqas Khalid
a8457c4fb4 Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem 
Unit page doesn't load when mathjax is down
 2015-03-16 18:47:06 +05:00
Waqas Khalid
729dd24c82 Unit page doesn't load when mathjax is down 
When mathjax is down studio page doesn't work as
it wait for mathjax to load. I replaced the hard
dependency with soft dependency now unit page can
load with mathjax.
 2015-03-16 15:12:01 +05:00
Waqas Khalid
4a086f54d5 Lms should be independent of mathjax 
When cdn is down specially in the country like china
and others user face problem as application doesn't
work as intended. Instead of making mathjax hard
dependecy I have converted it into soft dependey
so that it won't cause user problem to use application
smothly if mathjax is not present.

TNL-1498
 2015-03-16 15:10:25 +05:00
stv
181eed241f Silence unrelated warnings 2015-03-14 13:35:18 -07:00
stv
79f9d1a70f Fix Pylint: E1121(too-many-function-args) 2015-03-13 20:20:04 -07:00
stv
b9ed4b6561 Fix Pylint: E1305(too-many-format-args) 2015-03-13 20:20:04 -07:00
stv
6c06f8ce5d Fix Pylint: C1001(old-style-class) 2015-03-13 20:20:04 -07:00
stv
90b3318d01 Fix Pylint: I0010(bad-inline-option) 2015-03-13 20:20:03 -07:00
Nimisha Asthagiri
28ad138829 Merge pull request #7311 from edx/mobile/MA-345-FB-URL 
MA-345 Mobile Enrollment API: add course' Facebook URL.
 2015-03-13 13:56:42 -04:00
Christine Lytwynec
8ff4886888 Merge pull request #7337 from edx/clytwynec/flaky-tests-test_password_reset_success 
decorate flaky test
 2015-03-13 13:21:55 -04:00
Matt Drayer
16e63c9e1e Added Certficates Web/HTML View 2015-03-13 12:16:13 -04:00
Jesse Zoldak
766663eefa Merge pull request #7217 from edx/ziafazal/fix-studio-settings-flaky-test 
fixed a flaky test (acceptance.tests.studio.test_studio_settings_details.SettingsMilestonesTest.test_prerequisite_course_save_successfully)
 2015-03-13 11:19:50 -04:00
Nimisha Asthagiri
e77bcab571 MA-345 Mobile Enrollment API: add course' Facebook URL 2015-03-13 11:13:33 -04:00
Christine Lytwynec
fd6d135052 decorate flaky test 2015-03-13 10:53:09 -04:00
Awais
4bab316bb9 ECOM-911 no-id-professional mode registration flow 2015-03-13 10:03:05 +00:00
Kelketek
a7e1f9caf3 Merge pull request #7301 from open-craft/course-import-page-fix 
Replace broken logic in import template with working logic in view.
 2015-03-12 18:15:32 -05:00
Jonathan Piacenti
8c920b469c Replace broken logic in import template with working logic in view. 2015-03-12 20:13:47 +00:00
Matt Drayer
cd05391335 Cleaned up milestones API references 2015-03-12 15:58:21 -04:00
alawibaba
5107d463c7 Merge branch 'master' into release 
Conflicts:
	lms/envs/common.py (RESOLVED)
 2015-03-12 13:20:45 -04:00
Nimisha Asthagiri
d7fd454bce Merge pull request #7316 from edx/video-pipeline/setting-display-fix 
Do not show video_upload_pipeline setting if the feature is disabled
 2015-03-12 11:25:27 -04:00
Shrhawk
4289ecd341 Merge pull request #7104 from edx/shr/bug/AN-4618-Browser-events-are-being-dropped 
Add metatag <path_prefix> for pdf_viewer.html
 2015-03-12 19:17:01 +05:00
Syed Hassan Raza
64515f1d62 Add metatag <path_prefix> for pdf_viewer.html 2015-03-12 17:19:38 +05:00
Awais
281c8dce2b ECOM-1155 fix the date diff issue. 2015-03-12 16:24:51 +05:00
Nimisha Asthagiri
8e5563d467 Do not show video_upload_pipeline advanced setting if the feature is disabled. 2015-03-11 17:58:32 -04:00
alawibaba
cdc81c8894 Fixed ID bug in China CDN experiment, added default, changed graphite metric name, and exposed CDN monitoring ENVs. 2015-03-11 14:28:20 -04:00
Adam Palay
882eab4bc9 cache site status message for 5 minutes (TNL-1614) 2015-03-11 14:28:19 -04:00
Will Daly
a5a303ae57 Cross-domain CSRF cookies 
When configured, set an additional cookie with the CSRF
token for use by subdomains.

The cookie can have a different name than the default
CSRF cookie, preventing conflicts between cookies
from different domains (e.g. ".edx.org", "courses.edx.org",
and "edge.edx.org").

The new cookie is included only on the enrollment API
views so that the scope of this change is limited
to the end-points that require cross-domain POST requests.
 2015-03-11 14:28:19 -04:00
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Kelketek
91642dce33 Merge pull request #7245 from open-craft/studio-home-test 
Exfoliate flaky studio home test. (SOL-430)
 2015-03-11 09:33:21 -05:00
Kelketek
1bd3652af3 Merge pull request #6846 from open-craft/content_libraries/import-export 
Content Libraries Import/Export
 2015-03-11 09:27:45 -05:00
Mark Hoeber
86930b9d27 Merge pull request #7135 from edx/markhoeber-studio-template-updates 
Studio template updates
 2015-03-11 09:16:40 -04:00
Mark Hoeber
12e3cc9d62 Update IFrame, Zooming Image, and Full Screen Image Templates 2015-03-10 20:58:01 -04:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
Will Daly
3359d6e333 Merge pull request #7243 from edx/will/csrf-enrollment-api 
Cross-domain CSRF cookies
 2015-03-10 15:39:59 -04:00
Christina Roberts
00313e0e51 Merge pull request #7226 from edx/christina/update-accounts-api 
Updates to account and profile APIs based on arch council feedback
 2015-03-10 12:47:15 -04:00
Martyn James
af14d222fc Merge pull request #7085 from edx/dcikatic/SOL-258 
SOL-258 Removing preview and content type from search list for sequence ...
 2015-03-10 11:55:33 -04:00
Clinton Blackburn
6a2b9f4521 Reorganized course_structures app 
Celery requires all tasks to be in a tasks module. Also, the task has been updated to use default values if the the course structure generator encounters a block without the graded or format fields.
 2015-03-10 11:12:51 -04:00