Commit Graph

55377 Commits

Author SHA1 Message Date
HammadAhmadWaqas
11893ad69e refactored imports from edx-django-utils 2020-04-20 12:11:28 +05:00
Alan Evangelista
30495b4580 Fix 'npm install' command execution error handling
'npm install' command execution was changed from paver.easy.sh()
to subprocess.Popen() in commit 0dd13fad1b,
but exception handling was not updated accordingly. Due to this,
errors in 'npm install' execution were not detected.
2020-04-19 19:40:21 -03:00
edX Transifex Bot
e876286364 fix(i18n): update translations 2020-04-19 17:19:13 -04:00
Michael Roytman
bf713570d5 Merge pull request #23720 from edx/mroytman/MST-184-enrollments-linking-course-staff
Realize CourseAccessRoles for a user when an LMS user is linked to th…
2020-04-18 10:42:54 -04:00
Michael Roytman
316e76f7e9 realize CourseAccessRoles for a user when an LMS user is linked to their external_user_key 2020-04-17 18:16:58 -04:00
Kyle McCormick
29932a986e Add APIView for ID verification status (#23760)
For Hackathon XXIV IDv page overhaul.
2020-04-17 17:20:29 -04:00
Samuel Walladge
9f6b3a873f Make more metadata available via the new runtime's generic XBlock API
Without this PR, there is no [reasonable] way to get the following data
for any XBlocks in the new runtime; now there is :)

* index_dictionary: data about the block content, for search indexing
* student_view_data: data-only equivalent of student_view, for use in
  custom UIs/mobile
* children: list of child IDs
* editable_children: list of child IDs in the same bundle (use case:
  when showing an OLX editor you want to allow editing the OLX of
  children in the same bundle but not linked children)
2020-04-17 13:09:59 -07:00
Braden MacDonald
81b9453462 API to get/update a content library's blockstore bundle links
This adds some simple new python+REST APIs that can be used to create,
read, update, and delete "links" from a content library to other content
libraries.

One can use these links to import content (XBlocks) into a library
without copying the content.

Note that this feature was already fully supported by Blockstore and the
XBlock runtime; it's just that to use it prior to this required one to
use the (lower-level) Blockstore REST API directly to create the links.
Now there is a somewhat higher-level API built in to Studio, using
"content library" abstractions instead of Blockstore primitives.
2020-04-17 13:07:12 -07:00
Feanil Patel
791666fb7e Remove redundant settings.
Now that we autoload most keys directly from the yaml file into the
settings context.  We don't need boilerplate of the form:

KEY = ENV_TOKENS.get('KEY', KEY)
KEY = AUTH_TOKENS.get('KEY', KEY)

which tries to get the value of KEY from the config file but if it's not
there it pulls it from the defaults found in common.py
2020-04-17 15:55:12 -04:00
Farhanah Sheets
7feddd3afa Log update 2020-04-17 15:34:10 -04:00
Farhanah Sheets
8f909e0b35 Attempting to add more logging 2020-04-17 15:18:34 -04:00
Nick
03ea899f35 Merge pull request #23758 from edx/ndalfonso/prod-1481-contact-hr
PROD-1841 contact hr
2020-04-17 15:16:02 -04:00
Nicholas D'Alfonso
12eac14aa0 PROD-1841 contact hr
- add horizontal rule to contact us page
2020-04-17 14:41:17 -04:00
Farhanah Sheets
ed25895267 Update wording for clarity and bug fix for API expectations 2020-04-17 13:53:51 -04:00
Manjinder Singh
b7633d0b94 [CR-2057]: Remove email placeholder (#23739)
* Remove email placeholder

The current placeholder is confusing to users and results in many trying
to login with their username. The change in this PR hopefully decreases that
confusion.

According to UX recommendations, we have decided to remove the email placeholder for the form. It seems placeholders tend to just confuse the users.
2020-04-17 13:50:21 -04:00
julianajlk
93ec48a910 add persistent alert banner to Contact Us page 2020-04-17 13:01:58 -04:00
Albert (AJ) St. Aubin
225b0cca46 Merge pull request #23716 from edx/aj/external_id_docs
Add ADR for External ID application
2020-04-17 12:46:58 -04:00
Farhanah Sheets
2cf7380ceb Merge pull request #23754 from edx/revert-23744-fsheets/contact-us-hackathon
Revert "Update wording on Contact Us page"
2020-04-17 11:37:12 -04:00
Farhanah Sheets
ec5a388ebc Revert "Update wording on Contact Us page" 2020-04-17 11:35:02 -04:00
Albert (AJ) St. Aubin
a9fb9071cc Add ADR for External ID application 2020-04-17 11:11:07 -04:00
julianajlk
f5a1f07548 update submit cta 2020-04-17 09:49:30 -04:00
Ahtisham Shahid
3ce73a4166 Merge pull request #23700 from edx/ahtisham/PROD-1295
Fixed reference error in poll task
2020-04-17 18:09:40 +05:00
Tim McCormack
5590879549 Unpin django-model-utils and mysqlclient (#23733)
These were pinned because they drop support for Django<2.2 (or were
planning on it, in the latter case.)

No related changes in computed requirements.
2020-04-17 12:29:35 +00:00
Ahtisham Shahid
cb59896add Fixed xss linter issue
fixed style issue

fixed js test

fixed quality issue

Fixed linter and style

fixed quality issue
2020-04-17 15:57:47 +05:00
adeelehsan
c76482ad81 Merge pull request #23646 from edx/aehsan/prod-1395/verification_enabled_for_software_secure
Verification enabled for the software  secure
2020-04-17 13:07:56 +05:00
adeelehsan
0e3bf36ced Verification enabled for the software secure
PROD-1395
2020-04-17 12:26:12 +05:00
Hasnain Naveed
610ce48f6b Merge pull request #23736 from edx/hasnain-naveed/ENT-2735-logging-message
ENT-2735 | Added more logging for e-commerce calculate endpoint.
2020-04-17 09:58:34 +05:00
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