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

26604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
1de92697f7 Merge pull request #5771 from edx/renzo/flip-access-view 
Flip order of register and login options in the access view
 2014-11-04 14:01:16 -05:00
Renzo Lucioni
fca44138dd Flip order of register and login options in the access view 2014-11-04 13:59:44 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Renzo Lucioni
664c901e16 Merge pull request #5830 from edx/renzo/test-user-api-password-reset 
Fix tests of user API views
 2014-11-03 10:27:41 -05:00
Renzo Lucioni
a60213c814 Fix tests of user API views 2014-11-03 10:14:31 -05:00
Diana Huang
8d7d9d212f Merge pull request #5762 from edx/diana/enrollment-integration 
WIP: Combined Login/Registration: Set up basic enrollment infrastructure.
 2014-10-30 17:18:07 -04:00
Diana Huang
47979e5bcf Add tests for the enrollment_interface 2014-10-30 17:15:26 -04:00
Diana Huang
fc468bf696 Set up basic enrollment infrastructure. 2014-10-30 17:15:26 -04:00
Renzo Lucioni
471f513566 Merge pull request #5770 from edx/renzo/logistration-i18n 
i18n logistration
 2014-10-30 14:20:08 -04:00
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
AlasdairSwan
ff753f2bcb Merge pull request #5784 from edx/alasdair/rwd-header-and-footer 
Alasdair/rwd header and footer
 2014-10-30 09:21:21 -04:00
AlasdairSwan
0c22db688f ECOM-406 removed commented out code, moved colours to variables and fixed hover state for mobile menu 2014-10-30 09:20:48 -04:00
Renzo Lucioni
63ea30da9f Merge pull request #5785 from edx/renzo/copy-changes 
Clean up logistration copy
 2014-10-29 15:11:47 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive 
Made the header and footer responsive
 2014-10-29 14:00:54 -04:00
Will Daly
c553a47c26 Update third party auth on the logistration form 2014-10-28 17:00:48 -04:00
Diana Huang
13986d8475 Update tests to match new text. 2014-10-28 16:28:58 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
 2014-10-28 15:16:27 -04:00
Will Daly
f9b5a9173f Redirect users to the track selection page or ?next page when using third party auth 
Set marketing site logged in cookie from third party auth.
 2014-10-28 10:28:30 -04:00
AlasdairSwan
c47eb12ad3 Merge pull request #5757 from edx/alasdair/logistration-rwd 
Alasdair/logistration rwd
 2014-10-28 10:24:39 -04:00
AlasdairSwan
728df71acf ECOM-531 Updated style after review with Andy Waldrop 2014-10-28 10:20:44 -04:00
AlasdairSwan
a9a4057dab Merge pull request #5718 from edx/alasdair/logistration-t-and-c 
ECOM-466 Added support for custom error messages. Styled select widths
 2014-10-27 15:22:24 -04:00
AlasdairSwan
fd14406aed ECOM-369 merged and resolved issues with third party auth error messaging 2014-10-27 15:19:36 -04:00
AlasdairSwan
1b1eb78123 ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging 2014-10-27 15:19:07 -04:00
AlasdairSwan
d2accb6d34 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. 2014-10-27 15:19:07 -04:00
Will Daly
be2b55590c Use a 403 status to indicate that the user does not have a linked 
account for third party auth.
 2014-10-27 15:18:10 -04:00
AlasdairSwan
08e03ef380 ECOM-369 updated in light of review with Andy and code review 2014-10-27 15:17:07 -04:00
Renzo Lucioni
ca0d048b4f Fix failing JS tests 2014-10-27 15:17:07 -04:00
AlasdairSwan
0b9ed0315b ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging 2014-10-27 15:17:07 -04:00
AlasdairSwan
3efeaf5a47 Moved pre-render to first in initialize to ensure runs before render 2014-10-27 15:16:33 -04:00
AlasdairSwan
2ea9685552 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. 2014-10-27 15:16:33 -04:00
AlasdairSwan
a86e9e68db ECOM-466 Added support for custom error messages. Styled select widths 2014-10-27 15:15:10 -04:00
Will Daly
5a1df635d0 Merge pull request #5735 from edx/will/update-release-10-27 
Merge release into master (with changes from Friday 10/24/14)
 2014-10-27 12:01:09 -04:00
Sarina Canelake
25a745526c Merge pull request #5737 from edx/sarina/102714-translations-update 
Update translations (autogenerated message)
 2014-10-27 11:44:15 -04:00
Sarina Canelake
e4bfa0f9ff Update translations (autogenerated message) 2014-10-27 11:43:16 -04:00
Don Mitchell
22cbe0c410 Merge pull request #5723 from edx/dhm/split_assetstore 
Implement asset metadata storage in Split - per-asset functionality
 2014-10-27 11:36:29 -04:00
Ben Patterson
ed2ca50804 Merge pull request #5732 from edx/benp/optimize-run-quality 
Optimize run_quality calls
 2014-10-27 11:08:59 -04:00
Will Daly
0cac6ea21b Fix pylint violations 2014-10-27 11:04:22 -04:00
Will Daly
7f54af3be0 Merge remote-tracking branch 'origin/release' 2014-10-27 10:59:31 -04:00
Will Daly
cafea30769 Merge pull request #5722 from edx/renzo/third-party-auth-no-prof-ed-autoenroll 
Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth
 2014-10-27 10:58:50 -04:00
Don Mitchell
f48289cc4f Moved assetstore tests to own file and ddt'd across stores 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
 2014-10-27 10:04:10 -04:00
Don Mitchell
b6fac23960 Implement asset metadata storage in Split - per-asset functionality 
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
 2014-10-27 10:04:09 -04:00
Mark Hoeber
0064d29dc4 Merge pull request #5684 from edx/markhoeber-documentation-doc3 
Fixed Text Input Template
 2014-10-27 09:21:53 -04:00
Mark Hoeber
7ad5561abd Fixed Text Input Template 2014-10-27 09:21:26 -04:00
Mark Hoeber
fa93a69283 Merge pull request #5692 from edx/markhoeber-doc935 
Fixed code sample for python grader
 2014-10-27 09:07:05 -04:00
Mark Hoeber
c2428c7276 Fixed code sample for python grader 
Just a missing “
 2014-10-27 09:06:38 -04:00
Ben Patterson
9642468c98 Optimize run_quality calls 
Leverages recent changes in diff-cover to reduce number of diff-quality runs
 2014-10-27 07:06:58 -04:00
Will Daly
60f02feb71 Merge pull request #5716 from edx/will/logistration-custom-error-msgs 
Add field from server to set custom error messages for logistration fields
 2014-10-25 14:29:21 -04:00
Will Daly
3996b0a7e6 Merge pull request #5708 from edx/will/fix-401-basic-auth-issue 
Logistration: Use a 403 status to indicate that the user does not have a linked account
 2014-10-25 14:29:05 -04:00
Ben Patterson
ff4a1755d0 Merge pull request #5650 from edx/benp/TE-555 
run_quality should run both quality reports in the case of a threshold breach
 2014-10-24 19:20:26 -04:00