Commits · dff0acf54dcfb59817a85ad8a95c2f49a1d5df42 · edx / edx-platform

17 Nov, 2014 2 commits
- ECOM-650 updated to add auto scrolling for password reset view · dff0acf5
  AlasdairSwan committed Nov 17, 2014
  
  dff0acf5 Browse Files
- Respond to code review feedback · 92d10ebd
  Will Daly committed Nov 17, 2014
  
  92d10ebd Browse Files
14 Nov, 2014 4 commits
- Merge pull request #5962 from edx/sanchez/disable-login-button-on-click · 83f8de6c
```
Adding disable logic for buttons.
```
  Stephen Sanchez committed Nov 14, 2014
  83f8de6c Browse Files
- Merge pull request #5959 from edx/will/logistration-selenium · c9e11258
```
Logistration: Bok-choy tests for the combined login/registration page.
```
  Will Daly committed Nov 14, 2014
  c9e11258 Browse Files
- Add Selenium tests for the combined login/registration form. · ffee7517
  Will Daly committed Nov 14, 2014
  
  ffee7517 Browse Files
- Adding disable logic for buttons. · 24869016
```
Update tests, clean up approach.

Updating jasmine tests.
```
  stephensanchez committed Nov 14, 2014
  24869016 Browse Files
13 Nov, 2014 8 commits
- Merge pull request #5952 from edx/alasdair/logistration-accessibility-update-3 · d0c06dda
```
After accessibility review removed required field aria-describedby
```
  AlasdairSwan committed Nov 13, 2014
  d0c06dda Browse Files
- After accessibility review removed required field aria-describedby · 06cbe161
  AlasdairSwan committed Nov 13, 2014
  
  06cbe161 Browse Files
- Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form · a5001bab
```
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
```
  Will Daly committed Nov 13, 2014
  a5001bab Browse Files
- Merge pull request #5943 from edx/benp/db-cache-mysql56 · 3f7d0f24
```
Improve compatibility with additional mysql installations.
```
  Ben Patterson committed Nov 13, 2014
  3f7d0f24 Browse Files
- Merge pull request #5939 from edx/split/course_asset · 51927808
```
Paging and sorting for assets
```
  Don Mitchell committed Nov 13, 2014
  51927808 Browse Files
- Merge branch 'release' · 43d8c7a7
```
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
```
  David Ormsbee committed Nov 13, 2014
  43d8c7a7 Browse Files
- Merge pull request #5938 from edx/alasdair/logistration-setvalidity-fix · dfa81674
```
ECOM-369 Reunited the missing line with the rest of the page elements an...
```
  AlasdairSwan committed Nov 13, 2014
  dfa81674 Browse Files
- Improve compatibility with additional mysql installations. · 8e2d7942
```
Some mysql debian packages do not grant mysql user as many permissions, and
we need to add them.
```
  Ben Patterson committed Nov 12, 2014
  8e2d7942 Browse Files
12 Nov, 2014 26 commits
- Merge pull request #5937 from edx/will/logistration-csrf · 1aa8f8e7
```
Logistration: Add CSRF cookie to combined login/registration form
```
  Will Daly committed Nov 12, 2014
  1aa8f8e7 Browse Files
- Add CSRF cookie to combined login/registration form · c8751b5b
```
Add CSRF check for login/registration views.
```
  Will Daly committed Nov 12, 2014
  c8751b5b Browse Files
- Paging and sorting for assets · 48211388
```
PLAT-75
```
  Don Mitchell committed Nov 12, 2014
  48211388 Browse Files
- ECOM-369 Reunited the missing line with the rest of the page elements and fixed… · ecb6a69f
```
ECOM-369 Reunited the missing line with the rest of the page elements and fixed an error with HTML5 validation override
```
  AlasdairSwan committed Nov 12, 2014
  ecb6a69f Browse Files
- Merge pull request #5935 from edx/db/upgrade-diff-cover · a0a5746e
```
Upgrade diff-cover
```
  David Baumgold committed Nov 12, 2014
  a0a5746e Browse Files
- Merge pull request #5933 from edx/dhm/bug_tnl-764 · 978c2b24
```
Remove over optimization which didn't work correctly
```
  Don Mitchell committed Nov 12, 2014
  978c2b24 Browse Files
- Merge pull request #5853 from edx/gprice/fix-complementary · dec9e41d
```
Fix spelling of complementary role
```
  Greg Price committed Nov 12, 2014
  dec9e41d Browse Files
- Merge pull request #5905 from edx/renzo/pep8-pylint-cleanup · 2fc2207b
```
Clean up pep8 and pylint violations
```
  Renzo Lucioni committed Nov 12, 2014
  2fc2207b Browse Files
- Merge pull request #5934 from edx/alasdair/logistration-accessibility-updates · 0963372b
```
ECOM-369 accessibility updates
```
  AlasdairSwan committed Nov 12, 2014
  0963372b Browse Files
- ECOM-369 accessibility updates · 3eb28715
  AlasdairSwan committed Nov 12, 2014
  
  3eb28715 Browse Files
- Upgrade diff-cover · 3676b4f7
  David Baumgold committed Nov 12, 2014
  
  3676b4f7 Browse Files
- Remove over optimization which didn't work correctly · 326a1221
```
Added story PLAT-293 to do it correctly.
This fixes TNL-764
```
  Don Mitchell committed Nov 12, 2014
  326a1221 Browse Files
- Clean up pep8 and pylint violations · 8d02efb0
```
Also fixes failing Python unit tests
```
  Renzo Lucioni committed Nov 12, 2014
  8d02efb0 Browse Files
- Merge pull request #5720 from edx/sanchez/avoid_event_suppression · fc8b2a5f
```
Changing event suppression to signal suppression.
```
  Stephen Sanchez committed Nov 12, 2014
  fc8b2a5f Browse Files
- Changing event suppression to signal suppression. · 6e85ec07
```
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
```
  stephensanchez committed Nov 12, 2014
  6e85ec07 Browse Files
- Merge pull request #5930 from edx/will/logistration-handle-redirects · 1537086a
```
Logistration: Clean up redirect logic
```
  Will Daly committed Nov 12, 2014
  1537086a Browse Files
- Merge pull request #5931 from edx/will/logistration-remove-extra-viewport-meta · c4992b95
```
Logistration: Remove extra viewport meta tag
```
  Will Daly committed Nov 12, 2014
  c4992b95 Browse Files
- Remove extra viewport meta tag · 0a35af55
  Will Daly committed Nov 12, 2014
  
  0a35af55 Browse Files
- Merge pull request #5814 from edx/disable-pylint-todo-comments · d981f98b
```
Pylint: ignore TODO comments
```
  David Baumgold committed Nov 12, 2014
  d981f98b Browse Files
- Merge pull request #5929 from edx/will/logistration-fix-cancel-third-party-auth · ce158cf5
```
Logistration: Redirect to a valid URL when cancelling third party auth
```
  Will Daly committed Nov 12, 2014
  ce158cf5 Browse Files
- Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments · dd38f523
```
Feature flagged enrollment counts on instructor dashboard.
```
  Dennis Jen committed Nov 12, 2014
  dd38f523 Browse Files
- Clean up redirect logic · 02485be3
  Will Daly committed Nov 12, 2014
  
  02485be3 Browse Files
- Merge pull request #5914 from edx/renzo/final-text-review · 34dd4e59
```
Final text review
```
  Renzo Lucioni committed Nov 12, 2014
  34dd4e59 Browse Files
- Redirect to a valid URL when cancelling third party auth · d50137bb
  Will Daly committed Nov 12, 2014
  
  d50137bb Browse Files
- Merge pull request #5928 from edx/diana/fix-pylint-complaint · 1a4ad061
```
Fix pylint violation.
```
  David Ormsbee committed Nov 12, 2014
  1a4ad061 Browse Files
- Merge pull request #5921 from edx/gprice/fix-oauth-token-login · 3651f2c0
```
Fix OAuth token login endpoint to set session user
```
  Nimisha Asthagiri committed Nov 12, 2014
  3651f2c0 Browse Files