Commits · a971e717928924f52a0bcd6cd1127064678c9258 · edx / edx-platform · GitLab

04 Nov, 2014 1 commit
- Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form · a971e717
```
Conflicts:
	common/djangoapps/course_modes/views.py
```
  Diana Huang committed Nov 04, 2014
  a971e717 Browse Files
03 Nov, 2014 2 commits
- Merge pull request #5830 from edx/renzo/test-user-api-password-reset · 664c901e
```
Fix tests of user API views
```
  Renzo Lucioni committed Nov 03, 2014
  664c901e Browse Files
- Fix tests of user API views · a60213c8
  Renzo Lucioni committed Nov 03, 2014
  
  a60213c8 Browse Files
30 Oct, 2014 7 commits
- Merge pull request #5762 from edx/diana/enrollment-integration · 8d7d9d21
```
WIP: Combined Login/Registration: Set up basic enrollment infrastructure.
```
  Diana Huang committed Oct 30, 2014
  8d7d9d21 Browse Files
- Add tests for the enrollment_interface · 47979e5b
  Diana Huang committed Oct 30, 2014
  
  47979e5b Browse Files
- Set up basic enrollment infrastructure. · fc468bf6
  Diana Huang committed Oct 30, 2014
  
  fc468bf6 Browse Files
- Merge pull request #5770 from edx/renzo/logistration-i18n · 471f5135
```
i18n logistration
```
  Renzo Lucioni committed Oct 30, 2014
  471f5135 Browse Files
- i18n logistration · 4157e5c0
  Renzo Lucioni committed Oct 30, 2014
  
  4157e5c0 Browse Files
- Merge pull request #5784 from edx/alasdair/rwd-header-and-footer · ff753f2b
```
Alasdair/rwd header and footer
```
  AlasdairSwan committed Oct 30, 2014
  ff753f2b Browse Files
- ECOM-406 removed commented out code, moved colours to variables and fixed hover… · 0c22db68
```
ECOM-406 removed commented out code, moved colours to variables and fixed hover state for mobile menu
```
  AlasdairSwan committed Oct 30, 2014
  0c22db68 Browse Files
29 Oct, 2014 3 commits
- Merge pull request #5785 from edx/renzo/copy-changes · 63ea30da
```
Clean up logistration copy
```
  Renzo Lucioni committed Oct 29, 2014
  63ea30da Browse Files
- Clean up logistration copy · bcef7611
  Renzo Lucioni committed Oct 29, 2014
  
  bcef7611 Browse Files
- ECOM-406 Added JS fil that will update DOM to make the header and footer responsive · e04a3ab3
```
 Made the header and footer responsive
```
  AlasdairSwan committed Oct 29, 2014
  e04a3ab3 Browse Files
28 Oct, 2014 6 commits
- Update third party auth on the logistration form · c553a47c
  Will Daly committed Oct 28, 2014
  
  c553a47c Browse Files
- Update tests to match new text. · 13986d84
  Diana Huang committed Oct 28, 2014
  
  13986d84 Browse Files
- Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form · 48bc4776
```
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
```
  Will Daly committed Oct 28, 2014
  48bc4776 Browse Files
- Redirect users to the track selection page or ?next page when using third party auth · f9b5a917
```
Set marketing site logged in cookie from third party auth.
```
  Will Daly committed Oct 28, 2014
  f9b5a917 Browse Files
- Merge pull request #5757 from edx/alasdair/logistration-rwd · c47eb12a
```
Alasdair/logistration rwd
```
  AlasdairSwan committed Oct 28, 2014
  c47eb12a Browse Files
- ECOM-531 Updated style after review with Andy Waldrop · 728df71a
  AlasdairSwan committed Oct 28, 2014
  
  728df71a Browse Files
27 Oct, 2014 21 commits
- Merge pull request #5718 from edx/alasdair/logistration-t-and-c · a9a4057d
```
ECOM-466 Added support for custom error messages. Styled select widths
```
  AlasdairSwan committed Oct 27, 2014
  a9a4057d Browse Files
- ECOM-369 merged and resolved issues with third party auth error messaging · fd14406a
  AlasdairSwan committed Oct 27, 2014
  
  fd14406a Browse Files
- ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging · 1b1eb781
  AlasdairSwan committed Oct 27, 2014
  
  1b1eb781 Browse Files
- ECOM-369 Added handling of model save errors. Updated FormView to add preRender… · d2accb6d
```
ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur.
```
  AlasdairSwan committed Oct 27, 2014
  d2accb6d Browse Files
- Use a 403 status to indicate that the user does not have a linked · be2b5559
```
account for third party auth.
```
  Will Daly committed Oct 27, 2014
  be2b5559 Browse Files
- ECOM-369 updated in light of review with Andy and code review · 08e03ef3
  AlasdairSwan committed Oct 27, 2014
  
  08e03ef3 Browse Files
- Fix failing JS tests · ca0d048b
  Renzo Lucioni committed Oct 27, 2014
  
  ca0d048b Browse Files
- ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging · 0b9ed031
  AlasdairSwan committed Oct 27, 2014
  
  0b9ed031 Browse Files
- Moved pre-render to first in initialize to ensure runs before render · 3efeaf5a
  AlasdairSwan committed Oct 27, 2014
  
  3efeaf5a Browse Files
- ECOM-369 Added handling of model save errors. Updated FormView to add preRender… · 2ea96855
```
ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur.
```
  AlasdairSwan committed Oct 27, 2014
  2ea96855 Browse Files
- ECOM-466 Added support for custom error messages. Styled select widths · a86e9e68
  AlasdairSwan committed Oct 27, 2014
  
  a86e9e68 Browse Files
- Merge pull request #5735 from edx/will/update-release-10-27 · 5a1df635
```
Merge release into master (with changes from Friday 10/24/14)
```
  Will Daly committed Oct 27, 2014
  5a1df635 Browse Files
- Merge pull request #5737 from edx/sarina/102714-translations-update · 25a74552
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Oct 27, 2014
  25a74552 Browse Files
- Update translations (autogenerated message) · e4bfa0f9
  Sarina Canelake committed Oct 27, 2014
  
  e4bfa0f9 Browse Files
- Merge pull request #5723 from edx/dhm/split_assetstore · 22cbe0c4
```
Implement asset metadata storage in Split - per-asset functionality
```
  Don Mitchell committed Oct 27, 2014
  22cbe0c4 Browse Files
- Merge pull request #5732 from edx/benp/optimize-run-quality · ed2ca508
```
Optimize run_quality calls
```
  Ben Patterson committed Oct 27, 2014
  ed2ca508 Browse Files
- Fix pylint violations · 0cac6ea2
  Will Daly committed Oct 27, 2014
  
  0cac6ea2 Browse Files
- Merge remote-tracking branch 'origin/release' · 7f54af3b
  Will Daly committed Oct 27, 2014
  
  7f54af3b Browse Files
- Merge pull request #5722 from edx/renzo/third-party-auth-no-prof-ed-autoenroll · cafea307
```
Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth
```
  Will Daly committed Oct 27, 2014
  cafea307 Browse Files
- Moved assetstore tests to own file and ddt'd across stores · f48289cc
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
```
  Don Mitchell committed Oct 27, 2014
  f48289cc Browse Files
- Implement asset metadata storage in Split - per-asset functionality · b6fac239
```
PLAT-40

Conflicts:
	common/lib/xmodule/xmodule/assetstore/__init__.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
```
  Don Mitchell committed Oct 27, 2014
  b6fac239 Browse Files