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

51562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zainab Amir
a5189ad769 Merge pull request #20051 from edx/zamir/LEARNER_5532_change_css_on_edge_about_page 
LEARNER-5532 Change css for edX edge about page
 2019-03-26 15:49:50 +05:00
hasnain-naveed
c554ef6dd9 WL-1903 | Error handling for incorrect configuration of saml Auth. 2019-03-26 15:40:58 +05:00
Zainab Amir
e0eea23e78 Change css for edX edge about page 
Removed padding and increased the height to 100% to make enroll
button visible on mobile view for courses with long title

LEARNER-5532
 2019-03-26 14:43:21 +05:00
Matt Hughes
d1f938ba44 fixing issue with instructor service not being loaded in studio 
was causing issues with PT exam configuration dashboard launch
 2019-03-25 17:19:33 -04:00
Calen Pennington
07dfd0f8b5 Merge pull request #20036 from cpennington/devstack-browsable-api 
Add BrowsableAPIRenderer to devstack to make debugging easier
 2019-03-25 11:17:43 -04:00
Albert (AJ) St. Aubin
49dc2f0a81 Merge pull request #20049 from edx/aj/entitlement_expiration 
Aj/entitlement expiration
 2019-03-25 11:08:29 -04:00
Albert (AJ) St. Aubin
d47d22a9bb updating the import for entitlement tasks 2019-03-25 10:28:30 -04:00
Michael Youngstrom
c8a9705d6b Merge pull request #20038 from edx/youngstrom/update-fixture 
Manually update bokchoy cache db and bump edx-enterprise
 2019-03-22 17:44:38 -04:00
Michael Youngstrom
9c074eac86 Fix testing db 2019-03-22 16:59:57 -04:00
Calen Pennington
97f9dd375b Merge pull request #20046 from cpennington/fbe/access-expiry-course-key-serialize 
Serialize the CourseKey before putting into celery task args
 2019-03-22 15:35:22 -04:00
Douglas Hall
0f2f757d7d Merge pull request #20045 from edx/douglashall/ARCH-495 
Include GeneratedCertificate modified date in certificates API response.
 2019-03-22 14:27:02 -04:00
Calen Pennington
a342fa57f2 Serialize the CourseKey before putting into celery task args 2019-03-22 14:09:20 -04:00
Douglas Hall
04b2c12893 Include GeneratedCertificate modified date in certificates API response. 2019-03-22 12:39:18 -04:00
Matthew Piatetsky
86eaf2f603 Merge pull request #20041 from edx/fix_limited_access_masquerade 
when masquerading as limited access content gates should not dissapear
 2019-03-22 12:18:46 -04:00
Josue Balandrano Coronel
78f4ccb50a Expose LoginFailure model to Django's Admin UI to allow admin users 
unlock student accounts that have been locked out for excessive login
failures. This change will allow to quickly unlock student accounts when
time is of the essence (e.g. Timed exams).
 2019-03-22 10:22:01 -05:00
Jeremy Bowman
4af18655e0 Merge pull request #20039 from edx/jmbowman/TE-2886 
TE-2886 Upgrade math/science packages in LMS and Studio
 2019-03-22 11:14:05 -04:00
Calen Pennington
7d9ef1f65a Merge pull request #20040 from cpennington/revert-course-list 
Revert course list
 2019-03-22 10:05:31 -04:00
Jeremy Bowman
243f30ec83 TE-2886 Upgrade math/science packages in LMS and Studio 2019-03-22 10:02:36 -04:00
Awais Jibran
3bfab9fd32 Adding more timing logs as course-rerun is slow for mitx-7.00x 2019-03-22 15:41:57 +05:00
Matthew Piatetsky
f3aef7c5c6 when masquerading as limited access content gates should not dissapear 2019-03-21 15:32:40 -04:00
Calen Pennington
d23e888316 Revert "Reapply "Improve the performance of access checking for a specific user in CourseViewList by prefetching data"" 
This reverts commit 6059e21bff.
 2019-03-21 14:26:00 -04:00
Calen Pennington
b89ce526ca Revert "Batch queries to fetch all courses to prevent over-fetching during paging operations" 
This reverts commit 544c7f7eff.
 2019-03-21 14:26:00 -04:00
Matt Tuchfarber
e6a7c58182 Merge pull request #19853 from edx/tuchfarber/add_username_replacement_api 
Adds username replacement API
 2019-03-21 12:39:23 -04:00
Calen Pennington
34fb3fe508 Add BrowsableAPIRenderer to devstack to make debugging easier 2019-03-21 11:22:57 -04:00
Matt Tuchfarber
5f3bfd1ae4 Fix documentation and logging 2019-03-21 11:16:01 -04:00
Brittney Exline
34fa06aeda Merge pull request #20026 from edx/bexline/ent-1500 
ENT-1500 Update third_party_auth pipeline to override get_username
 2019-03-21 10:29:47 -04:00
Hammad Ahmad Waqas
2f931338db Merge pull request #20005 from edx/hammad/WL-1899 
WL-1899 | 500 error when SAML attribute is mapped + present, but has no value
 2019-03-21 15:09:23 +05:00
Hammad Ahmad Waqas
a48b59c24c fixed : when SAML attribute is mapped + present, but has no value 2019-03-21 12:08:50 +05:00
Ned Batchelder
8a612c4dfb Merge pull request #20027 from cclauss/Fix-F632 
Use ==/!= to compare str, bytes, and int literals
 2019-03-20 22:01:44 -04:00
David Ormsbee
e911898e48 Merge pull request #19023 from kaushik94/bugfix/fix-enroll-button-safari 
added fix for broken 'enroll in class' button on about course page
 2019-03-20 18:15:16 -04:00
Matthew Piatetsky
aa06f51dd5 Merge pull request #20028 from edx/REVMI-136 
do not show FBE upsell to full access users
 2019-03-20 16:35:21 -04:00
Matthew Piatetsky
96844c1d05 do not show FBE upsell to full access users 2019-03-20 14:40:13 -04:00
Jeremy Bowman
7144b8ec63 Merge pull request #19911 from edx/jmbowman/TE-2871 
TE-2871 Switch to mysqlclient
 2019-03-20 14:18:50 -04:00
Calen Pennington
ae75adf2a9 Merge pull request #20032 from cpennington/fbe/no-send-cdl-disabled 
Don't send Access Expiry Emails to courses that don't have Course Dur…
 2019-03-20 12:30:03 -04:00
Calen Pennington
078b50e6eb Don't send Access Expiry Emails to courses that don't have Course Duration Limits enabled 2019-03-20 11:20:41 -04:00
Matt Tuchfarber
41a5ebb0a1 Review 2019-03-20 11:09:46 -04:00
Matt Tuchfarber
c2e1cef508 quality 2019-03-20 10:55:17 -04:00
Matt Tuchfarber
510f877408 quality 2019-03-20 10:52:10 -04:00
adeelehsan
edafaa107f Merge pull request #20031 from edx/revert-20030-geoip2-bot-update-country-database2019-03-20 
Revert "geoip2: update maxmind geolite country database"
 2019-03-20 18:52:06 +05:00
Michael Roytman
20a9b7140c Merge pull request #20022 from edx/mroytman/update-studio-hiw-images 
update Studio How It Works images to reflect current state of Studio
 2019-03-20 09:25:52 -04:00
adeelehsan
ccd9b14974 Revert "geoip2: update maxmind geolite country database" 
This reverts commit 8e2b68e3f8.
 2019-03-20 15:12:43 +05:00
adeelehsan
8e2b68e3f8 geoip2: update maxmind geolite country database 2019-03-20 14:26:47 +05:00
Brittney Exline
550d2616b5 ENT-1500 Update third_party_auth pipeline to override get_username 
We are doing this for two reasons:
1. We suspect that the get_username function in social_core is performing a case-sensitive
username check which is breaking when we try to create the user with a duplicate username.
This version ensures we perform a case insensitive check.

2. If it's not that, we want more logging information in order to debug the issue.
 2019-03-19 17:01:29 -04:00
cclauss
bb31716c97 Use ==/!= to compare str, bytes, and int literals 2019-03-19 21:40:06 +01:00
Stu Young
581a6a725a Merge pull request #20020 from edx/testeng/bokchoy_auto_cache_update_c5af88e0004bfcbcc5076f70a5adce561f783218 
Bokchoy db cache update
 2019-03-19 15:49:09 -04:00
Jeremy Bowman
5e37a0c0bb Merge pull request #19621 from cclauss/Fix-ur-strings-for-Python3 
ur'strings' are syntax errors in Python 3
 2019-03-19 15:34:55 -04:00
edx-cache-uploader-bot
7e66e2a6f6 Updating migrations 2019-03-19 15:10:54 -04:00
Calen Pennington
1943640900 Merge pull request #20024 from cpennington/fbe/send-other-courses 
Continue attempting to enqueue messages even if they are disabled for…
 2019-03-19 14:46:59 -04:00
Calen Pennington
a6d3db2bf5 Continue attempting to enqueue messages even if they are disabled for one course 2019-03-19 13:01:16 -04:00
Calen Pennington
d567724163 Merge pull request #20008 from cpennington/fbe/get-courses-batched 
Fbe/get courses batched
 2019-03-19 11:53:19 -04:00