Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
Sarina Canelake
f2626e6896 s/disable=E0213,W0613/disable=no-self-argument,unused-argument/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
89b6adadf2 s/pylint: disable=E1102/pylint: disable=not-callable/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
aa7cc2b79e s/pylint: disable=E0702/pylint: disable=raising-bad-type/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
1e0f3ddb7d s/pylint: disable=E1111,E1124/pylint: disable=assignment-from-no-return,redundant-keyword-arg/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b8c16d5ed7 s/pylint: disable=E1120/pylint: disable=no-value-for-parameter/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
19f1dacab2 s/pylint: disable=E1101/pylint: disable=no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b127d2844b s/pylint: disable=C0103/pylint: disable=invalid-name/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
20e2ee9a57 s/pylint: disable=E0611/pylint: disable=no-name-in-module/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
e0f1d3f3f3 s/pylint: disable=C0111/pylint: disable=missing-docstring/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
0dad9da5e4 s/pylint: disable=W0621/pylint: disable=redefined-outer-name/ 2014-12-01 11:22:08 -05:00
Renzo Lucioni
f5767a961c Prep marketing iframe and relevant courseware view for email opt-in 
Feature flagged. Puts a checkbox in the iframe. The iframe uses an organization_full_name parameter forwarded from Drupal by the courseware views and POSTs an email_opt_in parameter to the student views, preserving it on 403.
 2014-12-01 10:30:16 -05:00
Chris Dodge
6dea98f8f6 In microsites, don't redirect logged in users with enrollments to dashboard 2014-11-29 19:00:07 -05:00
Chris Dodge
e65bd71a11 fix blank lines 2014-11-29 11:21:45 -05:00
chrisndodge
2fd7a83ebe Merge pull request #6068 from edx/muhhshoaib/WL-163 
The USD symbol $ is hard coded into the HTML templates
 2014-11-28 17:17:14 -05:00
Muhammad Shoaib
9fddc6946a WL-163-added-the-USD-symbol-himBHin-the-HTML-templates-configuration-settings 
added the unit tests for the default currency settings
 2014-11-27 17:05:19 +05:00
Greg Price
3a7e125109 Add last visited module path to course status API 2014-11-26 14:16:19 -05:00
Sarina Canelake
3393f25f04 Merge pull request #6044 from stvstnfrd/pep8/syntax 
Fix syntax-related PEP8 issues
 2014-11-25 12:52:12 -05:00
stv
988144f0b4 Fix PEP8: E712 comparison to True 
should be 'if cond is True:' or 'if cond:'
 2014-11-25 10:16:05 -05:00
stv
31d094b5b4 Fix PEP8: E711 comparison to None 
should be 'if cond is None:'
 2014-11-25 10:16:05 -05:00
stv
74f61875c7 Fix PEP8: W601 .has_key() is deprecated, use 'in' 2014-11-25 10:16:05 -05:00
Akiva Leffert
b009e4a5ca Merge pull request #5979 from edx/aleffert/sync-course-status 
Add an endpoint for syncing a user's course status metadata
 2014-11-25 10:15:51 -05:00
Syed Hassan Raza
eec1999208 Handle unicode through try catch 2014-11-25 14:13:11 +00:00
Sarina Canelake
a883a9cdda Merge pull request #5925 from stvstnfrd/pep8/continuation 
Fix continuation-related PEP8 issues
 2014-11-25 09:03:40 -05:00
stv
ae7eb2f79f Remove orphaned code 2014-11-24 20:48:05 -05:00
stv
056faa1814 Fix Pylint: W0201: attribute-defined-outside-init 
LoginEnrollmentTestCase.setup_user: Attribute 'user' defined outside __init__
 2014-11-24 20:48:05 -05:00
stv
b215d771b7 Fix PEP8: E128 continuation line under-indented 
for visual indent
 2014-11-24 20:46:50 -05:00
stv
4d30aedf4e Fix PEP8: E127 continuation line over-indented 
for visual indent
 2014-11-24 20:46:50 -05:00
stv
6763c5dd74 Fix PEP8: E126 continuation line over-indented 
for hanging indent
 2014-11-24 20:46:44 -05:00
stv
2ce5a6ceed Fix PEP8: E125 continuation line 
does not distinguish itself from next logical line
 2014-11-24 20:46:44 -05:00
stv
aba9b3b96e Fix PEP8: E124 closing bracket does not match 
visual indentation
 2014-11-24 20:46:44 -05:00
stv
5a69feadeb Fix PEP8: E123 closing bracket does not match 
indentation of opening bracket's line
 2014-11-24 20:46:44 -05:00
stv
dff5772cda Fix PEP8: E121 continuation line indentation 
is not a multiple of four
 2014-11-24 20:44:43 -05:00
Akiva Leffert
f4dc90b348 Add an endpoint for syncing a user's course status metadata 
JIRA: MA-75
 2014-11-24 17:55:51 -05:00
chrisndodge
c19708973b Merge pull request #5982 from edx/muhhshoaib/WL-99-Invoicing-email-finance 
WL-99 send a copy of the invoice to the finance@edx.org when registration codes are generated
 2014-11-24 13:15:51 -05:00
Syed Hassan Raza
b3e7516af7 Handle Unicode for Incoming Keys 2014-11-24 15:11:33 +05:00
Muhammad Shoaib
df0bb491fa WL-99 send a copy of the invoice to the finance@edx.org when registration codes are generated 
changed the finance_email in the common.py file

added the test for the FiNANCE_EMAIL settings
 2014-11-21 17:43:37 +05:00
Nimisha Asthagiri
ec552cf154 Merge pull request #5981 from edx/mobile/MA-141 
MA-141 Support webm encoding for VAL-enabled videos
 2014-11-18 10:03:21 -05:00
Nimisha Asthagiri
caf5d5393b MA-141 Support webm encoding for VAL-enabled videos 2014-11-17 23:34:39 -05:00
Akiva Leffert
546256d700 Add a check for beta users in the video_info API 
Discovered a case I missed on the original version of this. See
https://github.com/edx/edx-platform/pull/5798
JIRA: MA-76

Also fixes checking for mobile_access when course is None
JIRA: MOB-978
 2014-11-17 19:00:27 -05:00
Stephen Sanchez
673d4fbccb Merge pull request #5965 from edx/sanchez/change-order-event 
Updating default values and changing event data.
 2014-11-17 16:55:37 -05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form 
Combined Login/Registration Form
 2014-11-17 16:00:20 -05:00
stephensanchez
0c3df636cb Updating default values and changing event data. 2014-11-17 20:51:06 +00:00
Will Daly
a89b9bacbc Merge pull request #5916 from edx/will/ecom-543 
Send transaction type for donations and verified certificates
 2014-11-17 14:54:54 -05:00
chrisndodge
37e380260c Merge pull request #5951 from edx/cdodge/treat-empty-email-template-names-as-NULL 
Treat an empty string from the admin form to be None/NULL for the Course...
 2014-11-17 11:29:56 -05:00
Chris Dodge
adbe133f5c Treat an empty string from the admin form to be None/NULL for the CourseEmailTemplateForm 2014-11-17 10:05:12 -05:00
Nimisha Asthagiri
12a22ac886 MA-135, MA-122 Support CDN and alternative sources with VAL-enabled-videos. 2014-11-17 09:56:54 -05:00
Will Daly
12fec6c918 Send transaction type for donations and verified certificates to CyberSource 2014-11-17 08:10:49 -05:00
Adam Palay
bc8d0a9976 disable "go to payment button" on click (ECOM-643) 2014-11-14 12:22:30 -05:00
Stephen Sanchez
66ff4e67cb Merge pull request #5946 from edx/sanchez/ecommerce_info_to_ga 
Adding new Google Analytics eCommerce event to shoppingcart.
 2014-11-13 16:51:37 -05:00