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

19868 Commits

Author SHA1 Message Date
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
Calen Pennington
d8cd6135a6 Revert "Improve the performance of access checking for a specific user in CourseViewList by prefetching data" 
This reverts commit a2a340bcd0.
 2019-03-14 10:31:24 -04:00
Cali Stenson
01828034c4 Update enrollment course_price to verified price. 2019-03-13 14:52:33 -04:00
Michael Youngstrom
5567c0bb1e Merge pull request #19983 from edx/testeng/bokchoy_auto_cache_update_392ea9f212793c6c53ae42042598bb20f5d70a7b 
Bokchoy db cache update
 2019-03-13 09:57:28 -04:00
edx-cache-uploader-bot
d89c34369c Updating migrations 2019-03-12 12:29:28 -04:00
Matthew Piatetsky
d5c50533e1 Merge pull request #19968 from edx/PROD-58 
handle incorrectly set schedules
 2019-03-12 12:16:03 -04:00
Waheed Ahmed
6fa5893abb Merge pull request #19963 from edx/waheed/LEARNER-6643-fix-change-enrollment-command 
Fix change enrollment command for credit.
 2019-03-12 18:37:23 +05:00
Waheed Ahmed
458e8482ea Fix change enrollment command for credit. 
Get provider id from ecommerce upon changing enrollment to credit
instead of setting course_key org.

LEARNER-6643
 2019-03-12 15:30:48 +05:00
Matthew Piatetsky
dac0eec385 handle incorrectly set schedules 2019-03-11 16:46:29 -04:00
edx-cache-uploader-bot
adbf5fe33b Updating migrations 2019-03-11 16:43:55 -04:00
Calen Pennington
5d3c9b36df Merge pull request #19964 from cpennington/fbe-query-perf 
Sort in python and add an index to improve StackedConfigModel.current…
 2019-03-11 12:22:59 -04:00
Stu Young
129438420e Merge pull request #19970 from edx/estute/remove-flaky-account-settings-test 
remove flaky account settings page test
 2019-03-11 11:18:04 -04:00
Calen Pennington
a2a340bcd0 Improve the performance of access checking for a specific user in CourseViewList by prefetching data 2019-03-11 10:37:53 -04:00
Stu Young
5a1105bb43 Merge pull request #19966 from edx/testeng/bokchoy_auto_cache_update_57f631ad1d9b1523d1e35b51c2f8f17b926fd050 
Bokchoy db cache update
 2019-03-11 09:41:22 -04:00
DawoudSheraz
f64c602887 Add aria-label toggling for play/pause and fill browser buttons 2019-03-11 11:51:25 +05:00
Josh McLaughlin
4d4b040517 Add dashboard announcements feature 
- Add announcements view using JSX to the dashboard sidebar
- Create a new maintenance interface to edit and manage announcements
- Adds an override to main.html template to include new skip links
- Add plugins required for announcements to TinyMCE

This is motivated by a desire to have system wide messages for students
that show on the dashboard. Enabled with FEATURES['ENABLE_ANNOUNCEMENTS'].
Global staff are allowed to edit from the studio maintenance view.
 2019-03-10 19:25:13 -07:00
Stuart Young
648f15a514 remove flaky account settings page test 2019-03-08 17:38:27 -05:00
edx-cache-uploader-bot
96b39e4aa1 Updating migrations 2019-03-08 14:04:59 -05:00
Stu Young
dbbfaf8bae Merge pull request #19954 from edx/testeng/bokchoy_auto_cache_update_224fa696472c3fd35f4920ce2f428d351c3a948f 
Bokchoy db cache update
 2019-03-07 12:15:51 -05:00
edx-cache-uploader-bot
44b7dd2b28 Updating migrations 2019-03-07 10:56:29 -05:00
zrana
c43b14a0ff Merge pull request #19896 from edx/zeeshan/remove_flaky_studio_settings_test 
Remove flaky studio settings test
 2019-03-07 19:20:31 +05:00
zrana
72c9bd1bae Merge pull request #19901 from edx/zeeshan/remove_flaky_lms_insturctor_dashboard_test 
Remove flaky lms instructor dashboard test
 2019-03-07 19:20:16 +05:00
AsadAzam
2a1cff52d5 Merge pull request #19898 from edx/asad/educator-3928-fix-transcript-txt-500 
Fixed download txt transcript 500
 2019-03-07 18:31:22 +05:00
noraiz-anwar
837219f792 add aria-label in video caption control 2019-03-07 15:47:30 +05:00