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

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hasnain.naveed
dcace9cb4d ENT-2735 | Added more logging for e-commerce calculate endpoint. 2020-04-17 09:20:01 +05:00
Farhanah Sheets
d0decc3da2 Merge pull request #23744 from edx/fsheets/contact-us-hackathon 
Update wording on Contact Us page
 2020-04-16 15:58:23 -04:00
Calen Pennington
9e620d3bec Load XBlockToXModuleShim for Studio Tabs page 
The studio tabs page had a race condition when loading many static tabs.
The result was that those tabs couldn't be deleted. By requiring the
`xmodule` module, we force the EditTabsFactory to load
XBlockToXModuleShim before it's needed.
 2020-04-16 15:21:43 -04:00
Farhanah Sheets
49398566e1 Update wording on Contact Us page 2020-04-16 14:10:57 -04:00
Jeremy Bowman
00adba695c Stop logging deprecation warnings outside devstack (#23742) 
The upgrade to Django 2.2 has caused a spike in production logging due to RemovedInDjango30Warning deprecation warnings. For now, turn off logging of DeprecationWarning, ImportWarning, and PendingDeprecationWarning whenever we're using WSGI (they'll continue to be logged in devstack). We may eventually want this behind an easily flipped toggle, but for now just remove it to get this resolved quickly.
 2020-04-16 13:54:07 -04:00
Robert Raposa
4ab436f405 constrain pip-tools<5.0.0 (#23740) 
See ARCHBOM-1141 for details.  Effort required to upgrade pip.

ARCHBOM-1141:
 2020-04-16 13:29:58 -04:00
Robert Raposa
cb0e6f2a4b upgrade edx-enterprise (#23734) 
ARCHBOM-1105
 2020-04-16 08:51:56 -04:00
Jillian Vogel
31232743ea Updates comment to indicate that we need this until Django 3.0.5 2020-04-16 13:58:17 +09:30
Jillian Vogel
865656a7d7 Makes the DCS_SESSION_COOKIE_SAMESITE_* settings configurable from the environment. 2020-04-16 13:45:12 +09:30
Tim McCormack
e25723b2de Unblock make-upgrade by unpinning python3-saml (#23730) 2020-04-16 00:18:23 +00:00
edX Transifex Bot
855c8c4a71 geoip2: update maxmind geolite country database 2020-04-15 17:03:40 -04:00
David Joy
58a459445d Merge pull request #23725 from edx/djoy/upgrade_xblock-drag-and-drop-v2_to_2.2.10 
Upgrade xblock-drag-and-drop-v2 to 2.2.10
 2020-04-15 15:52:49 -04:00
stvn
cc0c96f566 Merge PR #23710 stv/mfe/learning/content-type-gating 
* Commits:
  Add content_type_gating_enabled flag to courseware API
 2020-04-15 12:02:59 -07:00
Farhanah Sheets
88f47bd320 Merge pull request #23726 from edx/fsheets/contact-us-time 
Update success message for contact us page
 2020-04-15 15:00:32 -04:00
stvn
016d2d8c3f Add content_type_gating_enabled flag to courseware API 
to extend the Learner MFE.
 2020-04-15 11:28:01 -07:00
Farhanah Sheets
3eada3d224 Update success message 2020-04-15 14:24:23 -04:00
Saad Yousaf
5263774838 Merge pull request #23660 from edx/saad/PROD-1404-logs-cleanup3 
[PROD-1404] - fix getargspec() DeprecationWarning for inspect to cleanup logs.
 2020-04-15 23:17:53 +05:00
stvn
aa1d0a54c7 Merge PR #23709 stv/mfe/learning/audit-access-expiration 
* Commits:
  Add audit access expiration message to courseware_api
 2020-04-15 11:05:45 -07:00
David Joy
b45607dc68 Upgrade xblock-drag-and-drop-v2 to 2.2.10 
TNL-7184
 2020-04-15 14:01:41 -04:00
Kyle McCormick
18b4f50492 Rename settting PROGRAM_{MANAGER->CONSOLE}_MICROFRONTEND_URL (#23723) 
Th micro-frontend was renamed.

MST-173
 2020-04-15 12:06:07 -04:00
Michael Roytman
e0addc968f Merge pull request #23721 from edx/mroytman/add-private.in-to-gitignore 
add private.in to .gitignore to align with the instructions in requir…
 2020-04-15 10:39:25 -04:00
David Joy
7a400e2917 Factoring redirects out of check_course_access so it can be used with courseware_api (#23651) 
TNL-7053

The courseware_api view will use check_course_access - which now returns AccessResponse objects, and all other uses of check_course_access will now use check_course_access_with_redirect, which is a drop-in replacement for the original check_course_access implementation.

We also added a few new helpers to access_utils:

- check_public_access is a replacement for allow_public_access, which now returns AccessResponse objects
 - check_enrollment checks if the learner is enrolled, and uses check_public_access to account for COURSE_ENABLE_UNENROLLED_ACCESS_FLAG
- check_survey checks whether there is a required survey that the learner must complete prior to accessing the course.

There are two new kinds of AccessError subclasses:

- SurveyRequiredAccessError
- EnrollmentRequiredAccessError
 2020-04-15 10:29:24 -04:00
Saad Yousaf
e031facdfe Merge pull request #23643 from edx/saad/PROD-1404-logs-cleanup1 
[PROD-1404] - Remove unnecessary log.
 2020-04-15 17:04:41 +05:00
Saad Yousaf
76e0754cff Merge pull request #23644 from edx/saad/PROD-1404-logs-cleanup2 
[PROD-1404]  - Address deprecation warning for cgi.escape() for logs cleanup.
 2020-04-15 16:34:16 +05:00
Saad Yousaf
d33e2c9d74 Merge pull request #23664 from edx/saad/PROD-1404-logs-cleanup4 
[PROD-1404] - handle DeprecationWarning for usage_key.course_key for logs cleanup.
 2020-04-15 15:58:48 +05:00
SaadYousaf
db95b28b85 handle DeprecationWarning for usage_key.course_key for logs cleanup. 2020-04-15 15:16:58 +05:00
SaadYousaf
d361634067 fix getargspec() DeprecationWarning for inspect. 2020-04-15 15:15:31 +05:00
SaadYousaf
9160d4aa9b address deprecation warning for cgi.escape for logs cleanup. 2020-04-15 15:14:00 +05:00
SaadYousaf
297a114d6e remove unneccesary log. 2020-04-15 15:12:46 +05:00
Jillian Vogel
ec69eec529 Re-add XForwardedForMiddleware 2020-04-15 11:18:57 +09:30
Michael Roytman
ff87b3aadf add private.in to .gitignore to align with the instructions in requirements/edx/private.readme 2020-04-14 18:47:59 -04:00
Simon Chen
fe1ef21bcd MST-187 return course staff role data for ProgramCourseEnrollment get API 2020-04-14 13:47:12 -04:00
Awais Qureshi
4fa970f962 Merge pull request #23704 from edx/awais786/BOM-1515 
BOM-1515
 2020-04-14 21:31:11 +05:00
Nick
ca3012c07b Merge pull request #23707 from edx/ndalfonso/AA-83-special-exam-icon 
AA-83 special exam icon
 2020-04-14 11:56:35 -04:00
Calen Pennington
c041959a11 Merge pull request #23703 from cpennington/faster-dates-page 
Use the course_blocks api to fetch data for date blocks
 2020-04-14 11:35:13 -04:00
Nicholas D'Alfonso
9e41268322 AA-83 special exam icon 
- fix template rendering so that pencil icon is displayed for
  a special exam and also ensure it is not rendered twice
 2020-04-14 11:08:44 -04:00
Robert Raposa
e56eacebd3 ARCHBOM-1105: fix migration issues (#23708) 
* fix direct assignment error
* fix byte string error

ARCHBOM-1105

Co-authored-by: Awais Qureshi <awais.qureshi@arbisoft.com>
 2020-04-14 10:53:26 -04:00
Awais Qureshi
aefafab449 BOM-1515 
Update passing agrs.
verify the error msgs
 2020-04-14 19:52:02 +05:00
Adam Butterworth
02a7022571 Reenable Learning Sequence MFE redirect tests (#23691) 
* Reenable Learning Sequence MFE redirect tests

TNL-7157 These tests may were the cause of intermittent test failures a couple weeks ago. Here they are reenabled after changing the way ExperimentWaffleFlag is overridden.

* Update is_experiment_on and add ExperimentWaffleFlag override test

* Update test_flags.py

* Add docstring about overrides

* prefer is_experiment_on over _is_enabled
 2020-04-14 10:25:38 -04:00
AsadAzam
96128cba0a Merge pull request #23713 from edx/asad/prod-1394 
Deactivate account 403 error log
 2020-04-14 19:23:33 +05:00
Calen Pennington
9be7341b20 Use the course_blocks api to fetch data for date blocks 2020-04-14 10:08:19 -04:00
Adam Butterworth
d066b43851 prefer is_experiment_on over _is_enabled 2020-04-14 09:33:15 -04:00
asadazam93
ee0bcd36ec Deactivate account 403 error log 2020-04-14 17:44:12 +05:00
Hammad Ahmad Waqas
3c1405369e Merge pull request #23699 from edx/hammad/ENT-2724 
ENT-2724 | removed get_cache_key and using it from edx-django-utils.
 2020-04-14 12:10:01 +05:00
stvn
fb830eea88 Add audit access expiration message to courseware_api 
to display the banner in the Learner MFE.
 2020-04-13 18:01:50 -07:00
Adam Butterworth
b767d29561 Add docstring about overrides 2020-04-13 16:53:01 -04:00
Adam Butterworth
e9e1715bd0 Update test_flags.py 2020-04-13 16:42:18 -04:00
Adam Butterworth
2459382fe3 Update is_experiment_on and add ExperimentWaffleFlag override test 2020-04-13 16:39:46 -04:00
Adam Butterworth
f5f6fc49ba Reenable Learning Sequence MFE redirect tests 
TNL-7157 These tests may were the cause of intermittent test failures a couple weeks ago. Here they are reenabled after changing the way ExperimentWaffleFlag is overridden.
 2020-04-13 14:22:20 -04:00
Zachary Hancock
f0d7ff9025 Write course_staff role on enrollment (#23677) 2020-04-13 14:13:24 -04:00