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

112 Commits

Author SHA1 Message Date
Omar Khan
ed2cba2e2d Keep SAML configuration check 2016-02-09 16:10:31 +07:00
Omar Khan
9b7bb0dc20 Make SAMLAuthBackend._config a cached_property 
Cleaner, and keeps pylint happy
 2016-02-09 15:45:49 +07:00
Omar Khan
2c4e97ebfa Don't remove auth_url method 2016-02-09 15:45:21 +07:00
Omar Khan
78d4ed31a1 Revert "Keep SAML configuration check" 
This reverts commit a020464a41.
 2016-02-09 15:40:27 +07:00
Omar Khan
a020464a41 Keep SAML configuration check 2016-02-08 14:32:12 +07:00
Omar Khan
28cb402a04 Return 404 response from third party auth login when SAML disabled 2016-02-05 13:49:20 +07:00
Hasnain
0971e3715a Added check for duplication of email 2016-01-29 14:01:07 +00:00
Omar Khan
ab688e63ea Redirect to login when SAML accessed without idp param 
The python social auth SAML page returns a 500 response when accessed
without the 'idp' query param. It should redirect to the login page if
the param is missing.

SOL-1550
 2016-01-20 09:36:31 +07:00
Braden MacDonald
a654d5e7ac Add additional data to custom SSO auth form extension points 2015-12-04 15:38:18 -08:00
Braden MacDonald
4645c6ecdd Allow using a custom login/register form with third_party_auth 2015-12-01 15:43:34 -08:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Kevin Falcone
80614a2798 Merge branch 'release' into hotfix-2015-11-20-conflict 2015-11-20 13:13:05 -05:00
Kevin Falcone
57a4df73a5 Management commands should no longer access args[] 
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/

Django intercepts the 'pull' argument and says "unrecognized arguments pull"
There were no tests for this command, so it wasn't noticed during the
upgrade testing, only once our integration monitoring noticed.
 2015-11-19 16:25:49 -05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Braden MacDonald
9ccf78ed06 Add some asserts and explanations, per review 2015-11-16 17:18:54 -08:00
Braden MacDonald
40448e44fa Address review comments and test failure 2015-11-16 16:11:00 -08:00
Braden MacDonald
f1bfa56884 Clean up integration tests, test logging in without activation 2015-11-16 16:11:00 -08:00
Braden MacDonald
90cdb91391 Allow users to login via third_party_auth even if not activated 2015-11-16 16:10:57 -08:00
muhammad-ammar
f55f9af891 Fix RemovedInDjango19Warning 2015-11-11 13:58:07 +05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Robert Raposa
3682fac832 Add json escaping to Studio 
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
 2015-11-04 13:34:42 -05:00
Pan Luo
f69304373c Implement user mapping API 
This mapping API enables the mapping between the edX user ID and the ID
provided by identity provider (IdP). For details, please see
https://github.com/edx/edx-platform/pull/9842
 2015-10-27 15:19:42 -07:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta" 
Also remove useless docstrings where they were added to keep pylint
quiet.
 2015-10-21 07:37:00 -04:00
Adam Palay
9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
 2015-10-19 08:35:33 -05:00
Adam Palay
9a79bf2ec9 skip LTIConfig test when third_party_auth is not installed 2015-10-16 12:22:54 -04:00
Diana Huang
0248f8af6d Add new clickjacking decorator that whitelists LTI consumers. 2015-10-07 11:20:51 -04:00
Bill DeRusha
fe23052511 Merge pull request #9979 from edx/bderusha/boardman-traffic 
Add IP to all python Segment tracking calls
 2015-10-05 14:55:55 -04:00
Bill DeRusha
ca6633bd98 Add IP to all python Segment tracking calls 2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Bill DeRusha
14e1ef13fe Merge pull request #9865 from edx/bderusha/segment-version-bump 
Bump version of segemnt's analytics-python package to 1.1.0
 2015-09-29 09:33:49 -04:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Bill DeRusha
4f14d4f75b Bump version of segemnt's analytics-python package to 1.1.0 
Wrap 3rd Party Auth Pipeline with Segment enabled checks
 2015-09-24 11:27:24 -04:00
Braden MacDonald
4be8aa5d5d Initial implementation of API for listing a user's third party auth providers 2015-09-10 16:44:50 -07:00
zubair-arbi
d2a4790855 use the standard syntax to load JavaScript dependencies on logistration js files 
ECOM-2044
 2015-09-07 18:19:56 +05:00
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07:00
Tasawer
cd69ca2b23 Removed unused url endpoints + fixed broken tests 
ECOM-1017
 2015-08-31 12:50:08 +00:00
Braden MacDonald
586c237543 Fix for Twitter compatibility 2015-08-27 11:19:39 -07:00
Braden MacDonald
79a075328f Allow configuring sensitive third_party_auth settings via lms.auth.json 2015-08-25 16:35:35 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Braden MacDonald
f776b81853 Make email addresses in SAML metadata fully configurable 2015-07-29 14:48:31 -07:00
Sarina Canelake
b41e70f541 Remove Pylint violations deprecated-pragma, bad-option-value 2015-07-13 17:33:26 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
Braden MacDonald
4487b6d184 Fix errors with fetching Shibboleth metadata 2015-06-30 20:50:45 -07:00
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
5bf0b1794d Bump python-social-auth and python-same to upstream's latest master - PR 8599 2015-06-26 13:24:00 -07:00
Braden MacDonald
00226bf3c0 Asynchronous metadata fetching using celery beat - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
cd941eada7 New SAML/Shibboleth tests - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00