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
Ned Batchelder
425b766965
Remove TEST_DATA_MOCK_MODULESTORE
2015-03-17 17:21:52 -04:00
Will Daly
c8825652b1
Merge pull request #7398 from edx/will/fix-broken-footer-test
...
Add missing import of override_settings to fix a broken test in courseware
2015-03-17 16:46:44 -04:00
Will Daly
2bc82367ce
Add missing import of override_settings to fix a broken test in courseware
2015-03-17 16:43:29 -04:00
Brian Talbot
76bc375f62
certificates: removing verification view + edx-centric supplemental assets
2015-03-17 16:40:52 -04:00
Brian Talbot
a0caf13da9
certificates: prepping sass + vendor code to compile LTR/RTL options
2015-03-17 16:40:52 -04:00
Brian Talbot
12d1992e66
certificates: revising breakpoint names/definitions to match current FED standards
2015-03-17 16:40:51 -04:00
Brian Talbot
8f9b3dad98
certificates: referencing platform-centric copies of imported typefaces
2015-03-17 16:40:51 -04:00
Brian Talbot
1ef0751f7a
certificates: re-organizing comments/folder structure to match current FED standards
2015-03-17 16:40:50 -04:00
Brian Talbot
3590985f47
certificates: manually configuring responsive grid details
2015-03-17 16:40:50 -04:00
Brian Talbot
e11c853672
certificates: updating app copies of Bourbon and Neat Sass utilities
2015-03-17 16:40:49 -04:00
Brian Talbot
31a5fb31fc
certificates: removing edX-centric Sass variables from config
2015-03-17 16:40:49 -04:00
Brian Talbot
85f1d09d6b
certificates: removing edX-centric supplemental content from views
2015-03-17 16:40:49 -04:00
Brian Talbot
597af988ae
certificates: abstracting out all certificate sass vs. individual views
2015-03-17 16:40:49 -04:00
Brian Talbot
71c9a2d490
certificates: moving Sass/UI naming conventions to documented standards
2015-03-17 16:40:48 -04:00
Brian Talbot
d7a5d24c1a
certificates: moving HTML to documented standards
2015-03-17 16:40:48 -04:00
Brian Talbot
f8b835f232
certificates: pruning default asset references
2015-03-17 16:40:48 -04:00
Brian Talbot
5c0d771817
certificates: removing edX-specific content/UI
2015-03-17 16:40:47 -04:00
Brian Talbot
50856a0ada
certificates: updating and abstracting HTML templates
2015-03-17 16:40:47 -04:00
Awais
3a996155f5
ECOM-1162
2015-03-18 01:24:27 +05:00
Jonathan Piacenti
40bb70e9d1
Remove use of to_deprecated_string in sandbox regex check.
2015-03-17 16:16:11 -04:00
Calen Pennington
8e4ee78fff
Merge pull request #7262 from edx/cale/xblock-filtered-children-tests
...
Clear children cache when binding an XBlock to a user.
2015-03-17 16:04:54 -04:00
Brian Wilson
5f6ee428f8
Merge remote-tracking branch 'origin/release' into rc/2015-03-17
2015-03-17 15:59:54 -04:00
Will Daly
9b49059e1f
Merge pull request #7383 from edx/will/ecom-1134
...
Update social media links in EdX footer.
2015-03-17 15:34:36 -04:00
Ned Batchelder
81d17c516e
Fix or remove tearDown methods that don't use super.
...
Update edx-lint to the version that checks if tearDown uses super.
Convert a number of tearDown methods into addCleanup.
Remove some unneeded tearDown methods: no need to call patch.stopall if
none of them were started with patch.start.
2015-03-17 15:14:52 -04:00
Martyn James
a495bb5f9e
Addresses problem with 'up' and 'down' errors within SOL-289
2015-03-17 15:12:38 -04:00
brianhw
bafc7c53d3
Merge pull request #7392 from open-craft/library-capa-problems
...
Remove use of to_deprecated_string in sandbox regex check.
2015-03-17 14:17:19 -04:00
brianhw
15cc1446e5
Merge pull request #7393 from edx/revert-7387-library-capa-problems
...
Revert "Remove use of to_deprecated_string in sandbox regex check."
2015-03-17 14:15:41 -04:00
brianhw
7f5c54dd31
Revert "Remove use of to_deprecated_string in sandbox regex check."
2015-03-17 14:09:55 -04:00
Kelketek
8b190da956
Merge pull request #7387 from open-craft/library-capa-problems
...
Remove use of to_deprecated_string in sandbox regex check.
2015-03-17 12:43:19 -05:00
Calen Pennington
60bbfc5a9c
Add @contract to _load_item
2015-03-17 13:15:19 -04:00
Calen Pennington
9e7404cd4a
Add test of courseware.views.index rendering with saved student state
2015-03-17 13:15:19 -04:00
Calen Pennington
fd746b6f13
Clean up import order in test_module_render
2015-03-17 13:15:18 -04:00
Calen Pennington
17a6cfee70
Update query counts to new reality
2015-03-17 13:15:18 -04:00
Calen Pennington
26df09e404
Add test of iterating over a course tree multiple times in the same request
2015-03-17 13:15:18 -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
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
