Commits · c553a47c262853f45c50051dd6053e156ae109cc · edx / edx-platform · GitLab

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 26 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
- Merge pull request #5684 from edx/markhoeber-documentation-doc3 · 0064d29d
```
Fixed Text Input Template
```
  Mark Hoeber committed Oct 27, 2014
  0064d29d Browse Files
- Fixed Text Input Template · 7ad5561a
  Mark Hoeber committed Oct 27, 2014
  
  7ad5561a Browse Files
- Merge pull request #5692 from edx/markhoeber-doc935 · fa93a692
```
Fixed code sample for python grader
```
  Mark Hoeber committed Oct 27, 2014
  fa93a692 Browse Files
- Fixed code sample for python grader · c2428c72
```
Just a missing “
```
  Mark Hoeber committed Oct 27, 2014
  c2428c72 Browse Files
- Optimize run_quality calls · 9642468c
```
Leverages recent changes in diff-cover to reduce number of diff-quality runs
```
  Ben Patterson committed Oct 27, 2014
  9642468c Browse Files
25 Oct, 2014 2 commits
- Merge pull request #5716 from edx/will/logistration-custom-error-msgs · 60f02feb
```
Add field from server to set custom error messages for logistration fields
```
  Will Daly committed Oct 25, 2014
  60f02feb Browse Files
- Merge pull request #5708 from edx/will/fix-401-basic-auth-issue · 3996b0a7
```
Logistration: Use a 403 status to indicate that the user does not have a linked account
```
  Will Daly committed Oct 25, 2014
  3996b0a7 Browse Files
24 Oct, 2014 6 commits
- Merge pull request #5650 from edx/benp/TE-555 · ff4a1755
```
run_quality should run both quality reports in the case of a threshold breach
```
  Ben Patterson committed Oct 24, 2014
  ff4a1755 Browse Files
- Merge pull request #5583 from edx/sylvia/docs/SFD_Discussions · 686ca3d7
```
Sylvia/docs/sfd discussions
```
  srpearce committed Oct 24, 2014
  686ca3d7 Browse Files
- Add discussion info to SFD · 850c3a90
  Sylvia Pearce committed Oct 24, 2014
  
  850c3a90 Browse Files
- Merge pull request #5721 from edx/zoldak/fix-easy-access-test · 26c01dff
```
Fix test page definition for course group configurations page
```
  Jesse Zoldak committed Oct 24, 2014
  26c01dff Browse Files
- Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth · 05cb2a07
  Renzo Lucioni committed Oct 24, 2014
  
  05cb2a07 Browse Files
- Merge pull request #5719 from edx/frances/fix/rtl-dashboard-fixes · 93425a7c
```
small UI fixes on dashboard for RTL
```
  frances botsford committed Oct 24, 2014
  93425a7c Browse Files