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

27091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Sanchez
ebeaaaadeb Merge pull request #6073 from edx/sanchez/add_email_optin_api_endpoint 
Create new API endpoint for email optin
 2014-11-26 10:53:00 -05:00
stephensanchez
6214365158 Create new API endpoint for email optin 
Updating the design of the email opt in end point.

Updating API call based on new Org Model.
 2014-11-26 14:12:58 +00:00
zubair-arbi
9fd2b0013e Merge pull request #6049 from Shrhawk/shr/bug/TNL-290-incorrect-message-duplicate-course 
Modify error message
 2014-11-26 19:03:52 +05:00
Syed Hassan Raza
50ee031151 Modify error message 2014-11-26 11:18:50 +05:00
Stephen Sanchez
e3dcb78d4e Merge pull request #6056 from edx/sanchez/create_user_org_tag 
Creating a new Organization based preference model.
 2014-11-25 16:41:13 -05:00
stephensanchez
19f737d544 Creating a new Organization based preference model. 2014-11-25 20:17:31 +00: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
ab4de714fb Lower PEP8 threshold to 10 violations 2014-11-25 10:56:36 -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
stv
829be1e9cb Fix PEP8: E502 the backslash is redundant 
between brackets
 2014-11-25 10:16:04 -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
stv
ac1d643e24 Fix PEP8: E401 multiple imports on one line 2014-11-25 10:15:07 -05:00
Muhammad Ammar
6317347d3d Merge pull request #5983 from edx/ammar/tnl-827 
Remove ability to add new ORA 1 problems to courses
 2014-11-25 19:23:12 +05: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
Waheed Ahmed
7b3602e320 Merge pull request #6047 from edx/waheed/tnl536-fixed-hd-button-for-firefox 
Fixed HD button in firefox.
 2014-11-25 16:32:17 +05:00
Waheed Ahmed
86f72942f5 Fixed HD button in firefox. 
TNL-536
 2014-11-25 14:39:56 +05:00
stv
5e1c5df320 Lower PEP8 threshold to 15 violations 2014-11-24 20:49:56 -05:00
stv
6823cb6306 Lower PyLint threshold to 4600 violations 2014-11-24 20:49:31 -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
b4c4d18e9f Fix Pylint: W0110: (deprecated-lambda) 
divide_chemical_expression: map/filter on lambda could be replaced by
comprehension
 2014-11-24 20:48:05 -05:00
stv
11020cf115 Fix Pylint: C0103: (invalid-name) 
Command.handle: Invalid name "d" for type variable
(should match [a-z_][a-z0-9_]{2,30}$)
 2014-11-24 20:48:05 -05:00
stv
0d2754d8d1 Fix PEP8: E502 the backslash is redundant 
between brackets
 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
55de42d19c Fix PEP8: E122 continuation line missing 
indentation or outdented
 2014-11-24 20:46:35 -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
Adam
cb7d6b3970 Merge pull request #6040 from edx/release 
Release
 2014-11-24 14:15:02 -06:00
Adam
22d44686e4 Merge pull request #6032 from edx/hotfix/2014-11-22 
Imports must replace drafts w/ published in split
 2014-11-24 13:14:59 -06: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
Renzo Lucioni
9ac5558e19 Merge pull request #6025 from edx/renzo/fix-identify-call 
Use analytics.identify instead of the old utility function
 2014-11-24 10:41:22 -05:00
Don Mitchell
f30ad29b21 Imports must replace drafts w/ published in split 
PLAT-299
 2014-11-24 09:38:00 -05:00
muhammad-ammar
a493348cf0 Remove ability to add new ORA 1 problems to courses 
TNL-827
 2014-11-24 11:31:59 +00:00
Christine Lytwynec
7b36645eb2 Merge pull request #6024 from edx/clytwynec/fix_no_prereq_install 
fix NO_PREREQ_INSTALL
 2014-11-21 17:06:57 -05:00
Christine Lytwynec
e9e595749d fix NO_PREREQ_INSTALL 2014-11-21 14:24:14 -05:00
Renzo Lucioni
03f38dd8b4 Use analytics.identify instead of the old utility function 2014-11-21 12:53:59 -05:00
Renzo Lucioni
73dd6fe2c7 hotfix-2014-11-21 2014-11-21 12:11:44 -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
Sarina Canelake
c8ba02a971 Merge pull request #6012 from edx/sarina/remove-eo-artifacts 
Remove 'eo' artifacts when doing test runs
 2014-11-20 20:47:20 -05:00
Sarina Canelake
9a7338e5cb Remove 'eo' artifacts when doing common/lib test runs 2014-11-20 17:14:10 -05:00
Mark Hoeber
62d129c7c7 Merge pull request #6007 from edx/markhoeber-dev-guide-link-fix 
Dev Guide Link Fix
 2014-11-20 15:57:26 -05:00
Mark Hoeber
acf7db4838 Link fix attempt 2014-11-20 15:18:26 -05:00
Don Mitchell
21608f340c Error on import into split 
if import restores a deleted draft element which was never published
PLAT_297
 2014-11-20 12:03:17 -05:00