Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
f03b943b95 Fix Pylint: W0612(unused-variable) 2015-03-13 20:20:05 -07:00
stv
e7e9a16379 Fix Pylint: W0403(relative-import) 2015-03-13 20:20:04 -07:00
stv
268cb46d97 Fix Pylint: E0211(no-method-argument) 
I can find no other record of this class.
 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
0248660214 Fix Pylint: W0631(undefined-loop-variable) 2015-03-13 20:20:04 -07:00
stv
6c06f8ce5d Fix Pylint: C1001(old-style-class) 2015-03-13 20:20:04 -07:00
Andy Armstrong
63341287ca Merge pull request #7343 from edx/andya/openedx-dir-coverage 
Add coverage to openedx directory
 2015-03-13 16:09:17 -04:00
Clinton Blackburn
5b2dd87a07 Merge pull request #7333 from edx/clintonb/commerce-json-fix 
Corrected data sent to E-Commerce API
 2015-03-13 15:42:28 -04:00
Sarina Canelake
257462aa9c Merge pull request #7344 from edx/sarina/fix-sarina 
Remove old comment from file
 2015-03-13 15:19:51 -04:00
Clinton Blackburn
eb72ab58f9 Validating event emission by the commerce app 
Added tests to ensure manual enrollments emit enrollment events.
 2015-03-13 14:09:31 -04: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
Sarina Canelake
fe4c053c25 Remove old comment from file 2015-03-13 12:47:20 -04:00
Andy Armstrong
a75186dafe Add coverage to openedx directory 2015-03-13 12:41:54 -04:00
Matt Drayer
16e63c9e1e Added Certficates Web/HTML View 2015-03-13 12:16:13 -04:00