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

17485 Commits

Author SHA1 Message Date
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
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
Manjinder Singh
e4b30e7bf3 BOM-931: explicitly setting strings to unicode (#22064) 
* explicitly setting strings to unicode
 2019-10-17 15:32:58 -04:00
Calen Pennington
97cc816d0b Pre-select the course overview during dashboard loading 2019-10-17 13:02:02 -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
edX Transifex Bot
e3479587d2 geoip2: update maxmind geolite country database 2019-10-16 17:03:32 -04:00
Aarif
47e1785a89 Merge pull request #21990 from edx/BOM-911 
Added the util to handle bytes input to json.loads function - BOM-911
 2019-10-17 01:24:36 +05:00
Mahyar Damavand
8c55e11d1f Fix code quality test failures 2019-10-16 22:30:31 +03:30
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
Chris Pappas
0e1dba1b24 ENT-1289 | Running make upgrade to bump edx-enterprise (#22047) 2019-10-16 10:18:15 -04:00
edX cache uploader bot
c27643e5ce Updating Bokchoy testing database cache (#22049) 2019-10-16 10:15:41 -04:00
aarif
164141def9 replaced json.loads with a util to handle bytes 
changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

replaced json.loads with a util to handle bytes

changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

made changes as suggested

made changes as suggested

updated the requirements with make upgrade
 2019-10-16 12:14:01 +05: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
edX cache uploader bot
f37de7464c Updating Bokchoy testing database cache (#22044) 2019-10-15 14:29:16 -04:00
Mahyar Damavand
810eea0e51 Fix celery send_activation_email task failure 2019-10-15 18:30:13 +03:30
Bill DeRusha
d9180b472d Merge pull request #22006 from edx/bderusha/remove-mailchimp 
remove mailchimp tracking
 2019-10-15 09:47:08 -04:00
Christie Rice
1d5fcc60bb ENT-1604 Send signal when user is verified via SSO (#21946) 2019-10-15 08:18:54 -04:00
Aarif
6304aa5b9b Merge pull request #22030 from edx/BOM-922 
Fixed - " AttributeError: 'str' object has no attribute 'decode' " - BOM-922
 2019-10-15 16:21:25 +05:00
Shadi Naif
7984c37a4f Convert Account Activation Emails to edx-ACE 2019-10-14 17:22:03 +03:30
aarif
d176957708 Updated the tests to fix the string/bytes input 
changes made to pass tests with python 2 and other minor changes

Updated the tests to fix the string/bytes input

changes made to pass tests with python 2 and other minor changes

made some changes as suggested

made changes as suggested

changes made as suggested
 2019-10-14 18:47:18 +05:00
Ayub
8aa2fad4ec Merge pull request #21988 from edx/BOM-898 
BOM fix remaining capa module issues
 2019-10-14 17:33:27 +05:00
aarif
ea4557ff70 removed unnecesary transcript decode 2019-10-14 17:28:47 +05:00
Ayub
dbc27fd57d Merge pull request #21921 from edx/BOM-805 
BOM-805
 2019-10-14 16:42:26 +05:00
Ayub khan
8717510d35 BOM-805 
python3 compatibility: Before comparison with unicode decode text if its type is bytes.
 2019-10-14 15:15:28 +05:00
Ayub khan
e9c4c22e6a BOM fixed remaining capa module issues 
BOM-898 fix test_responsetypes.py issues
Updated safe_exec to use random2 library instead of random.
As python3 random generates different results as compared to
python2, which causes a lot of test failures and if we use
python3 random and fix tests it will cause state invalidation
of capa problems, So random2 was uses to make the behaviour same
in python3.

BOM-899 name xrange is not defined
xrange is used in safe_exec and there might be old courses where
this is being used in capa problems. All those tests fail in python3
as this was renamed to range. Used six.moves.xrange so that code
works for python3 and if there is any old code using xrange it
works too.
 2019-10-14 13:29:12 +05:00
Ayub
c3735cef01 Merge pull request #21874 from edx/BOM-804 
BOM-804
 2019-10-14 12:30:18 +05:00
Aarif
4bce520f29 Merge pull request #21919 from edx/BOM-819 
Updated the items order in response list comparison to work with both python versions - BOM-819
 2019-10-14 11:32:05 +05:00
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
Awais Qureshi
c446964721 BOM-916 
Fixed double decoding issue.
Fixed the mock.assertMethod. Dict keys were coming different order.
 2019-10-11 18:24:28 +05:00
Ayub khan
44b2414a5d BOM-804 
python3 compatibility
we only need to decode if the xml is bytes
 2019-10-11 13:53:54 +05:00
Ayub
313183f3aa Merge pull request #21986 from edx/BOM-821_BOM-822 
BOM-821_BOM-822 fixed webob issue
 2019-10-11 13:05:59 +05:00
Ayub
e289326172 Merge pull request #21991 from edx/BOM-905 
BOM-905 test_graders.py tests fixed
 2019-10-11 13:02:16 +05:00
Jeremy Bowman
9c92bd96ed Fix assertions failing under Python 3 BOM-668 (#21978) 2019-10-10 15:22:07 -04:00
Feanil Patel
7fba045ce6 Merge branch 'master' into feanil/fix_xmodule_video_tests 2019-10-10 11:00:54 -04:00
Awais Qureshi
f07fae6e74 Merge pull request #21989 from edx/awais786/BOM-910 
BOM-910
 2019-10-10 18:39:09 +05:00
Manjinder Singh
df0f601057 Merge pull request #21981 from edx/msingh/str_no_decode 
py2topy3 conversion: fixing str no decode method errors
 2019-10-10 08:36:30 -04:00
Awais Qureshi
4470a1b487 BOM-910 
There was in issue coming in order of error msg.
fixing bytes issue also.
 2019-10-10 15:01:18 +05:00
Ayub khan
3a760435bc BOM-905 test_graders.py tests fixed 
py3 shows missing argument istead of showing number
 2019-10-10 14:49:27 +05:00
Awais Qureshi
19342524d5 Merge pull request #21963 from edx/awais786/BOM-799 
BOM-799
 2019-10-10 12:36:09 +05:00
Ayub khan
ba0cc9a87f BOM-821_BOM-822 fixed webob issue 
python2 webob request.post object is equal to webob MultiDict(request.post)
but in python3 its not so updated test cases.
 2019-10-10 12:09:19 +05:00
adeel khan
1ef7797c51 Merge pull request #21980 from edx/geoip2-bot-update-country-database2019-10-09 
geoip2: update maxmind geolite country database
 2019-10-10 11:10:13 +05:00
Awais Qureshi
6af113c76f Merge pull request #21966 from edx/awais786/BOM-814 
BOM-814
 2019-10-10 10:51:53 +05:00
jinder1s
eceb53c688 encoding str and opening file in rb mode 2019-10-09 16:48:51 -04:00
edX Transifex Bot
f8fc93facf geoip2: update maxmind geolite country database 2019-10-09 20:33:21 +00:00
Manjinder Singh
b8495dd6b7 Merge pull request #21793 from edx/msingh/test_requirejs_path_overrides_fix 
BOM-614: AssertionError: Lists differ Fix 2 and 3
 2019-10-09 11:34:59 -04:00
jinder1s
feb3e5f0a5 calling assertCountEqual 2019-10-09 10:58:23 -04:00
Feanil Patel
5ef86e2c3c Fix video module tests related to transcript conversion. 2019-10-09 09:51:02 -04:00