Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
51,918 Commits 1 Branch 0 Tags
149f47ff49c56dea736f4f794a3bc0ce19b1cb2f
Commit Graph

51918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Qureshi
149f47ff49 Merge pull request #22038 from edx/awais786/BOM-925 
BOM-925
 2019-10-15 13:58:59 +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
f679768f9e BOM-925 
Fixing TypeError, the JSON object must be str, not 'bytes'.
 2019-10-15 12:57:49 +05:00
Awais Qureshi
ce18f581c7 Merge pull request #22034 from edx/awais786/BOM-924 
BOM-924
 2019-10-15 12:39:42 +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
Ayub khan
f0133d861d BOM Project Xblock Recommber integration tests fix 
Python3 json can not work with bytes type input so used simplejson
instead of python json which works with both bytes and unicode
type input.
Previously we mistakenly updated StringIO to six.String io. which
caused the tests failure. Used io.BytesIO to fix the issues as
assci character bytes can not be converted to unicode.
 2019-10-14 18:20:42 +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
d600a5a087 Merge pull request #21910 from edx/BOM-837 
Removed encode method to fix input to csv write method - BOM-837
 2019-10-14 16:54:18 +05:00
Ayub
dbc27fd57d Merge pull request #21921 from edx/BOM-805 
BOM-805
 2019-10-14 16:42:26 +05:00
aarif
6c98571bbd removed unnecessary encode method to fix input to csv write method 
removed unnecessary encode method to fix input to csv write method
 2019-10-14 16:17:11 +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
edX Transifex Bot
c7cb995797 fix(i18n): update translations 2019-10-13 17:22:52 -04:00
Awais Qureshi
14e8e782c9 Merge pull request #22013 from edx/awais786/BOM-917 
BOM-917
 2019-10-12 13:12:12 +05:00
Awais Qureshi
b254df3c52 Merge pull request #22011 from edx/awais786/BOM-916 
BOM-916
 2019-10-12 13:10:20 +05:00
Jeremy Bowman
3db3403fc4 Fix mock transcript responses BOM-918 (#22020) 2019-10-11 16:22:52 -04:00
Nick
b4d36383e5 Merge pull request #22021 from edx/Remove-backtick-typo 
Remove backtick typo in advanced_entry.underscore
 2019-10-11 16:11:09 -04:00
Jeremy Bowman
b939791fe0 Fix problematic mock in instructor_task tests BOM-403 (#22007) 2019-10-11 15:44:42 -04:00
Nick
d1ebd1294b Remove backtick typo in advanced_entry.underscore 2019-10-11 15:25:33 -04:00
Feanil Patel
55c0151cc8 Merge pull request #22019 from edx/feanil/fix_perf_pins 
Feanil/fix perf pins
 2019-10-11 14:59:48 -04:00
Feanil Patel
1098c106e3 Run make upgrade. 2019-10-11 14:18:31 -04:00
Feanil Patel
695ed0cb29 Pin just edx-drf-extensions. 
We also pin back edx-lint to fix a regression we introduced when we
started having to roll back all the requirements changes.
 2019-10-11 14:08:36 -04:00
Nick
190b175955 Merge pull request #21971 from edx/ndalfonso/DISCO-1388-publisher-link 
DISCO-188 publisher link
 2019-10-11 13:18:07 -04:00
Calen Pennington
501cd6795b Merge pull request #22001 from cpennington/no-discount-for-anonymous-users 
Don't try to show anonymous users the first-purchase discount
 2019-10-11 12:44:42 -04:00
Douglas Hall
bf3d337312 Fix dismissal of enterprise learner portal banner. (#22015) 2019-10-11 11:49:09 -04:00
Awais Qureshi
ae9dcdef8a BOM-917 
Fix encoding issue.
 2019-10-11 20:12:34 +05:00
Nicholas D'Alfonso
545d5eddc8 DISCO-188 publisher link 
Add publisher link to settings dropdown if the features setting
is set.
 2019-10-11 09:29:24 -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
AsadAzam
b8a19b7b92 Merge pull request #21809 from edx/asad/prod-694 
Upgrade python 3 decode error
 2019-10-11 17:22:29 +05:00
Waheed Ahmed
ab49dfa324 Merge pull request #22008 from edx/waheed/PROD-816-remove-youtube-logo 
Remove YouTube logo from footer.
 2019-10-11 15:28:02 +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
Ayub
732dfce14d Merge pull request #21996 from edx/BOM-test-fix-test_download_srt_exist 
BOM test_download_srt_exist test fix
 2019-10-11 13:01:47 +05:00
Waheed Ahmed
637e1d0bee Remove YouTube logo from footer. 
Current YouTube logo is not compliant with YouTube's branding
guidelines.

PROD-816
 2019-10-11 12:44:54 +05:00
Douglas Hall
c9aa258495 Do not display enterprise learner portal banner if no enterprise learner portals exist for user. (#22005) 2019-10-10 19:02:15 -04:00
Jeremy Bowman
9c92bd96ed Fix assertions failing under Python 3 BOM-668 (#21978) 2019-10-10 15:22:07 -04:00
Ned Batchelder
d8d91f4e68 Merge pull request #21945 from edx/nedbat/update-contributing 
Bring this file into the 21st century
 2019-10-10 15:11:09 -04:00
Feanil Patel
54b00573bd Merge pull request #22002 from edx/release-mergeback-to-master 
Merge release back to master
 2019-10-10 14:28:07 -04:00
Feanil Patel
b6638d21ca Update everything but the constrained packages. 2019-10-10 14:02:37 -04:00
Andytr1
f4738c4b82 Merge pull request #21958 from edx/andytr1/get-override-history-by-grade-id 
EDUCATOR-4700 - pull grade overrides by grade_id
 2019-10-10 13:42:29 -04:00
Awais Qureshi
e44f238611 Merge pull request #21995 from edx/awais786/BOM-913 
BOM-913
 2019-10-10 22:38:55 +05:00
Feanil Patel
2cd474c72d Merge pull request #21970 from edx/feanil/fix_xmodule_video_tests 
Fix video module tests related to transcript conversion.
 2019-10-10 13:32:44 -04:00
Feanil Patel
ef96137ca0 Merge branch 'master' into release-mergeback-to-master 2019-10-10 13:30:33 -04:00
atesker
4aff507847 EDUCATOR-4700 - pull grade overrides by grade_id 
pep8

udate filter on simple history

convert to list

diable no member error
 2019-10-10 12:13:07 -04:00
Feanil Patel
076908b38d Merge pull request #22000 from edx/feanil/merge_more_of_master 
Feanil/merge more of master
 2019-10-10 11:38:02 -04:00
Awais Qureshi
b098ba633c Merge pull request #21993 from edx/awais786/BOM-912 
BOM-912
 2019-10-10 20:25:24 +05:00
Awais Qureshi
91e7d8a7be BOM-913 
reduce functions moves into functools in python3. Fixed the import.
Fixing bytes issue.
 2019-10-10 20:06:08 +05:00