Commit Graph

20297 Commits

Author SHA1 Message Date
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
julianajlk
73564a04b0 return course_upgrade_deadline even if dynamic deadline is null (#22150)
REV-943
2019-10-25 13:20:40 -04: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
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
Feanil Patel
9946fd3918 Merge pull request #22099 from edx/revert-22058-julianajlk/REV-980/first-purchase-discount-courseware
Revert "add first purchase discount to courseware (#22058)"
2019-10-22 09:39:08 -04:00
Feanil Patel
aa25b4a365 Merge pull request #22097 from edx/feanil/fix_sandbox_issues
Feanil/fix sandbox issues
2019-10-21 14:08:29 -04:00
julianajlk
98f907f23c Revert "add first purchase discount to courseware (#22058)"
This reverts commit 059b619794.
2019-10-21 13:57:18 -04:00
julianajlk
059b619794 add first purchase discount to courseware (#22058)
REV-980.
* moved get_first_purchase_offer_banner_fragment to Discounts utils.py
* added banner wrapper method
* updated banner with time limit
2019-10-21 13:56:38 -04:00
Feanil Patel
871d62f246 Fix type mismatches in the grades migrations.
Mixing byte and unicode strings causes migrations to fail.
2019-10-21 13:32:46 -04:00
Feanil Patel
215dc84469 Fix type mismatches in the courseware migrations.
Mixing byte and unicode strings causes migrations to fail.
2019-10-21 11:30:11 -04:00
Feanil Patel
ac76eda862 Open the image file as binary. 2019-10-21 10:31:50 -04:00
Ayub khan
b3c062be1b BOM-848 Different Hash Values
hashlib produces different md5 hash in python3 against same values as
compared to python2.
2019-10-21 14:02:49 +05:00
syedimranhassan
814d1bf52d Move lms/cms defaults from configration repo 2019-10-21 11:53:31 +05:00
Ned Batchelder
ea30aba6fc Revert pull request #22042
Revert "Fix code quality test failures"

This reverts commit 8c55e11d1f.

Revert "Fix celery send_activation_email task failure"

This reverts commit 810eea0e51.

Revert "Convert Account Activation Emails to edx-ACE"

This reverts commit 7984c37a4f.
2019-10-18 15:31:09 -04:00
Feanil Patel
05ab349c88 Merge pull request #22068 from edx/feanil/get_out_of_a_pickle
Create a custom Pickle Serializer
2019-10-18 14:48:24 -04:00
Feanil Patel
bfc02dc3ab Create custom pickle serializer.
We need to do this because when I tride to go to the JSON serializer a
bunch of tests started failing because various parts of our code are
putting things into the session that are not JSON serializable.

We can't keep using the default pickle serializer because it defaluts to
using the highest available protocol and that will cause issues with the
python 2 to 3 upgrade since both will be running in production at the
same time.  We need to use a version of the pickle protocol that both
can use interchangably.

We also need to make sure we read with latin1 encoding to make datetimes
work correctly between the two versions of python.
2019-10-18 13:46:47 -04:00
Kyle McCormick
cd3bc236eb Make the team discussion thread private
Develop the capability to allow instructors to designate teams to have private discussions. This way, so non-teammembers cannot view discussion. And the intend is for course teams to manage the team membership as well.
MST-10
2019-10-18 13:06:50 -04:00
Ned Batchelder
855346e9e1 Merge pull request #22042 from mahyard/activation-email-to-ace
Activation email to ace
2019-10-18 12:10:20 -04:00
Feanil Patel
1e97de9105 Use the default json session serializer.
This will force a logout as sessions fail to load but this should be a
more performant and secure serializer moving forward.  The reason we
overwrote it in our config is that it previously used to be the default
and we didn't want things to breake and force logouts when we changed
it.  We're no more okay with people getting logged out.
2019-10-18 10:29:16 -04:00
Alex Wang
77eb01ff42 resolve pylint violations in lms/djangoapps/teams (#22063)
MST-6
2019-10-18 10:20:55 -04:00
syedimranhassan
99bda3cfd3 Revert "Added new variables from configuration repo" 2019-10-18 17:44:58 +05:00
syedimranhassan
6ad9458ffb Added new variables from configuration repo 2019-10-18 15:55:28 +05:00
Ben Holt
523bb0ea5d Add stable_bucketer helper tool (#21783)
Add stable_bucketer helper tool
2019-10-17 21:47:26 -04:00
Ayub
d6c99de909 BOM-418 TypeError: unhashable type: SequenceDescriptorWithMixins (#22051)
DescriptorWithMixins are dynamically created and do not have a hash
class method. Those classes had hash values in python2 but do not
have a default hash in python3. Thus those class objects can not be
used as dict keys. Used location of section/unit instead of real object
for cache dict. Location object is hashable.
2019-10-17 13:23:31 -04:00
Calen Pennington
7ceb0e30fa Mark course outline with graded and scored status in the DOM so that we can run optimizely code on them 2019-10-17 12:14:49 -04:00
Jeremy Bowman
b351e58c25 Fix bulk email i18n tests under Python 3 BOM-927 (#22052) 2019-10-17 10:40:47 -04:00
syedimranhassan
e0eede4002 Move lms defaults from configration repo 2019-10-17 11:54:46 +05:00