Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,161 Commits 1 Branch 0 Tags
9b01f29ac53e965fb7ac942f44d00a3590bb190b
Commit Graph

55161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahmad Bilal Khalid
9b01f29ac5 Remove edx-ora2 from requirements/constraints.txt and run make upgrade 2020-07-20 12:11:43 +05:00
Ahmad Bilal Khalid
71bbd9a5ec Fix failing non-indexable tests 2020-07-20 12:06:42 +05:00
Usama Sadiq
71aa3c9d75 Merge pull request #24539 from edx/jenkins/upgrade-python-requirements-d0b1384 
Python Requirements Update
 2020-07-20 11:20:45 +05:00
edX requirements bot
e9bb69b1d7 Updating Python Requirements 2020-07-20 00:55:33 -04:00
edX Transifex Bot
d0b138479f fix(i18n): update translations 2020-07-19 17:36:28 -04:00
stvn
1189580e0f Merge PR #24521 cleanup/mfe-flags 
* Commits:
  Consolidate MFE redirect logic
 2020-07-17 11:46:04 -07:00
Matt Tuchfarber
fb6786d90c Merge pull request #24490 from edx/tuchfarber/use_demographics_api_for_banner 
Use new demographics API for banner in .org theme
 2020-07-17 14:02:55 -04:00
Adam Stankiewicz
91dc5e4b9c bump edx-enterprise to 3.3.26 (#24533) 2020-07-17 13:47:59 -04:00
Matt Tuchfarber
cbeab67833 Use demographics api for dashboard banner 
Make demographics collection banner on dashboard use new demographics
API which checks enterprise as well. Also expose serialization of
CourseEnrollments.
 2020-07-17 13:20:42 -04:00
Aura Milena Alba
64edd0e686 Remove pattern library of learner_achievements. (#24369) 2020-07-17 12:45:58 -04:00
Robert Raposa
ef51a44794 move CodeOwnerMetricMiddleware from LMS (#24508) 
The CodeOwnerMetricMiddleware is being moved from
edx-platform to edx-django-utils so it can be used
in multiple IDAs.

ARCHBOM-1356
 2020-07-17 11:35:40 -04:00
Patrick Cockwell
129ed1b9ab TNL-7303 Add course license details to Courseware API (#24393) 2020-07-17 10:15:21 -04:00
Jeff LaJoie
eb32aa979a Merge pull request #24361 from edx/jlajoie/ENT-2893 
ENT-2893: Updates header branding and href for Enterprise learners
 2020-07-17 09:58:09 -04:00
Jeff LaJoie
bf11b68fda ENT-2893: Updates header branding and href for Enterprise learners 2020-07-17 08:59:43 -04:00
Michael Roytman
0741c383ad Merge pull request #24431 from edx/mroytman/MST-286-proctored-exam-settings-rest-api 
mroytman/MST-286-proctored-exam-settings-rest-api
 2020-07-17 08:54:51 -04:00
Waheed Ahmed
8abb3d70bb Allow entitlements to be used past the enrollment date. 
Allow entitlements to be used to upgrade to verified track past the
course enrollment date and before the upgrade deadline

PROD-1497
 2020-07-17 16:22:56 +05:00
Usama Sadiq
d2253912b3 Merge pull request #24524 from edx/jenkins/upgrade-python-requirements-26157d4 
Python Requirements Update
 2020-07-17 14:07:12 +05:00
edX requirements bot
8fb817cec0 Updating Python Requirements 2020-07-17 00:46:17 -04:00
stvn
9e31d65afe Consolidate MFE redirect logic 
Its ripe for confusion to have this logic split between two separate
methods. This consolidation should make things easier to understand and
hopefully, less issue prone.

We don't really benefit from having two methods here anyway, as one is
_only_ ever called by the other.

It's also misleading that the second helper, in `toggles.py`, _also_
checks the FEATURE flag, as well as the waffle flag.
 2020-07-16 15:21:32 -07:00
Michael Roytman
6601111982 add rest_api for contentstore app, including a proctored_exam_settings view 2020-07-16 15:52:03 -04:00
Calen Pennington
26157d43a4 Merge pull request #24484 from cpennington/fix-admin-site-size-change 
Attempt to fix devstack issues with an upgrade of django-ratelimit-ba…
 2020-07-16 14:36:37 -04:00
Calen Pennington
0e55566d96 Attempt to fix devstack issues with an upgrade of django-ratelimit-backend 2020-07-16 13:56:41 -04:00
Jeff Chaves
ffd7290609 upgrading edx-enterprise to 3.3.25 (#24516) 
* upgrading edx-enterprise to 3.3.25

* updating edx-enterprise in constraints file
 2020-07-16 12:39:23 -04:00
Awais Qureshi
d732d22b31 Merge pull request #24514 from edx/ora-2-issue 
BOM-1921
 2020-07-16 20:11:47 +05:00
Feanil Patel
e7fbc0c8e0 Merge pull request #21333 from open-craft/giovanni/bb-1471-upstream-custom-redirect 
BB-1471: Add site configuration flag to allow changing default redirection after login
 2020-07-16 10:30:07 -04:00
Awais Qureshi
d514782609 BOM-1921 
Adding constraint for ora2.
latest version causing failures.
 2020-07-16 19:17:13 +05:00
Feanil Patel
437cf0c787 Merge pull request #24432 from edly-io/ziafazal/bd-18-bockchoy-tests-removal 
[BD-18] Remove bockchoy tests
 2020-07-16 09:39:26 -04:00
M. Zulqarnain
d26b8bf47b Django 3.x deprecation warning fix in lms (#24512) 2020-07-16 18:29:09 +05:00
Christie Rice
81bcfdf1ec MICROBA-393 Add customized partner report headings (#24502) 2020-07-16 08:58:08 -04:00
Matthew Piatetsky
30c4aa3220 Merge pull request #24505 from edx/revert-24214-REV-774 
Revert "[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam"
 2020-07-16 08:38:05 -04:00
Giovanni Cimolin da Silva
8a143a4298 Add site configuration flag to allow changing redirection after login 2020-07-16 09:17:17 -03:00
adeel khan
b627e73f58 Merge pull request #24511 from edx/private_to_public_46becdc 
Mergeback PR from private to public.
 2020-07-16 15:01:57 +05:00
Usama Sadiq
c244a2a524 Merge pull request #24489 from edx/testeng/bokchoy_auto_cache_update_442c3fee11d4b1a3ec21c9904ab0e4ab12b01679 
Bokchoy Testing DB Cache update
 2020-07-16 12:45:43 +05:00
adeel khan
46becdc577 Merge pull request #181 from edx/adeel/fixing-xss-issues 
Fixes xss issues.
 2020-07-16 11:53:24 +05:00
Felipe Montoya
ca21131c98 Merge pull request #24492 from eduNEXT/eric/update_rate_xblock 
[BD-06] Update Rate XBlock version to support python 3.8.
 2020-07-15 17:08:35 -05:00
edX Transifex Bot
284c3f3637 geoip2: update maxmind geolite country database 2020-07-15 17:11:25 -04:00
Matthew Piatetsky
1fec3b997b Revert "[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam" 2020-07-15 15:43:57 -04:00
Eric Herrera
7a6a83b855 Update Rate XBlock version to support python 3.8. 2020-07-15 15:42:06 -04:00
Awais Qureshi
da845acd8f Merge pull request #24462 from eduNEXT/eric/update_acid_xblock 
[BD-6] Use updated version of acid xblock.
 2020-07-16 00:33:58 +05:00
Robert Raposa
4053bfdfbd move ENABLE_FORUM_DAILY_DIGEST default (#24483) 
The default for ENABLE_FORUM_DAILY_DIGEST continues
to be True, but this moves the default from
common.py to code.
 2020-07-15 14:48:05 -04:00
Ali Akbar
205793755f Merge pull request #24476 from edx/aakbar/PROD-1850 
removing logs, waffle flag and other older code
 2020-07-15 23:34:29 +05:00
Eric Herrera
1d7d88383e Use updated acid xblock version. 2020-07-15 14:27:37 -04:00
Feanil Patel
efef7d81ee Merge pull request #24497 from eduNEXT/lmm/codejail_py38 
[BD-6] Upgrade codejail
 2020-07-15 14:24:35 -04:00
Luis Moreno
a74b69affd Upgrade codejail 2020-07-15 14:01:24 -04:00
Dillon Dumesnil
fccb52b6c8 Merge pull request #24501 from edx/revert-24421-ora2-dates 
Revert "AA-223 - Add ORA2 dates to the dates page"
 2020-07-15 10:37:39 -07:00
Dillon Dumesnil
2601975fd3 Revert "AA-223 - Add ORA2 dates to the dates page" 2020-07-15 10:13:00 -07:00
Felipe Montoya
a0bc37866d Merge pull request #24491 from eduNEXT/eric/update_done_xblock 
[BD-6] Update Done XBlock version to support python 3.8.
 2020-07-15 11:37:04 -05:00
Nathan Sprenkle
620bbd7649 Hide search boxes in private team-sets for non-privileged users (#24444) 2020-07-15 12:30:06 -04:00
Awais Qureshi
e903e30dd4 Merge pull request #24494 from edx/BOM-1895-staticfiles-depr 
Django3.0 warnings {% load staticfiles %} is deprecated
 2020-07-15 20:46:26 +05:00
Calen Pennington
6edec4f530 Merge pull request #24421 from cpennington/ora2-dates 
AA-223 - Add ORA2 dates to the dates page
 2020-07-15 10:50:08 -04:00