Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

4251 Commits

Author SHA1 Message Date
Jim Abramson
c74b34c1a8 Merge pull request #4041 from edx/jsa/forums-search-users 
implement forums endpoint for searching users.
 2014-06-16 10:15:01 -04:00
Matjaz Gregoric
5aabd3a48e Add scope/field selector settings for LinkedIn provider. 
This change adds three new configuration variables to third_party_auth's LinkedIn provider:

* SOCIAL_AUTH_LINKEDIN_OAUTH2_SCOPE,
* SOCIAL_AUTH_LINKEDIN_OAUTH2_FIELD_SELECTORS,
* SOCIAL_AUTH_LINKEDIN_OAUTH2_EXTRA_DATA

Being able to configure these additional settings is useful if you want
the LinkedIn provider to pre-populate the email field when a new user
registers via the linkedin provider.

The Google provider prepoulates the email field by default, but if you
want LinkedIn to do the same, these two settings should be set to:

SOCIAL_AUTH_LINKEDIN_OAUTH2_SCOPE = ['r_basicprofile', 'r_emailaddress']
SOCIAL_AUTH_LINKEDIN_OAUTH2_FIELD_SELECTORS = ['email-address']

For more info see:
http://psa.matiasaguirre.net/docs/backends/linkedin.html
 2014-06-16 10:27:38 +02:00
David Baumgold
bafdb8ecb1 make our HTTP stub services respond to HEAD requests 2014-06-13 14:42:23 -04:00
Sarina Canelake
3adc2f0a2e Fix opaque_keys imports from hotfixes 2014-06-11 21:32:41 -04:00
Sarina Canelake
7e36c35043 Merge branch 'release' 2014-06-11 21:30:05 -04:00
louyihua
6d7839007a Do not merge zh-hk into zh-tw in darklang 2014-06-12 01:19:49 +08:00
Calen Pennington
f6ea16223b Allow users that have unregistered from a verified course to re-register. 
Fixes LMS-2830
 2014-06-11 12:37:53 -04:00
Oleg Marshev
cfec580a63 Add argument. 2014-06-11 11:41:03 +03:00
Sarina Canelake
2aea261d48 Merge branch 'release' 
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
 2014-06-10 16:59:23 -04:00
jsa
526d4b1d49 forums: fix assign_default_role to use the correct constant. 2014-06-10 12:26:21 -04:00
Sarina Canelake
bf6c342dcf Fix location.url [LMS-2786] 2014-06-09 15:17:20 -04:00
Calen Pennington
87557a1af8 Add tests of RoleCache 2014-06-09 15:15:03 -04:00
Calen Pennington
dc7b2f0762 Don't create model objects to check the roles cache 2014-06-09 15:13:31 -04:00
Don Mitchell
c808277007 Change document_class back to dict 2014-06-09 15:13:31 -04:00
Julia Hansbrough
e3459cd3cb Opaque-Keys: Response to code review 2014-06-09 15:12:22 -04:00
Don Mitchell
2c6437a279 Fix performance regression 
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
 2014-06-09 15:10:47 -04:00
brianhw
8801b3a12b Merge pull request #3954 from edx/brian/fix_session_id 
Encrypt the session id before writing to tracking logs.
 2014-06-09 14:01:29 -04:00
Waheed Ahmed
200394f608 Added logging for sender email address on BotoServerError. 
LMS-2734
 2014-06-09 12:22:41 +05:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX. 
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
 2014-06-05 15:00:29 -04:00
Felipe Montoya
a66f557a57 Adding template tag to render microsite css_overrides_file 2014-06-04 09:09:56 -05:00
Felipe Montoya
e64d09fdd8 Adding template tag to render the microsite favicon 2014-06-03 22:31:46 -05:00
Jay Zoldak
ac17e809ee Fix some translation tags 2014-06-03 15:50:11 -04:00
Brian Wilson
f9f4f1c57a Add additional tests for tracking of sessions. 2014-06-03 13:24:48 -04:00
Greg Price
0d37b4b254 Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
 2014-06-02 15:29:40 -04:00
Brian Wilson
119d7768bf Also use md5 for constructing key for hmac. 2014-06-02 12:31:44 -04:00
Muhammad Ammar
84ac562831 Lettuce YouTube Check Improvements 2014-06-02 16:27:04 +00:00
Brian Wilson
919b433847 Encrypt the session id before writing to tracking logs. 2014-06-02 11:03:41 -04:00
Waheed Ahmed
cb2af13418 Fixed staff debug info endpoints for staff member. 
LMS-2737
 2014-06-02 12:26:27 +05:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
Sarina Canelake
5c9fe4bb7a Merge pull request #3929 from edx/sarina/lms-2786 
Fix location.url [LMS-2786]
 2014-05-29 21:01:46 -04:00
Sarina Canelake
e77dffcbcd Fix location.url [LMS-2786] 2014-05-29 18:01:29 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Don Mitchell
85565a3de8 lms dashboard ignores errored courses 2014-05-29 14:38:42 -04:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
Jay Zoldak
721732bf27 Merge pull request #3920 from edx/zoldak/increase-test-async-timeout 
Increase async script timeout in lettuce tests
 2014-05-29 10:44:37 -04:00
Jay Zoldak
40884a5085 Increase the default timeout for waiting in lettuce tests 2014-05-29 09:35:51 -04:00
Jay Zoldak
11fbaa19bf Increase async script timeout in lettuce tests 2014-05-29 09:05:31 -04:00
Usman Khalid
eceb8318f9 Merge pull request #3833 from edx/usman/lms2738-verify-student-urls 
Added trailing slashes to verify_student app urls.
 2014-05-29 16:22:00 +05:00
Usman Khalid
3aa4598956 Merge pull request #3879 from edx/usman/lms2747-anonymous-ids-collection 
Do not persist anonymous ids when exporting for all students of a course.
 2014-05-29 16:18:43 +05:00
David Adams
384bac2f0e Parse urls with query params for ^/static 
Query params with a value that starts with /static should have their values converted to the full location.
  Query params with a value that does not start with /static should be left unchanged.
 2014-05-28 10:21:55 -07:00
Usman Khalid
3824e234fe Do not persist anonymous ids when exporting for all students of a course. 
For large courses this causes export to take a long time and to time out.

LMS-2747
 2014-05-28 20:48:43 +05:00
Don Mitchell
4944cc763b Get rid of skiptests 2014-05-28 08:20:17 -04:00
Usman Khalid
1ecfac3f84 Added trailing slashes otherwise the course_id regex sometimes eats up get parameters. 
LMS-2738
 2014-05-26 15:50:23 +05:00
Julia Hansbrough
78ed9e9512 Fixed some TODOs, removed irrelevant ones 2014-05-24 19:36:24 -04:00
Sarina Canelake
46d7f99004 StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 19:36:18 -04:00
Sarina Canelake
d1672e31f7 Opaque-keys: fix pylint violations 2014-05-24 19:36:09 -04:00
Sarina Canelake
c535a6b933 Opaque-keys: fix pep8 violations 2014-05-24 19:35:58 -04:00
Sarina Canelake
d01af063a6 Merge pull request #3861 from edx/sarina/fix-quality 
Fix quality violations from opaque-keys
 2014-05-24 19:34:25 -04:00
Julia Hansbrough
6f7bc7e174 Fixed some TODOs, removed irrelevant ones 2014-05-24 18:49:06 -04:00
Sarina Canelake
110719deae StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 18:49:06 -04:00