Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,082 Commits 1 Branch 0 Tags
c30865cce663e09d26aaa398ad16e45f72f47475
Commit Graph

4004 Commits

Author SHA1 Message Date
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
7554eb1afd Merge pull request #22110 from edx/BOM-951 
BOM-951
 2019-10-24 12:54:34 +05:00
adeelehsan
bf10345e3a Merge pull request #22127 from edx/aehsan/prod-734/added_logs 
Added logs to investigate the issue
 2019-10-24 00:42:36 +05:00
adeelehsan
16d637c63f Added logs to investigate the issue 2019-10-24 00:06:32 +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
49032ba88e BOM-951 
waffle_utils: Explicitly Set fields to unicode to avoid migration
 2019-10-23 15:11:34 +05:00
Zia Fazal
7ccd2a6901 Refactored enterprise unlink code to fix ENT-1890 
Refactored enterprise unlink code to fix ENT-1890

Fixed quality violations and brokent test

Fixed pylint quality violations

Fixed failing unit test

Fixed broken test after rebasing with master
 2019-10-23 11:35:58 +05:00
Hassan
29828d781c Merge pull request #21969 from edx/hassan/backfill-history 
Added management command to populate history from snapshot data.
 2019-10-23 02:13:10 +05:00
Robert Raposa
8c9d63ef6c Fix typo in comment (#22121) 2019-10-22 17:04:42 -04:00
Hassan Javeed
edb732d83a Added management command to populate history as of 06/29. 2019-10-23 01:43:13 +05:00
Braden MacDonald
5fc73468b3 Change completion API to work with any learning context 2019-10-22 14:04:31 -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
Calen Pennington
b3421c8580 Merge pull request #22084 from cpennington/expose-access-denial-reasons 
Expose access denial reasons inside verticals to the front-end on the…
 2019-10-21 15:44:37 -04:00
adeelehsan
3b528f445c Merge pull request #21950 from edx/aehsan/prod-735/logged_improverd_cache_miss_hit 
Logged improved for cache
 2019-10-21 23:50:37 +05: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
Calen Pennington
4e6e283495 Expose access denial reasons inside verticals to the front-end on the course outline 2019-10-21 12:41:36 -04:00
Feanil Patel
13a73fd776 Fix type mismatches in the django_comment_common migrations. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 11:40:54 -04:00
Feanil Patel
6584f81198 Fix type mismatches in the course_groups migration. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 10:54:31 -04:00
Feanil Patel
3d51bc7be3 Fix type mismatches in the bookmarks migration. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 10:53:59 -04:00
adeelehsan
c2600c44f2 Logged improved for cache 
prod-735
 2019-10-21 19:36:10 +05: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
Muhammad Ammar
19fd375dc9 Merge pull request #22012 from edx/ammar/ent-1964-allow-user-to-edit-fullname-if-no-social-auth-record 
allow user to edit fullname if no social auth record exists
 2019-10-21 11:35:26 +05:00
Ned Batchelder
f5a79a7f36 Merge pull request #22082 from edx/nedbat/revert-22042 
Revert pull request #22042
 2019-10-18 20:06:09 -04:00
Matthew Piatetsky
9b6b3e85cf Merge pull request #22070 from edx/REV-736 
[REV-736] disable discount when upgrade deadline has passed
 2019-10-18 16:52:18 -04:00
Matthew Piatetsky
ec8f9f8f86 disable discount when upgrade deadline has passed 2019-10-18 16:15:14 -04: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
Feanil Patel
1b1d428630 Merge pull request #22069 from edx/feanil/lock_cache_pickles 
Set cache pickle protocol to 2.
 2019-10-18 13:41:35 -04:00
Feanil Patel
59b0554c37 Update encoding to be latin1 when loading pickled data to be able to read python 2 datettimes. 2019-10-18 13:04:19 -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
29cc071edd Set cache pickle protocol to 2. 
HIGHEST_PROTOCOL will cause it to change when we move from python 2 to 3
and this may cause issues as older machines try to read objects pickeld
with a version of the protocol they don't know.

During deploys, and if we have to roll back are two examples.
 2019-10-18 10:43:04 -04:00
muhammad-ammar
fc2915b02f allow user to edit fullname if no social auth record 
ENT-1964
 2019-10-18 15:30:51 +05:00
Emma Green
bb14195685 Merge pull request #22067 from edx/move-anon-user-check-earlier 
move the anonymous check earlier so that it cannot error out when it …
 2019-10-17 13:35:23 -04:00
Emma Green
def6bced98 move the anonymous check earlier so that it cannot error out when it expects a non-anonymous user 2019-10-17 12:54:36 -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
Matthew Piatetsky
7436f9c186 Merge pull request #21915 from edx/REV-733 
[REV-733] check if discount expired
 2019-10-16 12:03:58 -04:00
Matthew Piatetsky
f6d0bf77df check if discount expired 2019-10-16 11:32:27 -04:00
Aarif
6e7f2f61ef Merge pull request #21994 from edx/BOM-914 
Fixed all instances of "TypeError: a bytes-like object is required, not 'str" - BOM-914
 2019-10-16 01:44:31 +05:00
Ned Batchelder
69255bee73 Merge pull request #21816 from regisb/regisb/simplify-swagger-auto-schema 
Regisb/simplify swagger auto schema
 2019-10-15 14:35:46 -04:00
Zia Fazal
ebe29d9303 Merge pull request #21943 from edx/ziafazal/ENT-1688 
ENT-1688: Changed logout message on on logout screen for Enterprise SSO flow
 2019-10-15 18:53:34 +05:00
Bill DeRusha
d9180b472d Merge pull request #22006 from edx/bderusha/remove-mailchimp 
remove mailchimp tracking
 2019-10-15 09:47:08 -04:00
Zia Fazal
c718c02d6e Show blank screen instead of logout message for Enterprise SSO flow 
Changes to show blank screen instead of logout message for Enterprise SSO flow. It confuses learner when they are already signed in and access their course from B2B site.
ENT-1688

Fixed pep8 quality violation

use testserver as HOST instead of edx.org

assert enterprise app is enabled

added logging

Print different values

Reload django url config

assert all quote operations to see how they work on jenkins

debug url resolved values

login user in setup

added log to debug test on jenkins

Using UrlResetMixin

Using regex instead of resolve

Fixed quality violation

Fixed pylint quality violations

Fixed target interpolation syntax

Added developer's comment
 2019-10-15 18:28:19 +05:00
Zia Fazal
0358587320 Merge pull request #22039 from edx/ziafazal/ENT-2384 
ENT-2384: Invoke learner transmission task only for enterprise learners
 2019-10-15 16:42:13 +05:00
Zia Fazal
3b69a4f279 Invoke learner transmission task only for enterprise learners 
Invoke learner transmission task only for enterprise learners
ENT-2384

added docstring

Fixed brokent unit test
 2019-10-15 15:58:37 +05:00
Ayub
f08a7e7268 Merge pull request #22032 from edx/BOM-xblock-recommender-tests-fix 
BOM Project Xblock Recommber integration tests fix
 2019-10-15 13:03:40 +05:00
Awais Qureshi
f7adc71c44 BOM-924 
Fixing TypeError, the JSON object must be str, not 'bytes'.
 2019-10-15 12:11:24 +05:00