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

10452 Commits

Author SHA1 Message Date
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
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
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
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
Nimisha Asthagiri
e77bcab571 MA-345 Mobile Enrollment API: add course' Facebook URL 2015-03-13 11:13:33 -04:00
Awais
4bab316bb9 ECOM-911 no-id-professional mode registration flow 2015-03-13 10:03:05 +00:00
Clinton Blackburn
acb141a990 Corrected data sent to E-Commerce API 
Data is now properly encoded as JSON.
 2015-03-13 02:36:22 -04:00
Clinton Blackburn
cff9a5aa78 Merge pull request #7318 from edx/clintonb/register-with-oscar 
Enrolling via E-Commerce API for combined login-registration page
 2015-03-13 01:32:26 -04:00
Clinton Blackburn
935323a879 Enrolling via E-Commerce API for combined login-registration page 
The login-registration page now supports using the E-Commerce API when enrolling users in honor seats (of courses with SKUs).
 2015-03-13 00:25:13 -04:00
Clinton Blackburn
eaa7a22058 Added commerce/purchase endpoint 
This new endpoint is intended to replace enrollment API call used on the login+registration page. Instead of directly enrolling students, the view will contact the external e-commerce API (Oscar) to create a new order. Oscar will be responsible for completing the order and enrolling the student.

This behavior will only apply to course modes with associated SKUs. All other course mode enrollments will be processed directly by LMS.
 2015-03-13 00:25:13 -04:00
Matt Drayer
41cab6d49f Merge pull request #7320 from edx/mattdrayer/add-milestones-app-check 
Cleaned up milestones API references
 2015-03-12 17:36:35 -04:00
Mark Sadecki
dd82a40aa9 Merge pull request #7317 from edx/cptvitamin/TNL-1674-fix-invalid-aria-role-dialogalert 
fixes invalid aria-role dialogalert which should be alertdialog
 2015-03-12 16:35:54 -04:00
Matt Drayer
cd05391335 Cleaned up milestones API references 2015-03-12 15:58:21 -04:00
Nimisha Asthagiri
cce00e6933 Merge pull request #7310 from edx/mobile/MA-125 
MA-125 Mobile Enrollment API: add certificate info.
 2015-03-12 15:01:39 -04:00
Nimisha Asthagiri
9f0d6c006d MA-125 Mobile Enrollment API: add certificate info 2015-03-12 14:11:14 -04:00
alawibaba
5107d463c7 Merge branch 'master' into release 
Conflicts:
	lms/envs/common.py (RESOLVED)
 2015-03-12 13:20:45 -04:00
Mark Sadecki
c2ec7cc6e7 fixes invalid aria-role dialogalert which should be alertdialog 2015-03-12 11:00:35 -04:00
Shrhawk
4289ecd341 Merge pull request #7104 from edx/shr/bug/AN-4618-Browser-events-are-being-dropped 
Add metatag <path_prefix> for pdf_viewer.html
 2015-03-12 19:17:01 +05:00
David Baumgold
78d8b00ab7 Merge pull request #7286 from edx/avoid-needless-mako 
For video module, don't use Mako unnecessarily
 2015-03-12 09:22:56 -04:00
Syed Hassan Raza
64515f1d62 Add metatag <path_prefix> for pdf_viewer.html 2015-03-12 17:19:38 +05:00
aamir-khan
1512c0609e ECOM-1177: Removed the session variable on pay_and_verify view 2015-03-12 16:40:02 +05:00
David Baumgold
9c59ebd688 For video module, don't use Mako unnecessarily 2015-03-11 15:37:21 -04:00
alawibaba
cdc81c8894 Fixed ID bug in China CDN experiment, added default, changed graphite metric name, and exposed CDN monitoring ENVs. 2015-03-11 14:28:20 -04:00
Adam Palay
882eab4bc9 cache site status message for 5 minutes (TNL-1614) 2015-03-11 14:28:19 -04:00
Will Daly
a5a303ae57 Cross-domain CSRF cookies 
When configured, set an additional cookie with the CSRF
token for use by subdomains.

The cookie can have a different name than the default
CSRF cookie, preventing conflicts between cookies
from different domains (e.g. ".edx.org", "courses.edx.org",
and "edge.edx.org").

The new cookie is included only on the enrollment API
views so that the scope of this change is limited
to the end-points that require cross-domain POST requests.
 2015-03-11 14:28:19 -04:00