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

2027 Commits

Author SHA1 Message Date
Stephen Sanchez
de1c054187 Merge pull request #6079 from edx/sanchez/logistration-opt-in 
Hooking the logistration page into the new HTTP endpoint for email opt in
 2014-12-01 13:57:36 -05:00
stephensanchez
32c9230cd1 Hooking the logistration page into the new HTTP endpoint for email opt in. 
Update the PR based on Code Review comments, and additional tests.

Using underscore js
 2014-12-01 17:25:57 +00:00
Sarina Canelake
1dd7cf6946 s/pylint: disable=W0603/pylint: disable=global-statement/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
520935209d s/pylint: disable=W0402/pylint: disable=deprecated-module/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
13946fb844 s/pylint: disable=W0511/pylint: disable=fixme/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
0c7b60b82b Remove 'pylint: disable=W0232' because we ignore this warning in pylintrc 2014-12-01 11:22:12 -05:00
Sarina Canelake
ff18b7d01a s/pylint: disable=W0611/pylint: disable=unused-import/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
d406261e4b s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
f223ac8404 s/pylint: disable=W0401/pylint: disable=wildcard-import/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
c54a71feb5 s/pylint:disable/pylint: disable/ (formatting fix) 2014-12-01 11:22:11 -05:00
Sarina Canelake
c0556a7ef8 s/pylint: disable=W0613/pylint: disable=unused-argument/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
e15d4aea71 s/pylint: disable=F0401/pylint: disable=import-error/ 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
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
stv
a86777eb4e Fix PEP8: E303 too many blank lines 2014-11-26 15:19:04 -05:00
stv
b2ff02f0e1 Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-26 15:10:04 -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
stephensanchez
19f737d544 Creating a new Organization based preference model. 2014-11-25 20:17:31 +00:00
stv
829be1e9cb Fix PEP8: E502 the backslash is redundant 
between brackets
 2014-11-25 10:16:04 -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
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
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
stephensanchez
7d36d11b35 Remove enrollment updates from the Enrollment API. 2014-11-20 09:36:30 -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
75e45bc2ee Update the API and Data Layer to get the student from the models. 2014-11-17 15:09:33 +00:00
Will Daly
92d10ebd17 Respond to code review feedback 2014-11-17 08:58:56 -05:00
Nimisha Asthagiri
07d50ba7a1 MA-90 Update Analytics Shim to match new mobile requirements. 2014-11-13 18:18:57 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
 2014-11-13 11:16:16 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -05:00
Will Daly
c8751b5b4a Add CSRF cookie to combined login/registration form 
Add CSRF check for login/registration views.
 2014-11-12 16:15:20 -05:00
Renzo Lucioni
2fc2207bd2 Merge pull request #5905 from edx/renzo/pep8-pylint-cleanup 
Clean up pep8 and pylint violations
 2014-11-12 14:34:03 -05:00
Renzo Lucioni
8d02efb021 Clean up pep8 and pylint violations 
Also fixes failing Python unit tests
 2014-11-12 12:55:56 -05:00
Stephen Sanchez
fc8b2a5f37 Merge pull request #5720 from edx/sanchez/avoid_event_suppression 
Changing event suppression to signal suppression.
 2014-11-12 12:46:26 -05:00
stephensanchez
6e85ec0739 Changing event suppression to signal suppression. 
Code review changes.

Fix test and pylint.

pylint error.

Updating the test to verify the signal is fired.

Test for all analytics events

Import pylint error.

Pylint error
 2014-11-12 16:26:29 +00:00
Will Daly
1537086a9b Merge pull request #5930 from edx/will/logistration-handle-redirects 
Logistration: Clean up redirect logic
 2014-11-12 11:23:48 -05:00
Will Daly
ce158cf54e Merge pull request #5929 from edx/will/logistration-fix-cancel-third-party-auth 
Logistration: Redirect to a valid URL when cancelling third party auth
 2014-11-12 10:49:20 -05:00
Will Daly
02485be3e3 Clean up redirect logic 2014-11-12 10:27:25 -05:00
Renzo Lucioni
34dd4e59a1 Merge pull request #5914 from edx/renzo/final-text-review 
Final text review
 2014-11-12 09:55:48 -05:00
Will Daly
d50137bb64 Redirect to a valid URL when cancelling third party auth 2014-11-12 09:33:06 -05:00
stv
1164624fbc Fix PEP8: W291 trailing whitespace 2014-11-10 19:31:09 -08:00