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

53520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Terry
151e1d563b Merge pull request #22079 from edx/mikix/show-display-name 
Show Display Name advanced field again
 2019-10-18 11:14:27 -04:00
Awais Qureshi
0c6c3a6f47 BOM-937 
Open a file in read binary mode to avoid bytes issues.
 2019-10-18 20:02:57 +05: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
Michael Terry
8e832a3c6a Show Display Name advanced field again 
We had hidden it when using Publisher. But there are valid use
cases for editing it, so we're adding it back again.

DISCO-1390
 2019-10-18 10:40:49 -04:00
Awais Qureshi
544959026a BOM-937 
Open a file in read binary mode to avoid bytes issues.
 2019-10-18 19:40:33 +05: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
Jeremy Bowman
df38babb7e Archive bok-choy JUnit XML files (#22071) 2019-10-18 10:18:42 -04:00
syedimranhassan
69d0726366 Merge pull request #22077 from edx/revert-22076-ihassan/OPS-3772_clean_up_rendering_code_new_vars 
Revert "Added new variables from configuration repo"
 2019-10-18 17:45:54 +05:00
syedimranhassan
99bda3cfd3 Revert "Added new variables from configuration repo" 2019-10-18 17:44:58 +05:00
syedimranhassan
07a2d5e6ca Merge pull request #22076 from edx/ihassan/OPS-3772_clean_up_rendering_code_new_vars 
Added new variables from configuration repo
 2019-10-18 16:23:25 +05:00
syedimranhassan
6ad9458ffb Added new variables from configuration repo 2019-10-18 15:55:28 +05:00
muhammad-ammar
fc2915b02f allow user to edit fullname if no social auth record 
ENT-1964
 2019-10-18 15:30:51 +05:00
Ben Holt
523bb0ea5d Add stable_bucketer helper tool (#21783) 
Add stable_bucketer helper tool
 2019-10-17 21:47:26 -04:00
Manjinder Singh
e4b30e7bf3 BOM-931: explicitly setting strings to unicode (#22064) 
* explicitly setting strings to unicode
 2019-10-17 15:32:58 -04:00
Adam Blackwell
ab0ee301cc Merge pull request #22065 from edx/adzuci/ownership-theme-changes 
Minor changes to CODEOWNERS file.
 2019-10-17 14:27:13 -04: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
Calen Pennington
2da9a00d58 Merge pull request #22066 from cpennington/select-related-course-overviews 
Pre-select the course overview during dashboard loading
 2019-10-17 13:31:20 -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
97cc816d0b Pre-select the course overview during dashboard loading 2019-10-17 13:02:02 -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
229a2e3968 Merge pull request #22043 from cpennington/graded-markers-course-outline 
Add graded and scored markers to the course outline
 2019-10-17 12:47:32 -04:00
Adam Blackwell
7758df4e25 OWNERS file formatting changes. 2019-10-17 12:23:41 -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
e258fab1ea Fix YouTube stub under Python 3 BOM-930 (#22056) 2019-10-17 10:43:04 -04:00
Jeremy Bowman
b351e58c25 Fix bulk email i18n tests under Python 3 BOM-927 (#22052) 2019-10-17 10:40:47 -04:00