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

52045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diana Huang
606b91d66b Merge pull request #22117 from edx/diana/update-node-jenkins 
Update node version used for Jenkins.
 2019-10-22 13:09:15 -04:00
Diana Huang
c4a8dc9eb7 Update node version used for Jenkins. 2019-10-22 12:33:32 -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
Manjinder Singh
936e1d48a3 BOM-928: Fixing test error due to dict ordering (#22055) 
* Fixing test error due to dict ordering

* Dict ordering fixes

* replacing dict with list to maintain consistency

* better html parsing
 2019-10-22 09:30:24 -04:00
irfanuddinahmad
72490fdf90 Merge pull request #22095 from edx/iahmad/ENT-2372-Version-upgrade-for-edx-enterprise 
ENT-2473: Upgraded edx-enterprise version
 2019-10-22 06:52:58 +05: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
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
Diana Huang
f11380f3ac Merge pull request #21974 from edx/diana/bump-nodeenv-version 
Update nodeenv to the latest version.
 2019-10-21 13:23:15 -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
root
74ed203a75 Upgraded edx-enterprise version 2019-10-21 16:15:40 +00: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
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
798dde2156 Fix type mismatches in the course_modes migrations. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 10:56:50 -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
Feanil Patel
ac76eda862 Open the image file as binary. 2019-10-21 10:31:50 -04:00
Feanil Patel
db06acb559 Merge pull request #22089 from edx/jenkins/upgrade-python-requirements-955bf05 
Python Requirements Update
 2019-10-21 10:13:23 -04:00
Diana Huang
a6bf511b43 Update nodeenv to the latest version. 
Also update node-sass to a compatible version.
Include a regenerated package-lock.
 2019-10-21 09:46:52 -04:00
Awais Qureshi
91e5ab93de Merge pull request #22073 from edx/awais786/accept_tests 
Fixing python3 ordering issue in acceptance tests.
 2019-10-21 17:15:53 +05:00
Aarif
75e2df1476 Merge pull request #22074 from edx/BOM-934 
Fix: Bokchoy "TypeError: write() argument must be str, not bytes"
 2019-10-21 17:00:48 +05:00
Aarif
eba7960e45 Merge pull request #22088 from edx/BOM-958 
Updated the social link creation to return social links sorted - BOM-958
 2019-10-21 16:40:51 +05:00
Ayub
f60d93e422 Merge pull request #21954 from edx/BOM-848 
BOM-848 Different Hash Values
 2019-10-21 16:21:52 +05:00
aarif
4e0684a363 updated the social link creation to send back social links sorted 
reverted unnecessary changes

added pylint supression for quality error fix
 2019-10-21 16:10:00 +05:00
edX requirements bot
7c61362177 Updating Python Requirements 2019-10-21 06:48:39 -04:00
aarif
8910a83ffd updated the csv writer for python 3 
re arranged the imports to fix quality errors
 2019-10-21 15:01:17 +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
syedimranhassan
955bf054e0 Merge pull request #22087 from edx/ihassan/OPS-3772_clean_up_rendering_code_new_var 
Move lms/cms defaults from configuration repo
 2019-10-21 13:07:34 +05:00
syedimranhassan
814d1bf52d Move lms/cms defaults from configration repo 2019-10-21 11:53:31 +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
Awais Qureshi
a22bcd5805 BOM-935 
Fixing python3 ordering issue in acceptance tests.
 2019-10-20 01:19:09 +05:00
Awais Qureshi
8882b8c60d Merge pull request #22078 from edx/awais786/BOM-937 
BOM-937
 2019-10-19 10:11:43 +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
3316674bde Merge pull request #22081 from edx/feanil/update_codjail_dependency 
Update codejail.
 2019-10-18 14:28:26 -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
60e3739196 Update codejail. 
Changes are here:
33758da260
 2019-10-18 13:38:58 -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
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
edX requirements bot
d2a971e163 Updating Python Requirements (#22075) 2019-10-18 11:19:34 -04:00