Commit Graph

19868 Commits

Author SHA1 Message Date
Aarif
6ee2089077 fixed warnings for wrong-import-order 2020-04-08 23:43:06 +05:00
Dillon Dumesnil
1bbfe2d583 Shorten Welcome Message fix
We want to ignore certain tags when they show up in the HTML.
This now ignores script tags and link tags (for stylesheets)
2020-04-08 07:46:46 -07:00
zia.fazal@arbisoft.com
cd60f6c973 Map first name to edx username by default oauth SSO
Change to map first name to edx username by default oauth SSO with `identityserver3` backend
ENT-2709

Addressed reviewer's feedback
2020-04-08 19:26:24 +05:00
zia.fazal@arbisoft.com
b37a986656 Added global staff permission to third party auth users API 2020-04-08 14:53:32 +05:00
Michael Terry
76fdad7aae Merge pull request #23632 from edx/mikix/welcome-message
Cut off long course welcome messages
2020-04-07 12:06:37 -04:00
Waheed Ahmed
3dc3e10819 Revert "Adds retry logic for software secure." 2020-04-07 20:40:06 +05:00
Michael Terry
7a71356cd2 Cut off long course welcome messages
If a course welcome message is very long, cut it off with an
ellipsis and show a Show More button to reveal the full thing.

AA-46
2020-04-07 10:49:40 -04:00
Awais Jibran
4b22554411 Merge pull request #23514 from edx/aj/ss-retry-logic
Adds retry logic for software secure.
2020-04-07 10:59:57 +05:00
hunytalk
42503dd736 Add writes to new field 2020-04-06 14:13:20 -04:00
Feanil Patel
6b276e6742 Merge pull request #23633 from edx/feanil/bom-1455-preserve-last-name-limit
Limit the last_name field to 30 chars.
2020-04-06 13:41:28 -04:00
Diana Huang
99863aebff Remove course_id field from CourseMode.
Handle this change appropriately in CourseModeFactory.
2020-04-06 11:21:28 -04:00
Feanil Patel
e4798e49d4 Limit the last_name field to 30 chars.
We don't use this field in edx-platform since we rely on UserProfile
instead.  But we need to do this to prevent accidental incorrect use of
this field.  Django adds a migration between 1.11 and 2.2 to increase
the length of this field that we are opting to skip.  This change
enforces the old limit.
2020-04-06 11:11:35 -04:00
Feanil Patel
5b50a8cd97 Merge pull request #23583 from edx/feanil/test_propert_removal
WIP Remove the course_id property on student.CourseEnrollment.
2020-04-06 10:13:10 -04:00
Zachary Hancock
2cbc248a63 prevent empty string passing proctoring provider validation (#23610) 2020-04-06 09:45:10 -04:00
Feanil Patel
7a52a25132 Fix tests that were creating Enrollments via a course_id.
We now either pass in the relevant courseoverview or when creating the
enrollement we use the factory which automatically creates the relevant
CourseOverview object for testing purposes.
2020-04-06 09:37:36 -04:00
Feanil Patel
3c618ad04d Fixup CourseEnrollmentFactory
Historically, the CourseEnrollment model used to have a `course_id`
field.  A lot of tests still call the factory using that.  Instead of a
`course_id` field this model now has a `course` field which is a foreign
key to the CourseOverview model.

The factory still accepts the course_id but uses it to create the
relevant CourseOverview object where necessary.  This commit fixes two
issues with the factory.

1. If the course id is passed in as`course_id` instead of `course__id`
then, the generated CourseOverview does not have the correct course_id.

2. Even though the CourseEnrollment model no longer needs the
`course_id` parameter, we were still passing it through.  We now remove
it so that it is not passed through to the CourseEnrollment model
instantiation.
2020-04-06 09:37:36 -04:00
Feanil Patel
7c115cca24 Remove the course_id property on student.CourseEnrollment.
It conflicts with an underlying related field on that model which seems
to be getting at the same value from the related table.

Add logging for incorrectly instantiating CourseEnrollment models.
This is to catch any places that might break this that are outside of
edx-platform. Django won't accept `course` values that aren't
course_overviews so we don't need extra logic to test that `course`
values are of the correct type.

fixup! Remove the course_id property on student.CourseEnrollment.
2020-04-06 09:36:35 -04:00
Awais Jibran
4ead215665 Adds retry logic for ss.
1. Created a new celery queue with key `SOFTWARE_SECURE_VERIFICATION_ROUTING_KEY`.
2. Added a celery task with retry logic.
3. sorted imports with isort.
4. Changed deprecated `log.warn` => `log.warning`.
2020-04-06 15:16:56 +05:00
Awais Qureshi
bdba07a1e2 BOM-1491
Group name
Changed in Django 2.2:
The max_length increased from 80 to 150 characters.
2020-04-04 21:48:42 +05:00
Manjinder Singh
b45ac858ab Fixing django 2.1 probs in student management commands (#23587)
* Requiring at least one args in a mutually exclusive group to be set

bulk_change_enrollment requires one of agrs: org or course to be set
for it to function correctly.

* Creating new function to verify initial password hash

Starting with django 2.1, the function is_password_usable no longer checks whether encode
is a valid password created by a django hasher(hasher in  PASSWORD_HASHERS setting)

Adding this function to create constant behavior as we upgrade django versions
2020-04-03 09:55:07 -04:00
Uzair Rasheed
9fbae19057 Merge pull request #23544 from edx/refactor_bulk_unenroll
Refactor bulk unenroll mgmt cmd
2020-04-03 18:53:00 +05:00
edX Transifex Bot
30ebe42df8 geoip2: update maxmind geolite country database 2020-04-03 09:48:45 -04:00
uzairr
4563b87236 Refactor bulk unenroll mgmt cmd
Bulk unenroll command is not supporting unenrolling all the learners
from multiple courses.This PR will enhance this mgmt cmd so that
it can support un-enrollment of learners from multiple courses.

PROD-1347
2020-04-03 17:50:28 +05:00
Nimisha Asthagiri
3a60ef0773 Merge pull request #23588 from edx/arch/django2-student-admin
Django2: student admin views permission fix
2020-04-03 08:38:34 -04:00
Nimisha Asthagiri
9c60bd6386 Django2: student admin views permission fix 2020-04-02 19:26:40 -04:00
edX cache uploader bot
013b32383a Updating Bokchoy testing database cache (#23580) 2020-04-02 11:26:02 -04:00
Jeremy Bowman
5c40a3729a Stop using deprecated assertions (#23579)
Replace some usage of deprecated assertions with non-deprecated equivalents.
2020-04-02 11:06:37 -04:00
Nick
26f0176ddd Merge pull request #23550 from edx/ndalfonso/AA-85-reset-dates-mobile
AA-85 mobile reset dates
2020-04-02 09:53:50 -04:00
Diana Huang
747a0e444b Merge pull request #23572 from edx/diana/new-django2-migration
Add a migration that was generated for Django 2.
2020-04-02 09:11:59 -04:00
edX cache uploader bot
63ab354138 Updating Bokchoy testing database cache (#23577) 2020-04-02 07:18:14 -04:00
Nicholas D'Alfonso
ac9d2bfd30 AA-85 mobile reset dates
- render reset dates banner in webview for mobile app.
- improve banner redirect mechanism
2020-04-02 00:37:54 -04:00
Diana Huang
ea0b7019cf Add a migration that was generated for Django 2. 2020-04-01 16:09:44 -04:00
Diana Huang
e2b82479a1 Merge pull request #23541 from cldme/LEARNER-2041_remove_logout_view_config
LEARNER-2041: Remove deprecated LogoutViewConfiguration from student models
2020-04-01 15:40:00 -04:00
Claudiu Ion
765a6867fd Remove deprecated LogoutViewConfiguration from student models 2020-04-01 18:47:49 +00:00
edX cache uploader bot
c8663fa518 Updating Bokchoy testing database cache (#23538) 2020-04-01 14:15:54 -04:00
Ali Akbar
358b181bdf Merge pull request #23481 from edx/aakbar/demandhint-static-link-fix
add static links re-write for demnadhint tag
2020-03-31 15:04:33 +05:00
Adam Butterworth
d53ab876e2 Fix public view of video xmodule (#23518)
TNL-7092 Properly include video javascripts for the video public view
2020-03-30 11:03:48 -04:00
Aarif
765942d7d2 Updated the template loaders to make them compatible with django 1.11,2.0 and above 2020-03-28 13:27:38 +05:00
Ned Batchelder
136003fcff Merge pull request #23015 from Abstract-Tech/fix/non-admin-error-descriptor
Add xblock.v1 and xmodule.v1 entrypoints for NonStaffErrorDescriptor
2020-03-27 17:43:16 -04:00
Ahtisham Shahid
42ccc5564c Merge pull request #23498 from edx/ahtisham/PROD-1232
Fixed \n escape issue in import-export
2020-03-27 18:39:29 +05:00
edX cache uploader bot
a7494b22fc Updating Bokchoy testing database cache (#23511) 2020-03-27 08:58:58 -04:00
AsadAzam
15f73195e4 Merge pull request #23451 from edx/asad/prod-1369
Fixed comparison mismatch
2020-03-27 14:00:36 +05:00
Ahtisham Shahid
f264e5dd03 fixed \n escape issue in import
updated test

updated test
2020-03-27 12:29:32 +05:00
Nick
f37c860c87 Merge pull request #23448 from edx/ndalfonso/AA-38-calendar-sync-email-template
AA-38 calendar sync email template
2020-03-26 08:51:53 -04:00
asadazam93
fc3e63714e Fixed comparison mismatch 2020-03-26 14:11:31 +05:00
Waheed Ahmed
ccbd353201 Revert "Allow Block Structures Collect to work in Studio" 2020-03-26 13:22:10 +05:00
Nicholas D'Alfonso
52309d5541 AA-38 calendar sync email template
- create templates and methods to build/send calendar sync emails.
2020-03-25 16:40:19 -04:00
edX cache uploader bot
a43edcb026 Updating Bokchoy testing database cache (#23494) 2020-03-25 15:11:34 -04:00
Awais Jibran
3ff96ef6be Merge pull request #23479 from edx/logs-cleanup
Logs cleanup
2020-03-25 19:53:35 +05:00
Awais Jibran
bb4b38b30b Do not log after sending activation email 2020-03-25 11:54:28 +05:00