Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
Douglas Hall
7128059921 Add API view for retrieving third party auth user status. 2019-04-02 12:58:13 -04:00
Michael Youngstrom
9d589f997d INCR-128 2019-04-02 12:40:26 -04:00
Michael Youngstrom
746b5a7e8d Merge pull request #20119 from edx/testeng/bokchoy_auto_cache_update_f2440cac82cfce5547d42c8bf9504468bee4a743 
Bokchoy db cache update
 2019-04-02 12:21:02 -04:00
edx-cache-uploader-bot
db6de5990d Updating migrations 2019-04-02 10:32:26 -04:00
Christie Rice
bfce40663e Merge pull request #20110 from edx/crice/flakyTest 
Remove flaky test test_birth_year_not_set
 2019-04-02 09:27:29 -04:00
Jeremy Bowman
95986c4f9a Merge pull request #20116 from jolyonb/incr-162 
INCR-156 Migrated and cleaned up imports on /common/lib/capa/capa/tests/
 2019-04-01 20:25:05 -04:00
David Ormsbee
810b8b60f8 Merge pull request #19618 from open-craft/josuebc/upstream/BB-755 
BB-755 Add feature to manually unlock a student account after too many login attempts.
 2019-04-01 17:42:19 -04:00
Jolyon Bloomfield
932a76c958 INCR-162 Migrated and cleaned up imports on /common/lib/capa/capa/tests/ 2019-04-01 15:53:08 -04:00
Michael Youngstrom
59967d3ee6 Merge pull request #20083 from edx/testeng/bokchoy_auto_cache_update_a2cbb5d4d1ee2ee817aa59048db11123951b4805 
Bokchoy db cache update
 2019-04-01 12:31:39 -04:00
Christie Rice
349bc33ac0 Remove flaky test test_birth_year_not_set 2019-04-01 09:32:37 -04:00
Christie Rice
5462474aa6 Merge pull request #20072 from edx/crice/REVEM-203_dashboard 
REVEM-203 Add course and program info to dashboard metadata
 2019-04-01 09:16:53 -04:00
Christie Rice
052683f926 REVEM-203 Add course and program info to dashboard metadata 2019-03-30 08:30:07 -04:00
Stu Young
ad0e0da2db Merge pull request #20102 from jolyonb/incr-127 
INCR-127: Migrating common/djangoapps/course_action_state
 2019-03-29 17:04:38 -04:00
Jolyon Bloomfield
f7cb9641dd Migrating common/djangoapps/course_action_state 2019-03-29 12:42:28 -07:00
edx-cache-uploader-bot
d77b317273 Updating migrations 2019-03-29 12:31:00 -04:00
Matthew Piatetsky
4966b30bb5 Merge pull request #20071 from edx/revert-20064-revert-20003-mobile-access-denied 
continue removing blocks from course outline
 2019-03-29 11:20:59 -04:00
Matthew Piatetsky
1f6cd7aa5a Revert "Revert "REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason"" 2019-03-28 14:44:05 -04:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00
Matthew Piatetsky
8eae694566 Revert "REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason" 2019-03-27 16:30:37 -04:00
Thomas Tracy
d71d1dd454 Merge pull request #20011 from edx/ttracy/ENT-1584-tracking-for-email-change 
Ttracy/ent 1584 tracking for email change
 2019-03-27 09:26:45 -04:00
Matthew Piatetsky
e6b55ede3d Merge pull request #20003 from edx/mobile-access-denied 
REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason
 2019-03-26 17:33:57 -04:00
Matthew Piatetsky
4bb539c9aa update user partition and access_denied_message_filter transformers 2019-03-26 15:26:59 -04:00
Thomas Tracy
1f8a9f5dc7 Added a tracking event for when the user switches their secondary email to their primary. 2019-03-26 13:41:34 -04:00
hasnain-naveed
c554ef6dd9 WL-1903 | Error handling for incorrect configuration of saml Auth. 2019-03-26 15:40:58 +05: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
9c074eac86 Fix testing db 2019-03-22 16:59:57 -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
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
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
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
d567724163 Merge pull request #20008 from cpennington/fbe/get-courses-batched 
Fbe/get courses batched
 2019-03-19 11:53:19 -04:00
David Ormsbee
7dcad7af55 Merge pull request #16496 from open-craft/josh/announcements-feature 
Dashboard announcements feature
 2019-03-18 16:04:38 -04:00
Calen Pennington
6059e21bff Reapply "Improve the performance of access checking for a specific user in CourseViewList by prefetching data" 
This reverts commit d8cd6135a6.
 2019-03-18 15:24:40 -04:00
Dave St.Germain
39ad3b1dd8 Merge pull request #19848 from edx/dcs/decide-duedates 
Proposed decision on due date refactoring
 2019-03-18 13:11:58 -04:00
Dave St.Germain
5beddeb7ff Accepted ADR 2019-03-18 11:54:03 -04:00
cclauss
9a0c995885 ur'strings' are syntax errors in Python 3 2019-03-17 13:56:02 +01:00
Ned Batchelder
53458cd3ea Merge pull request #19999 from edx/nedbat/skip-named-release-help-tests 
Skip named release help tests
 2019-03-14 20:14:54 -04:00
Ned Batchelder
561f0752ca Skip tests of help doc links on named release branches. 
@skip_unless_master is used to skip tests because on named release
branches, most work happens leading up to the first release on the
branch, and that is before the docs have been published.  Tests that
check readthedocs for the right doc page will fail during this time, and
it's just a big distraction.  Also, if we bork the docs, it's not the
end of the world, and we can fix it easily, so this is a good tradeoff.
 2019-03-14 14:01:30 -04:00