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

10493 Commits

Author SHA1 Message Date
Nimisha Asthagiri
091d6aebe9 Mobile API: Modularize VideoOutline code 2015-03-18 14:55:15 -04:00
Will Daly
f0b4492065 Merge pull request #7381 from edx/will/ecom-601 
Copy changes to the activation email
 2015-03-18 14:30:32 -04:00
Will Daly
c37dc913a0 Copy changes to the activation email 2015-03-18 13:45:15 -04:00
Brian Talbot
6e3d5568bd Merge pull request #7345 from edx/talbs/certs-webview-uicleanup 
Certificates: Revising Web Templates + UI for Open edX Use
 2015-03-18 13:16:24 -04: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
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
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
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
Jonathan Piacenti
568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. 2015-03-18 08:59:58 -05: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
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
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
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
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
4ef53135ae Add and clean up __repr__ and __str__ for XModule-related things 2015-03-17 13:15:18 -04: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
Calen Pennington
88b9187476 Decrease the number of inserts and updates needed by DjangoKeyValueStore 2015-03-17 10:57:13 -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
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
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
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
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
Calen Pennington
2d51f6435e Add query count tests to DjangoKeyValueStore/FieldDataCache 2015-03-16 14:57:30 -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