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

51873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Awais Qureshi
3e217e3a43 Merge pull request #21999 from edx/awais786/BOM-915 
BOM-915
 2019-10-10 20:03:39 +05:00
Feanil Patel
7fba045ce6 Merge branch 'master' into feanil/fix_xmodule_video_tests 2019-10-10 11:00:54 -04:00
Feanil Patel
7dd7f2344b Merge commit 'bbadf48b8e19a0c9f1e1ca750f5ad8b26856bcc1' into feanil/merge_more_of_master 
Sorry for the merge commits but release was in a really bad state and so
we need to get changes out piecemeal on the release-candidate.

Slowly mergig master into RC.
 2019-10-10 10:36:56 -04:00
Awais Qureshi
f07fae6e74 Merge pull request #21989 from edx/awais786/BOM-910 
BOM-910
 2019-10-10 18:39:09 +05:00
Awais Qureshi
750b554637 BOM-915 
Fixing bytes and ordering issue.
 2019-10-10 18:00:12 +05:00
Feanil Patel
d9302ab73b Merge pull request #21982 from edx/feanil/revert_requirements_changes 
Revert requirements changes due to memory issues.
 2019-10-10 08:45:32 -04: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
Zaman Afzal
69920f2781 Merge pull request #21985 from edx/zafzal/bump-edx-enterprise-version 
bump edx enterprise version to 2.0.3
 2019-10-10 16:09:23 +05:00
Awais Qureshi
4387f753d5 BOM-912 
Can't convert 'bytes' object to str implicitly
 2019-10-10 16:06:17 +05: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
Awais Qureshi
19342524d5 Merge pull request #21963 from edx/awais786/BOM-799 
BOM-799
 2019-10-10 12:36:09 +05:00
zamanafzal
b52b4d09ea bump edx enterprise version to 2.0.3 2019-10-10 11:54:38 +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
Ayub
c5a61541ab Merge pull request #21949 from edx/BOM-894 
BOM-894 python3 order mismatch
 2019-10-10 10:22:57 +05:00
jinder1s
eceb53c688 encoding str and opening file in rb mode 2019-10-09 16:48:51 -04:00
Feanil Patel
5d7bdf91b1 Revert requirements changes due to memory issues. 
Some change in the requirements here may be responsible for increased
CPU and memory usage.  This is causing production LMS for edx.org to run
into lots of performance issues.  Reverting for now until we can narrow
it down to which change caused the issue.
 2019-10-09 16:47:26 -04:00
edX Transifex Bot
f8fc93facf geoip2: update maxmind geolite country database 2019-10-09 20:33:21 +00:00
Brittney Exline
6e2887f851 Add enterprise portal links to user dropdown menu and dashboard alerts. (#21833) 2019-10-09 16:01:41 -04:00
Manjinder Singh
e05f244bba Merge pull request #21932 from edx/msingh/python3_mako 
BOM-891: mako template fixes
 2019-10-09 14:03:29 -04: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
Feanil Patel
76c578df36 Fix more transcript related tests to be consistent. 2019-10-09 11:00:23 -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
jinder1s
93dcd26118 quality fixes 2019-10-09 09:30:52 -04:00
Manjinder Singh
5f8e59ccc8 Merge pull request #21901 from edx/msingh/python3_test_lti_stub_py 
BOM-749: Explicity byte strings
 2019-10-09 09:23:04 -04:00
jinder1s
d8b7a2e1fe quality fixes 2019-10-09 08:53:22 -04:00
jinder1s
075faede22 Modifying test to work in both py2 and 3 2019-10-09 08:53:22 -04:00
Manjinder Singh
00348ec0a9 Merge pull request #21898 from edx/msingh/python3_test_views_py 
BOM-749: Explicity creating byte strings
 2019-10-09 08:52:06 -04:00
Manjinder Singh
a315317315 Merge branch 'master' into msingh/python3_test_lti_stub_py 2019-10-09 08:51:15 -04:00
jinder1s
d025657942 review fixes 2019-10-09 08:49:25 -04:00
Waheed Ahmed
1a01a6be3e Merge pull request #21967 from edx/waheed/PROD-744-upgrade-requirements 
Bump up version for xblock-lti-consumer.
 2019-10-09 17:45:38 +05:00
Aarif
442ae6fd29 Merge pull request #21917 from edx/BOM-889 
Updated the expected error message to make it compatible for both python versions - BOM-889
 2019-10-09 16:43:41 +05:00
Waheed Ahmed
6d53ee98c2 Bump up version for xblock-lti-consumer. 
PROD-744
 2019-10-09 16:12:08 +05:00
aarif
91bed37922 Updated the expected error message to get assertion successful for both python versions 
changes made as suggested
 2019-10-09 16:03:50 +05:00
Awais Qureshi
eee826ca4b BOM-814 
String comparsion within in raw html were causing tests failures in python3.
The function parses the string and converts into dictionary.
 2019-10-09 15:43:18 +05:00
Aarif
a383c7fdb8 Merge pull request #21886 from edx/BOM-867 
Updated the API to properly parse Query parameters to make it compatible with python 3 - BOM-867
 2019-10-09 15:41:05 +05:00
Aarif
6a2f3d6dbc Merge pull request #21866 from edx/BOM-831 
Updated the string input to md5 to make output compatible with both python versions - BOM-831
 2019-10-09 15:40:33 +05:00
Ayub khan
298fbdaec2 BOM-894 python3 order mismatch 
Python3 arguments have different positions as compared to python2
 2019-10-09 15:06:27 +05:00