Commit Graph

22621 Commits

Author SHA1 Message Date
danial
ea53c3922d Fix static urls in pdf_viewer.html to correctly display pdf viewer for course text books 2019-10-31 13:57:59 +05:00
Diana Huang
ec2be49a44 Merge pull request #21185 from eduNEXT/lmm/retirementssiteaware
Making student account deletion components a bit site aware
2019-10-30 14:46:14 -04:00
Syed Muhammad Dawoud Sheraz Ali
778d9ea53a Merge pull request #22185 from edx/revert-22181-dsheraz/PROD-762
Revert "enable video url rewrite flag"
2019-10-30 22:19:50 +05:00
Matt Tuchfarber
f80c16da75 Merge pull request #22169 from edx/tuchfarber/fix_ecommerce_worker_email
Add data migration to fix ecommerce_worker email
2019-10-30 12:39:52 -04:00
Syed Muhammad Dawoud Sheraz Ali
83f567c485 Revert "enable video url rewrite flag" 2019-10-30 21:09:34 +05:00
Calen Pennington
7de48b4351 Fix typo in user_metadata.html (which was being obscured by mako non-strictness) 2019-10-30 10:41:30 -04:00
DawoudSheraz
8c75a3757d enable video url rewrite flag 2019-10-30 12:19:37 +05:00
Matt Hughes
cfbfe35904 Link program enrollments on social auth updates in add. to creation
See
lms/djangoapps/program_enrollments/docs/decisions/0002-matriculation-on-user_social_auth_change.rst
for more details

JIRA:EDUCATOR-4770
2019-10-29 16:19:48 -04:00
Matt Tuchfarber
865114cba6 Add data migration to fix ecommerce_worker email
ecommerce_worker is the only service user with a @fake.email  instead of
an @example.com email address. This was fixed manually in a devstack sql
dump, but was lost during the next sql dump. This will fix it moving
forward so we don't have to work around it.
2019-10-29 14:04:29 -04:00
Ned Batchelder
b245defb11 Merge pull request #22132 from philanthropy-u/saad/fix_visible_blocks_hash_value
Fixed exception in VisibleBlocks.bulk_create due to incorrect argument passed
2019-10-29 11:14:52 -04:00
Manjinder Singh
6f1be3ed2c BOM-933: Fix type mismatches in various migrations 6 (#22170)
* Fix type mismatches in coursewaqre

* Fix type mismatch in credit migrations

* Fix type mismatch in status migrations

* Fix type mismatch in user_api migrations

* Review Fixes
2019-10-29 10:36:10 -04:00
Nimisha Asthagiri
f533134db1 Merge pull request #22086 from edx/arch/user-authn-delete-deprecated
User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION
2019-10-29 09:37:53 -04:00
Nimisha Asthagiri
db42c7e1e2 User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION 2019-10-29 08:57:58 -04:00
Jeremy Bowman
6b16a1b9c1 Fix UnicodeEncodeError in dashboard sharing links (#22174) 2019-10-28 18:41:56 -04:00
Andytr1
122ee29a13 Merge pull request #22158 from edx/andytr1/prod-waffle-flag-for-report
PROD-826 - add waffle flag
2019-10-28 14:03:31 -04:00
Uzair Rasheed
a32786a184 Merge pull request #22111 from edx/PROD-769/add-warning-to-verification-card
Add warning to the bottom of verification status card on dashboard.
2019-10-28 13:25:56 +05:00
atesker
c007499a54 PROD-826 - Add CourseWaffleFlag that restricts the set of ProblemGradeReport enrollees to only verified learners.
cr comments

added unit test

removed debug

style
2019-10-27 15:23:47 -04:00
Luis Moreno
2f22e0189d Mark string as translatable 2019-10-25 19:22:24 -04:00
Luis Moreno
f4ca8bdf48 Addressing feedback 2019-10-25 19:22:24 -04:00
Luis Moreno
d1f96748c5 Do not remove last sentence in StudentAccountDeletion message 2019-10-25 19:22:24 -04:00
Luis Moreno
35bd58a7e4 Use MKTG ROOT LINK instead of LMS_ROOT_URL 2019-10-25 19:22:24 -04:00
jfavellar90
1b5c27eea3 Making student account deletion components a bit site aware 2019-10-25 19:22:24 -04:00
Aarif
4285d265b8 Merge pull request #22128 from edx/BOM-992
changes made to sanitize the urls for consistent comparison - BOM-992
2019-10-25 23:20:25 +05:00
Calen Pennington
47b8dfae75 Merge pull request #22156 from cpennington/expose-course-duration
Expose user course duration in the user metadata
2019-10-25 13:49:14 -04:00
julianajlk
73564a04b0 return course_upgrade_deadline even if dynamic deadline is null (#22150)
REV-943
2019-10-25 13:20:40 -04:00
Calen Pennington
d92dcb28bb Expose user course duration in the user metadata 2019-10-25 10:02:55 -04:00
uzairr
386e05d3b1 Add warning to the bottom of verification status card on dashboard.
Learners are not allowed to make an attempt of the procotored exam if
they verify their identity near to proctored exam date.To make them,
aware about their expiry date, modification are done to the status card
so that user experience will be improved.

PROD-769
2019-10-25 18:09:39 +05:00
aarif
45338f4160 changes made to sanitize the urls for consistent comparison
changes made to finalize the url sanitization to make url comparison consistent

changes made to avoid running sanitize in python 2

changes made to substitute proper query param in url for comparison

changes made to split and compare the query parameter with expected url

updated the split logic to properly split/slice url parts for comparison

updated the dashboard template to remove encode and avoid bytes encoded embeded url

updated the dashboard template to enclose social media urls with unicode
2019-10-25 15:20:32 +05:00
Ayub
8cc509e448 Merge pull request #22107 from edx/BOM-949
BOM-949
2019-10-25 11:01:51 +05:00
Ayub
279ecba2b7 Merge pull request #22144 from edx/BOM-964
BOM-964
2019-10-25 10:57:16 +05:00
Manjinder Singh
80c7f5af01 BOM-933: Fix type mismatches in various migrations 5 (#22147)
* fix type mismatch in third_party_auth migrations

* fix type mismatch in verify_student  migrations

* fix type mismatch in video_config  migrations

* fix type mismatch in verified_track_content  migrations

* fix type mismatch in commercemigrations

* fix type mismatch in xblock_config migrations

* fix type mismatch in course_creators migrations

* fix type mismatch in contentstore migrations
2019-10-24 16:08:04 -04:00
Manjinder Singh
7f3045cf75 BOM-933: Fix type mismatches in various migrations 4 (#22146)
* fix type mismatch in course_goals  migrations

* fix type mismatch in experiments  migrations

* fix type mismatch in xblock_django  migrations

* fix type mismatch in catalog  migrations

* fix type mismatch in static_replace  migrations

* fix type mismatch in bulk_email  migrations

* fix type mismatch in course_overviews migrations
2019-10-24 13:47:51 -04:00
Manjinder Singh
a384e753fd BOM-933: Fix type mismatches in various migrations (#22112)
* Fix type mismatches in the course_modes migrations

* Fix type mismatches in the course_action_state migrations

* Fix type mismatches in the schedules migrations

* Fix type mismatches in grades migrations

* Fix type mismatches in video_pipeline

* Fix type mismatches in api_admin

* Fix mismatches in credential migrations
2019-10-24 11:42:39 -04:00
Ayub khan
78c20156a1 BOM-964
shoppingcart: Explicitly Set fields to unicode to avoid migration
2019-10-24 18:04:16 +05:00
Awais Jibran
dc0a6488d5 Merge pull request #22108 from edx/aj/improve-logging
Improve logging against Problem grade report
2019-10-24 17:39:40 +05:00
Awais Jibran
ac9a7055b5 Improve logging against Probelm grade report 2019-10-24 16:40:41 +05:00
Ayub
23ccda11ab Merge pull request #22103 from edx/BOM-947
BOM-947
2019-10-24 13:21:25 +05:00
Ayub
14cc694518 Merge pull request #22104 from edx/BOM-946
BOM-946
2019-10-24 13:19:18 +05:00
Ayub khan
897bd25b01 BOM-949
student: Explicitly Set fields to unicode to avoid migration
2019-10-24 13:16:57 +05:00
Manjinder Singh
a40f1d9bd6 BOM-933: Fix type mismatches in various migrations 2 (#22115)
* Fix type mismatches in track migrations

* Fix type mismatches in oauth_dispatch

* Fix type mismatches in badges migrations

* fix type mismatch in contentserver migrations

* Fix type mismatches in mobile_api migrations

* fix type mismatch in crawlers migrations

* fix type mismatch in dark_lang migrations

* fix type mismatch in branding  migrations
2019-10-23 13:04:36 -04:00
Saad Waqar
7fca58f88b replaced brl.hash_value with brl in bulk_get_or_create because it calls bulk_create afterwards and bulk_create uses objects to create VisibleBlocks whereas brl.hash_value would return a string 2019-10-23 20:56:08 +05:00
julianajlk
6e0914ad5d add FPD banner to courseware (#22113)
REV-980
2019-10-23 09:33:11 -04:00
Ayub khan
d081b3a86d BOM-947
certificates: Explicitly Set fields to unicode to avoid migration
2019-10-23 15:15:47 +05:00
Ayub khan
584d00dba9 BOM-946
lms_xblock: Explicitly Set fields to unicode to avoid migration
2019-10-23 15:14:23 +05:00
Awais Qureshi
3959bdf1ea BOM-937
Open a file in read binary mode to avoid bytes issues.
2019-10-23 10:44:21 +05:00
Jeremy Bowman
d4b0968e3a Fix JSON parsing in edxnotes.helpers BOM-990 (#22122) 2019-10-22 17:57:01 -04:00
David Ormsbee
5abc18cbe4 Merge pull request #21913 from open-craft/completion-learning-contexts
Change completion API to work with any learning context
2019-10-22 08:39:33 -10:00
Alex Wang
f2b705cc95 Data migration for CourseTeam (#22116)
MST-17

* Data migration: Alter CharField to SlugField for 2 fields in CourseTeam model
2019-10-22 14:30:18 -04:00
Braden MacDonald
5fc73468b3 Change completion API to work with any learning context 2019-10-22 14:04:31 -04:00
Kyle McCormick
7dbee1c3dd Ensure Python 3 compatibility of Teams djangoapp (#22096)
* For all files, from __future__ import unicode_literals.
* Add @python_2_unicode_compatible to both models.
* Test six.string_type(obj) for both models.

Also, fix some new pylint warnings and improve model repr methods.

MST-24
2019-10-22 13:42:27 -04:00