Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

30917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jonathan Piacenti
85c81e4579 Remove use of to_deprecated_string in sandbox regex check. 2015-03-17 16:43:53 +00:00
Calen Pennington
40ae5d2e1c Merge pull request #7365 from cpennington/lms-field-data-query-counts 
Reduce queries from FieldDataCache
 2015-03-17 11:55:46 -04:00
brianhw
498e62ef63 Merge pull request #7386 from edx/adam/revert-mathjax-change 
Revert "Lms should be independent of mathjax"
 2015-03-17 11:27:54 -04:00
Calen Pennington
88b9187476 Decrease the number of inserts and updates needed by DjangoKeyValueStore 2015-03-17 10:57:13 -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
Calen Pennington
9379fd2711 Add tests of XBlocks/XModules with filtered children 2015-03-17 10:55:06 -04:00
Adam Palay
71ab971c72 Revert "Lms should be independent of mathjax" 
This reverts commit 4a086f54d5.
 2015-03-17 10:44:48 -04:00
Will Daly
1529c1e956 Update social media links in EdX footer. 
Replaces some PLATFORM_* settings with a more
general setting for specifying social media
URLs in the footer.

Adds icons and titles for new social media
sites (Tumblr, Reddit, Youtube) to match
EdX.org.
 2015-03-17 09:43:53 -04:00
Ned Batchelder
59ad3ccb73 Merge pull request #7357 from edx/ned/remove-unused-imports 
Remove unused imports
 2015-03-17 09:34:26 -04:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
Ned Batchelder
3acf503e2b Merge pull request #7376 from edx/ned/fix-test-instructor-dashboard 
Fix test_instructor_dashboard.py tests
 2015-03-17 06:50:06 -04:00
Omar Al-Ithawi
3d107c04eb Keep platform_name in the password_reset_confirm.html always TNL-1654 2015-03-17 10:24:20 +02: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
Stephen Sanchez
b50e004b2d Merge pull request #7375 from edx/sanchez/update_aws_settings_for_ecommerce 
Add E-Commerce settings to AWS settings.
 2015-03-16 17:00:20 -04:00
Stephen Sanchez
f552df3363 Modify commerce view to work without ecommerce configuration. 2015-03-16 20:21:12 +00:00
Clinton Blackburn
b3354dda31 Merge pull request #7372 from edx/clintonb/no-honor-mode-fix 
Fixed bug for courses without an honor mode
 2015-03-16 15:50:30 -04:00
Usman Khalid
c40ab513ff Merge pull request #7373 from edx/usman/ora-release-2015-03-16 
Update ora2 to release-2015-03-16T17.59.
 2015-03-17 00:45:28 +05:00
Ned Batchelder
85d0a45b14 Fix test_instructor_dashboard.py tests 
This file was never run, because of a missing __init__.py.  It needs a
super() call to make the ModuleStoreTestCase work properly.

Then one test failed, because of a missed change from dollar to
configurable currency.
 2015-03-16 15:34:22 -04:00
Stephen Sanchez
081f5b4e53 Add E-Commerce settings to AWS settings. 2015-03-16 19:31:15 +00:00
Jesse Zoldak
ba85f82edc Merge pull request #7370 from edx/zoldak/TE-783 
Update the bok-choy version being used. TE-783
 2015-03-16 15:00:47 -04:00
Calen Pennington
2d51f6435e Add query count tests to DjangoKeyValueStore/FieldDataCache 2015-03-16 14:57:30 -04:00
Clinton Blackburn
d6046d786d Fixed bug for courses without an honor mode 2015-03-16 14:56:08 -04:00
Ned Batchelder
6e8d075dd7 Merge pull request #7355 from edx/ned/fix-capitalization 
Simple capitalization fix
 2015-03-16 14:45:36 -04:00
Usman Khalid
5fdc8d666d Update ora2 to release-2015-03-16T17.59. 2015-03-16 23:00:51 +05:00
Sarina Canelake
d2786a6423 Merge pull request #7181 from stvstnfrd/debt/envs 
Remove old env settings files
 2015-03-16 13:25:47 -04:00
Christine Lytwynec
a35264aff2 Merge pull request #7368 from edx/clytwynec/fix_test_python_opts 
pass opts From PythonTestSuite to NoseTestSuite
 2015-03-16 12:41:54 -04:00
stv
261629d7dd Copy over context from settings file 
Instead of referencing the example externally, we now explain the
setting inline.
 2015-03-16 09:34:44 -07:00
stv
aae9e821ed Remove dev_int LMS env settings 
This contains hard-coded reference to out-dated courses.
 2015-03-16 09:34:44 -07:00
stv
88d9b87150 Remove dev_ike LMS env settings 
This looks to have been a personal configuration file.
 2015-03-16 09:34:44 -07:00
stv
1dad4c8f9f Remove edx4edx LMS env settings 
Is this used? It contains MITx references.
 2015-03-16 09:34:44 -07:00
stv
015053cb9b Remove antiquated LMS envs files 
These all date back to 2012 and are hard-coded for specific course runs.
 2015-03-16 09:34:43 -07:00
Will Daly
2cbe6fdecb Merge pull request #7371 from edx/will/django-rest-framework-cors-csrf 
Skip CSRF referer check for cross-domain requests.
 2015-03-16 12:30:30 -04:00
Jesse Zoldak
e4a08fb868 Update the bok-choy version being used. TE-783 2015-03-16 11:57:06 -04:00
Will Daly
b625e8e37e Skip CSRF referer check for cross-domain requests. 
This commit extends the workaround in `cors_csrf` middleware
to Django Rest Framework's SessionAuthentication, which
calls Django's CSRF middleware directly.

The workaround checks the cross domain whitelist and
skips the CSRF referer check for domains on the whitelist.
 2015-03-16 11:48:09 -04:00
Brian Wilson
8324fd0209 Merge remote-tracking branch 'origin/release' into rc/2015-03-17 2015-03-16 11:43:26 -04:00
Christine Lytwynec
659e90ea95 pass opts From PythonTestSuite to NoseTestSuite 2015-03-16 11:13:31 -04:00
David Baumgold
c6992688ac Merge pull request #7314 from edx/load-tender-js-from-tenderapp-subdomain 
Define TENDER_SUBDOMAIN so that we can still use vanity URLs
 2015-03-16 10:44:00 -04:00
Sarina Canelake
0a385c04f1 Merge pull request #7366 from edx/sarina/20150316-update-translations 
Update translations (autogenerated message)
 2015-03-16 10:35:34 -04:00
Sarina Canelake
3569e7fef5 Update translations (autogenerated message) 2015-03-16 10:32:27 -04:00
Jesse Zoldak
90211a137a Merge pull request #7367 from edx/revert-6167-patch-5 
Revert "To support UNICODE xblock.location"
 2015-03-16 10:27:40 -04:00
Jesse Zoldak
26afdf768c Revert "To support UNICODE xblock.location" 2015-03-16 10:15:41 -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
Calen Pennington
8247ace595 Revert "Merge pull request #7258 from cpennington/lms-field-data-query-counts" 
This reverts commit 4856ef78d3, reversing
changes made to 7abbbb443a.
 2015-03-16 09:41:40 -04:00
Mark Hoeber
5efabb1c4b Merge pull request #7307 from edx/markhoeber-enrollment-api-doc-fix 
Add Mocks to Enrollment API Doc Config
 2015-03-16 09:28:29 -04:00