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
Stephen Sanchez
8c9f6370b8 Allow Enrollment API supports creating and upgrade course modes other than honor. 
Fixing tests, cleaning up POST handler to be easier to read.

Wording fixed for unit test comments.
 2015-03-18 17:12:02 +00:00
Clinton Blackburn
ae5cbf8b70 Merge pull request #7347 from edx/clintonb/commerce-events 
Validating event emission by the commerce app
 2015-03-18 12:47:26 -04:00
Matt Drayer
10e9fed687 Pass required values via context to invalid template 2015-03-18 12:24:06 -04:00
Chris Rodriguez
5ae7cc7ee1 UX-1642 Making visual tweaks and enhancements to the logistration form 2015-03-18 12:14:31 -04:00
Clinton Blackburn
3d520f4fa8 Merge pull request #7409 from edx/clintonb/filter-empty-string 
Fixed CourseMode Filtering Bug
 2015-03-18 12:00:49 -04:00
Clinton Blackburn
a76fd944cd Merge pull request #7410 from edx/clintonb/course-mode-admin 
Added SKU column to CourseMode table in Django admin
 2015-03-18 12:00:18 -04:00
Stephen Sanchez
321544efe6 Merge pull request #7407 from edx/sanchez/server-to-server-throttling 
Allow services to ignore user throttling. Set a more realistic throttle for users.
 2015-03-18 11:24:07 -04:00
Clinton Blackburn
783fb23fe2 Fixed CourseMode Filtering Bug 
Commerce code has now been updated to exclude CourseMode objects with SKU set to empty string (in addition to null).
 2015-03-18 11:14:36 -04:00
Clinton Blackburn
9436eacb35 Added SKU column to CourseMode table in Django admin 2015-03-18 11:10:37 -04:00
Ned Batchelder
649e45b40a Merge pull request #7388 from edx/ned/remove-more-test-data-mock-modulestore 
Remove useless override_settings of MODULESTORE
 2015-03-18 11:08:25 -04:00
Kelketek
b66a128c05 Merge pull request #6939 from open-craft/content_libraries/previews 
Add show/hide previews button to Content Libraries
 2015-03-18 10:05:22 -05:00
Max Rothman
1f3a4a87ab Update newrelic agent for monitoring celery tasks 2015-03-18 10:52:47 -04:00
Jonathan Piacenti
568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. 2015-03-18 08:59:58 -05:00
Stephen Sanchez
d901b1d3e3 Allow services to ignore user throttling. 2015-03-18 13:48:32 +00:00
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