Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,983 Commits 1 Branch 0 Tags
dff0acf54dcfb59817a85ad8a95c2f49a1d5df42
Commit Graph

9489 Commits

Author SHA1 Message Date
AlasdairSwan
dff0acf54d ECOM-650 updated to add auto scrolling for password reset view 2014-11-17 09:31:22 -05:00
Stephen Sanchez
83f8de6c86 Merge pull request #5962 from edx/sanchez/disable-login-button-on-click 
Adding disable logic for buttons.
 2014-11-14 16:29:36 -05:00
Will Daly
ffee7517f0 Add Selenium tests for the combined login/registration form. 2014-11-14 13:57:26 -05:00
stephensanchez
2486901602 Adding disable logic for buttons. 
Update tests, clean up approach.

Updating jasmine tests.
 2014-11-14 18:35:55 +00:00
AlasdairSwan
06cbe161a7 After accessibility review removed required field aria-describedby 2014-11-13 13:12:36 -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
AlasdairSwan
dfa8167446 Merge pull request #5938 from edx/alasdair/logistration-setvalidity-fix 
ECOM-369 Reunited the missing line with the rest of the page elements an...
 2014-11-13 08:11:48 -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
AlasdairSwan
ecb6a69fe7 ECOM-369 Reunited the missing line with the rest of the page elements and fixed an error with HTML5 validation override 2014-11-12 15:51:18 -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
AlasdairSwan
3eb287151c ECOM-369 accessibility updates 2014-11-12 14:17:41 -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
0a35af5530 Remove extra viewport meta tag 2014-11-12 11:01:32 -05:00
Dennis Jen
dd38f52358 Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments 
Feature flagged enrollment counts on instructor dashboard.
 2014-11-12 10:40:04 -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
Diana Huang
da5bfd45aa Fix pylint violation. 2014-11-12 09:17:56 -05:00
Adam
4486ce35a7 Merge pull request #5913 from edx/adam/prevent-accidental-course-mode-downgrade 
Prevent instructors from accidentally downgrading enrollment modes throu...
 2014-11-12 09:05:01 -05:00
chrisndodge
257b22e228 Merge pull request #5922 from edx/cdodge/fix-import-error 
try importing the exact references we need rather than deferencing it fr...
 2014-11-12 09:04:19 -05:00
AlasdairSwan
1a5c3977af ECOM-632 added asterix explanation footnote 2014-11-12 08:52:51 -05:00
zubair-arbi
6dae34a34b Merge pull request #5923 from edx/zub/bugfix/wl-150-survey-form-error-on-info-page 
avoid annonymous user from redirecting to survey form
 2014-11-12 18:14:38 +05:00
Chris Dodge
a93faad78b try importing the exact references we need rather than deferencing it from the djangoapp module 2014-11-11 21:49:13 -05:00
zubair-arbi
b7d526b907 avoid annonymous user from redirecting to survey form 
WL-150
 2014-11-11 14:22:26 +05:00
stv
500499b678 Fix PEP8: E231 missing whitespace after '[:,]' 2014-11-10 19:31:05 -08:00
stv
b388ab9db0 Fix PEP8: E226 missing whitespace around arithmetic operator 2014-11-10 19:30:18 -08:00
stv
00ae488960 Fix PEP8: E225 missing whitespace around operator 2014-11-10 19:30:18 -08:00
stv
41390f0239 Fix PEP8: E222 multiple spaces after operator 2014-11-10 19:30:18 -08:00
stv
1a9f8b61f9 Fix PEP8: E221 multiple spaces before operator 2014-11-10 19:30:17 -08:00
Adam Palay
1d85659b13 Prevent instructors from accidentally downgrading enrollment modes through instructor dash TNL-804 2014-11-10 18:04:22 -05:00
AlasdairSwan
790ac3f3ef Merge pull request #5915 from edx/alasdair/rwd-trackselection 
ECOM-574 Updated track selection page to be responsive
 2014-11-10 16:41:50 -05:00
Renzo Lucioni
6defcaa0af Final text review 2014-11-10 16:33:37 -05:00
chrisndodge
81c1ae35d8 Merge pull request #5903 from edx/cdodge/shoppingcart-isolation 
harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTR...
 2014-11-10 16:03:38 -05:00
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -05:00
Sarina Canelake
0bf0d11a20 Merge pull request #5906 from stvstnfrd/pep8/newline 
Fix newline-related PEP8 issues
 2014-11-10 15:29:06 -05:00
Will Daly
be0a4ee74e Merge pull request #5909 from edx/will/logistration-ab-test-css-classes 
Logistration: Add CSS classes so we can compare clicks between the old and new login/registration pages
 2014-11-10 15:12:38 -05:00
Chris Dodge
58b4982d2d harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTRATION flag is not set (either via the main Django configuration settings) or through microsite overrides 2014-11-10 15:09:48 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
 2014-11-10 15:05:37 -05:00
Diana Huang
bd87a9dd29 Record processor response on both successful and 
unsuccessful orders.
 2014-11-10 14:36:12 -05:00
Will Daly
ed652bbc98 Add CSS classes so we can compare clicks between the old and new login/registration pages 2014-11-10 14:32:56 -05:00
Diana Huang
b0b1744e18 Merge pull request #5902 from edx/diana/record-processor-response 
Record processor response on both successful and
 2014-11-10 14:19:42 -05:00
Diana Huang
b1c44ac74f Record processor response on both successful and 
unsuccessful orders.
 2014-11-10 14:09:42 -05:00
Will Daly
0c59f10b52 Include zoom only if the page is marked as responsive 2014-11-10 14:02:01 -05:00
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
stv
d5d6e3f0d8 Fix PEP8: W293 blank line contains whitespace 2014-11-10 10:59:53 -08:00
stv
d87cfa90bf Fix PEP8: W292 no newline at end of file 2014-11-10 10:59:44 -08:00