Commit Graph

22144 Commits

Author SHA1 Message Date
Matthew Piatetsky
ff839c364e Merge pull request #26143 from edx/AA-613
[AA-613] Add contains_content_type_gated_content attribute to display items in the Sequence Metadata API.
2021-01-28 12:28:05 -05:00
Matthew Piatetsky
84fb4679c9 Add contains_content_type_gated_content attribute to display items in the Sequence Metadata API. This attribute is used to display the content type gating paywall in frontend-app-learning.
Also, refactor existing timed exam code that checks for content_type_gated_content in a sequence to make it try with the new code
AA-613
2021-01-28 12:00:53 -05:00
Jawayria
f1c786b526 Merge pull request #26174 from edx/lint-amnesty
Applied pylint-amnesty to lms/djangoapps/badges
2021-01-28 17:30:12 +05:00
jawad khan
cb6f348959 LEARNER-8194
LEARNER-8194
Added self paced in mobile api enrolment api
2021-01-28 13:49:05 +05:00
Robert Raposa
6666ac3b85 Merge pull request #26163 from open-craft/raul/tsd-xblock_settings
[TSD] adds annotations for XBLOCK_SETTINGS
2021-01-27 17:36:26 -05:00
Robert Raposa
78c2389aa4 Merge pull request #26167 from jramnai/tsd-default_mobile_available
[TSD] add toggle annotations for DEFAULT_MOBILE_AVAILABLE
2021-01-27 16:47:41 -05:00
Carla Duarte
50572e158d Merge pull request #26179 from edx/ciduarte/start-course
AA-568: fix start course bug
2021-01-27 16:02:54 -05:00
Matt Tuchfarber
606311bd69 Merge pull request #25777 from open-craft/shimulch/bb-3306
[BB-3306] Customizable Certificate Date Format
2021-01-27 16:01:29 -05:00
Carla Duarte
d97b058c5d AA-568: fix start course bug 2021-01-27 15:29:21 -05:00
Alex Dusenbery
aed3d8cbfc Define a ALLOW_ADMIN_ENTERPRISE_COURSE_ENROLLMENT_DELETION feature flag, so that site admins are allowed to delete EnterpriseCourseEnrollment records. 2021-01-27 14:25:53 -05:00
Alexander J Sheehan
ff87c45de8 Merge pull request #26180 from edx/alex-sheehan-edx/gradebook-view-bugfix
Adding collected structure to the course grade read
2021-01-27 09:58:07 -05:00
Manjinder Singh
2723e0e2bd [ARCHBOM-1645] Modifying anonymous_id_for_user() to handly SECRET_KEY rotation (#26162)
These changes were initially made to make it easier to do SECRET_KEY rotations.  Along the way, we found it made sense to refractor the code as well.

Changes made:
- changed get_to_create to create because now the code should only get to this block when a write is necessary
- added a lookup for anonymous_user_id. This is to return an existing anonymous_user_id rather than calculating. This will mitigate the results of SECRET_KEY rotation.
- Added monitoring to help us make better decisions: should we not sue SECRET_KEY, performance considerations...
- put old function behind toggle in case something goes wrong in production with new code
- refractoring function structure for better understanding
2021-01-27 07:23:19 -05:00
Ahtisham Shahid
428402e370 changed instructor dashboard waffle type form course to legacy (#26128)
* changed instructor dashboard waffle type form course to legacy
2021-01-27 13:10:38 +05:00
Jayram
e64e658ae5 add toggle annotations for DEFAULT_MOBILE_AVAILABLE
added required annotations, detailed description and some nit

added extra space for the toggle_description
2021-01-27 09:48:49 +05:30
Alexander Sheehan
12fd104ef2 adding collected structure to the course grade read to prevent attempts to subscript a null object 2021-01-26 16:33:51 -05:00
Christie Rice
b1e5695acf MICROBA-921 Move emit_certificate_event() to utils (#26133) 2021-01-26 14:41:34 -05:00
Raul Gallegos
91ad3db55a improves settings_description for XBLOCK_SETTINGS with reference 2021-01-26 12:21:47 -05:00
Raul Gallegos
e4c47d5478 adds annotations for XBLOCK_SETTINGS 2021-01-26 12:21:47 -05:00
Raul Gallegos
7bae76b093 improves description for XBLOCK_RUNTIME_V2_EPHEMERAL_DATA_CACHE 2021-01-26 12:10:38 -05:00
Raul Gallegos
9d506ca5a6 adds annotations for XBLOCK_RUNTIME_V2_EPHEMERAL_DATA_CACHE 2021-01-26 12:10:38 -05:00
Jawayria
2bd28795ad Applied pylint-amnesty to lms/djangoapps/badges 2021-01-26 21:05:41 +05:00
Awais Jibran
eeed906017 Merge pull request #25994 from edx/aj/bulk-email-provide-logo-from-bkend
Provide logo URL from the backend
2021-01-26 15:02:56 +05:00
Ali Akbar
4537aa6124 Merge pull request #26022 from edx/aakbar/PROD-2218
disable xsslint
2021-01-26 14:31:19 +05:00
Christie Rice
32e0eb2edc MICROBA-921 Standardize imports within the certificates app for consistency (#26131) 2021-01-25 15:29:42 -05:00
Christie Rice
8888f27d29 MICROBA-921 Fix typos (#26132)
* MICROBA-921 fix typos

* Fix quality
2021-01-25 15:05:22 -05:00
Raul Gallegos
b9922325ad adds settings annotations for XBLOCK_FIELD_DATA_WRAPPERS 2021-01-25 12:52:50 -05:00
Michael Roytman
0912b44254 Merge pull request #26147 from edx/mroytman/MST-545-pass-proctoring-improvements-toggle-edx-proctoring
pass value of EXAM_RESUME_PROCTORING_IMPROVEMENTS feature toggle to ed…
2021-01-25 12:21:55 -05:00
Carla Duarte
f03797a882 Merge pull request #26158 from edx/ciduarte/AA-568
AA-568: dates widget styling
2021-01-25 11:15:14 -05:00
Carla Duarte
878f9a3064 AA-568: dates widget styling 2021-01-25 10:51:20 -05:00
Bianca Severino
c95dc59356 Add function to InstructorService to retrieve proctoring_escalation_email 2021-01-25 10:05:27 -05:00
Michael Roytman
71cc2e18e5 pass value of EXAM_RESUME_PROCTORING_IMPROVEMENTS feature toggle to edx-proctoring Javascript via the student-proctored-exam-container div 2021-01-25 09:59:44 -05:00
Régis Behmo
f140cc0f15 Enable annotation linting with edx-lint
We upgrade edx-lint to use the latest feature toggle and annotation custom
linter. Note that we do not yet make use of code annotation linting, typically
run with `code_annotations --lint ...`.

Note that we also fix new linting errors detected by the new checkers.
2021-01-25 10:31:24 +01:00
Waheed Ahmed
fc8f189084 Update Facebook color.
Updated Facebook SSO button color acccording to their brand
guidelines.

VAN-296
2021-01-22 17:59:58 +05:00
Saad Yousaf
b5ef613707 Logo text for edge (#26100)
* Logo text for edge

* Refactored code

Co-authored-by: Asad <asadazam93@gmail.com>
2021-01-22 15:45:14 +05:00
Kyle McCormick
44d5060c60 Add setting for error'ing on deprecated imports
Deprecated edx-platform import paths
(for example, `student` instead of
`common.djangoapps.student`) currently raise
warnings when used. We want to fully remove
support for those paths.

As an easily reversible way to initially remove
support, we add a new setting to LMS and Studio
called `ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS`,
defaulting to False. We set it to True for devstack
and will set it to True in Stage and Production
soon. If critical errors occur, we can easily
flip the setting back to False.
2021-01-21 10:49:47 -05:00
Kyle McCormick
9d317c5c52 Fix patch of deprecated course_modes import path
The correct path is `common.djangoapps.course_modes...`
2021-01-21 10:49:47 -05:00
Kshitij Sobti
6769a280a9 Added a new LTI-based course tab, and LtiDiscussion tab
This PR lays the groundwork for a an LTI tab that can embed any LTI1.1-based
tool as an course tab. It also adds another tab based on this LTI Tab that
offers special support for embedding LTI-based discussion tools in a course
tab. If enabled this will replace the existing discussion tab.
2021-01-20 16:24:55 +05:30
Diana Huang
ea8907ca53 Add edx_sga to our code_owners mappings. 2021-01-19 11:23:08 -05:00
Saad Yousaf
93f4ceeee7 Revert "[TNL-7361] - Restrict Instructor Tab from masquerading user with student role." 2021-01-19 20:01:03 +05:00
Syed Muhammad Dawoud Sheraz Ali
985229fb7a add last_login user and staff only field in user_api (#26087)
* add last_login user and staff only field in user_api
2021-01-18 19:36:01 +05:00
Ned Batchelder
e6c7b6fd60 Merge pull request #26080 from open-craft/0x29a/fix_add_post
Fix Markdown errors on discussions tab
2021-01-15 11:45:46 -05:00
Ned Batchelder
15ce0a3fde Merge pull request #25020 from jramnai/registration-api
[ADD]  /user_api endpoints in api-docs
2021-01-15 11:18:05 -05:00
0x29a
c8fc932c45 Preserve js files order for discussions view
Co-authored-by: Shimul Chowdhury <shimul@opencraft.com>
2021-01-15 15:15:08 +01:00
Saad Yousaf
e01c07775c Merge pull request #26052 from edx/saad/TNL-7361
[TNL-7361] - Restrict Instructor Tab from masquerading user with student role.
2021-01-15 13:13:50 +05:00
Jayram
5a9e12dd96 [ADD] user account registration endpoint for api-docs
Added alias for /user_api endpoints

FIX quality violations

IMPROVED urls_common for readability

Removed redundant URL entry from urls_common file
2021-01-15 03:59:16 +00:00
Bianca Severino
2a7fe2a385 Merge pull request #26062 from edx/bseverino/enrollment-api
[MST-570] Create runtime api to return active enrollments by course
2021-01-14 09:56:29 -05:00
Calen Pennington
197c6d11ee Merge pull request #26043 from cpennington/user-profile-segment-identify
Call segment.identify with any changed values when user profile field…
2021-01-14 08:54:21 -05:00
Zach Hancock
3a738e6c02 Create runtime api to return active enrollments by course
Co-authored-by: Bianca Severino <biancasev@gmail.com>
2021-01-13 16:45:40 -05:00
Calen Pennington
0294f28818 Tag some known instances of sailthru specific code that can be removed as part of AA-607 2021-01-13 15:58:55 -05:00
Nizar Mahmoud
a44091e7ec Adds grade cutoffs to gradebook grading information 2021-01-13 14:10:19 -05:00