Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3531 Commits

Author SHA1 Message Date
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
stv
e7e9a16379 Fix Pylint: W0403(relative-import) 2015-03-13 20:20:04 -07:00
Matt Drayer
16e63c9e1e Added Certficates Web/HTML View 2015-03-13 12:16:13 -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
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
alawibaba
5107d463c7 Merge branch 'master' into release 
Conflicts:
	lms/envs/common.py (RESOLVED)
 2015-03-12 13:20:45 -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
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
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Will Daly
3359d6e333 Merge pull request #7243 from edx/will/csrf-enrollment-api 
Cross-domain CSRF cookies
 2015-03-10 15:39:59 -04:00
Christina Roberts
00313e0e51 Merge pull request #7226 from edx/christina/update-accounts-api 
Updates to account and profile APIs based on arch council feedback
 2015-03-10 12:47:15 -04:00
Greg Price
d5b870e7b2 Merge pull request #7276 from edx/gprice/oauth-exchange 
Add an endpoint to exchange OAuth access tokens
 2015-03-09 15:30:19 -04:00
Greg Price
e85eb91e06 Add an endpoint to exchange OAuth access tokens 
This allows the holder of a third-party access token (e.g. from Google
or Facebook) to get a first-party access token for the edX account
linked to the given access token.
 2015-03-09 14:12:18 -04:00
Will Daly
cbdc269b47 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-09 12:32:49 -04:00
Will Daly
940f892290 ECOM-1140: Instructor dashboard example certificates 
Allow global staff to generate example certificates
on the instructor dashboard.

Allow global staff to enable/disable self-generated
certificates for a course.
 2015-03-06 13:20:48 -05:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
cahrens
c8a20df210 Combine account and profile into same API. 2015-03-05 16:13:49 -05:00
cahrens
5802e17cf3 Disable new user APIs in production. 2015-03-05 16:09:28 -05:00
John Eskew
4cb4557176 Merge pull request #7151 from open-craft/ekolpakov/settings-service 
SettingsService for accessing django settings from XBlock
 2015-03-05 15:56:11 -05:00
David Baumgold
a37a50cf3b Merge branch 'release' 2015-03-05 12:10:27 -05:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
Carson Gee
da9154d10e Add Staff Graded Assignments XBlock to edx-platform 2015-03-04 10:35:54 -05:00
Andy Armstrong
6f118a3d8f Default profile visibility to off for now 2015-03-03 17:52:24 -05:00
Will Daly
7bad603978 Merge pull request #7076 from edx/will/deprecate-embargo 
Deprecate old embargo implementation.
 2015-03-03 15:54:41 -05:00
Nimisha Asthagiri
818d59e820 Merge pull request #7197 from edx/bnotions/social-features 
Bnotions/social features
 2015-03-03 11:03:44 -05:00
Lee Newton
c375f666d2 bnotions contributions to mobile api 2015-03-02 22:27:27 -05:00
Adam
ee0ae6eef9 Merge pull request #7194 from edx/adam/add-purchasing-logging 
add extra logging for postpay callbacks from cybersource (ECOM-1034) (EC...
 2015-03-02 17:28:08 -05:00
Andy Armstrong
dfe0057b79 Implement profile API 
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
 2015-03-02 16:28:52 -05:00
Adam Palay
34e8ee6be8 add extra logging for postpay callbacks from cybersource (ECOM-1034) (ECOM-1089) 2015-03-02 16:06:59 -05:00
Christina Roberts
99e85556ea Merge pull request #7140 from edx/christina/delete-enable-new-dashboard 
Delete ENABLE_NEW_DASHBOARD code.
 2015-02-27 15:37:41 -05:00
Calen Pennington
8e93c1891f Merge pull request #6016 from cpennington/django-toolbar-upgrade 
Upgrade django-debug-toolbar to 1.2.2
 2015-02-27 10:39:32 -05:00
cahrens
7dc0598b25 Delete ENABLE_NEW_DASHBOARD code. 2015-02-26 16:41:40 -05:00
Braden MacDonald
88747024b5 Upgrade django-debug-toolbar to 1.2.2 
This is compatible with Django > 1.5, and allows us to re-enable the ProfilingDebugPanel
 2015-02-26 15:57:03 -05:00
Daniel Friedman
fa968c6218 Backport dummy SECRET_KEYs from django 1.5 upgrade 2015-02-26 11:54:37 -05:00
Will Daly
e9bb688911 Expose CORS_ORIGIN_ALLOW_ALL setting 2015-02-24 12:05:25 -05:00
Will Daly
ae8ddc8aee Deprecate old embargo implementation. 
The new "country access" implementation replaces the old
implementation.  Middleware and tests have been updated
accordingly, but deprecated models are preserved
for backwards compatibility.
 2015-02-23 15:48:04 -05:00
Will Daly
0f19d1fcb5 Merge pull request #7067 from edx/will/query-count-middleware 
Include middleware database queries in Django debug toolbar
 2015-02-23 10:46:09 -05:00
Will Daly
4c252d5fce Include middleware database queries in Django debug toolbar 2015-02-23 09:17:17 -05:00
Awais
726b7f2cfe ECOM-1046 adding functionality for generating the certs. 
ECOM-1046 minor change in code. rename file name.
 2015-02-21 04:31:32 +05:00
stv
75aaf0d4a7 Fix Pylint: C0326(bad-whitespace) 2015-02-19 19:56:51 -08:00
Christina Roberts
985a492efd Merge pull request #4891 from aboudreault/discussion-digest-default 
Add ENABLE_DISCUSSION_EMAIL_DIGEST feature
 2015-02-19 10:36:59 -06:00
Alan Boudreault
ac445d6eff Add ENABLE_DISCUSSION_EMAIL_DIGEST feature, to enable discussion emails digest by default for all users 2015-02-19 14:34:10 +08:00
Will Daly
ad1cf355e9 Merge pull request #7007 from edx/will/ecom-859-take-three 
ECOM-859: Add support for an input image capture.
 2015-02-18 12:59:26 -05:00
Will Daly
a29662cdbc ECOM-859: Add support for an input image capture. 
Add support for HTML Media Capture (file input)
so that iOS users can use the camera.
 2015-02-18 11:10:41 -05:00
Xavier Antoviaque
132cadb517 Merge pull request #2968 from edx-solutions/xblock-external-ui 
xblock-external-ui: Add XBlock API call to render XBlock views
 2015-02-18 08:58:33 +01:00
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05:00
Xavier Antoviaque
05c857478b xblock-external-ui: Adds support for CORS headers (cross-domain request) 
xblock-external-ui: Alternate referer check for CORS requests
xblock-external-ui: Allow to disable httponly on session cookies
xblock-external-ui: Add a unit test for CorsCSRFMiddleware
 2015-02-17 10:24:27 +01:00