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

51255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Qureshi
762db8a2df Merge pull request #21624 from edx/awais786/BOM-426 
BOM-426
 2019-09-11 18:59:28 +05:00
Awais Qureshi
d355f83bde Merge pull request #21625 from edx/awais786/BOM-444 
BOM-444
 2019-09-11 18:18:08 +05:00
Awais Qureshi
e4b737cf97 BOM-426 
Fixing python3
 2019-09-11 17:29:46 +05:00
Awais Qureshi
16e3ae71c1 BOM-426 
Fixing python3
 2019-09-11 17:17:00 +05:00
Ayub
82bddf12ab Merge pull request #21578 from edx/BOM-106 
BOM-106
 2019-09-11 16:44:27 +05:00
Aarif
8511c00ad9 Merge pull request #21529 from edx/BOM-131 
BOM-131 Python 3 fixes
 2019-09-11 16:17:18 +05:00
Ayub khan
8f65e6923b BOM-106 
python3 compatibility
 2019-09-11 16:03:58 +05:00
Ayub
9e884ccf0e Merge pull request #21579 from edx/BOM-123 
BOM-123
 2019-09-11 15:37:29 +05:00
Aarif
c3e866cc28 Merge pull request #21577 from edx/BOM-377 
BOM-377
 2019-09-11 15:18:07 +05:00
Ayub khan
26d9866bb2 BOM-123 
Removed broken tests.
 2019-09-11 14:24:59 +05:00
Ayub
bcad9519bc Merge pull request #21528 from edx/BOM-398 
BOM-398
 2019-09-11 12:29:24 +05:00
Syed Muhammad Dawoud Sheraz Ali
2408eadbff Merge pull request #21369 from edx/dsheraz/prod-519 
adding speech output for completion checkmarks
 2019-09-11 10:02:35 +05:00
DawoudSheraz
197d281a1b speech output for completion checkmarks 2019-09-11 09:26:51 +05:00
Kyle McCormick
8d3ea33bb9 Upgrade requirements, specifically ora2==2.3.1 (#21614) 
The 2.3.0 ORA-2 release did not regenerate .min.js
files, so the changes did not appear on Stage or
Production.

EDUCATOR-4635
 2019-09-10 15:50:58 -04:00
Alex Dusenbery
34c1493577 upgrade; bump edx-bulk-grades to 0.6.0 2019-09-10 15:29:49 -04:00
Ben Holt
8bb52f177f REV-935 add api endpoint to decide if mobile should show upsell (#21612) 
Add experimental api endpoint for mobile upsell experiment, more unit tests coming soon
 2019-09-10 14:08:54 -04:00
Awais Qureshi
5ba09930f8 Merge pull request #21602 from edx/awais786/PROD-662 
PROD-662
 2019-09-10 14:00:56 +05:00
Awais Qureshi
4fab1b4490 Merge pull request #21601 from edx/awais786/PROD-670 
PROD-670
 2019-09-10 13:59:35 +05:00
David Ormsbee
f9f07d4b70 Merge pull request #21608 from open-craft/blockstore-runtime-fixes 
Minor fixes for blockstore runtime
 2019-09-09 22:11:09 -04:00
Kyle McCormick
78d563c7ae Upgrade requirements, specifically ora2 
The ora2 upgrade increases the assignment upload
limit from 10MB to 20MB.

Due to a request from a Master's partner who reports
that the current 10MB limit is not enough for their
degree programs.

EDUCATOR-4635
 2019-09-09 20:53:58 -04:00
Kyle McCormick
e09e172f77 Revert "Increase assignment upload limit from 4MB to 20MB (#21589)" 
The reverted commit did not make the intended change.

This reverts commit 7e928ade22.
 2019-09-09 20:53:58 -04:00
Braden MacDonald
48ee155af8 Minor fixes for blockstore runtime 2019-09-09 15:59:29 -07:00
Brittney Exline
3e4e027234 Merge pull request #21607 from edx/bexline/fix_imports 
ENT-2230 Fix import errors by adding __init__.py file
 2019-09-09 14:08:56 -06:00
Brittney Exline
90e5fa90b9 ENT-2230 Fix import errors by adding __init__.py file 2019-09-09 13:35:40 -06:00
Andytr1
e73d7d0b0e Merge pull request #21606 from edx/andytr1/bulk-grades-2019-9-9 
update bulk grades version
 2019-09-09 14:17:29 -04:00
Feanil Patel
6fa25509c9 Merge pull request #21592 from edx/feanil/fix_jenkins_tests 
Feanil/fix jenkins tests in python 3
 2019-09-09 13:43:39 -04:00
atesker
2ef94247b2 update bulk grades version 2019-09-09 13:34:29 -04:00
Kyle McCormick
52be01a577 Document temporary program_enrollments API to edx-enterprise (#21605) 
See https://github.com/edx/edx-platform/pull/21511#pullrequestreview-285556560
for more context.
 2019-09-09 13:12:31 -04:00
edX cache uploader bot
dbc36a3241 Updating Bokchoy testing database cache (#21604) 2019-09-09 12:29:57 -04:00
Feanil Patel
78b488dcf3 Merge pull request #21597 from amitvadhel/BOM-429 
BOM-429 | decoding for CSV response
 2019-09-09 11:39:18 -04:00
Brittney Exline
cc2850500b Merge pull request #21593 from edx/bexline/upgrade_enterprise 
ENT-2230 Upgrade edx-enterprise to 1.9.12
 2019-09-09 09:23:07 -06:00
Feanil Patel
a5b279c702 Merge pull request #21598 from amitvadhel/BOM-447 
BOM-447 | Updates for TypeError in Python 3
 2019-09-09 10:58:41 -04:00
Feanil Patel
002cc9e52d Merge pull request #21600 from amitvadhel/BOM-442 
BOM-442 | Response decoding for RssProxyViewTests
 2019-09-09 10:58:25 -04:00
Feanil Patel
7d93eb85f0 Merge pull request #21596 from amitvadhel/BOM-423 
BOM-423 | Fixes for Python 3 decoding
 2019-09-09 10:56:58 -04:00
Feanil Patel
d01df30aac Remove pytest command tests. 
These tests essentially duplicate the logic for how the pytest commands
are generated and then compare the duplicated logic to the original
logic.  This is pretty brittle and since we're running all the variants
here pretty regularly I think we have other ways of knowing if we caused
the command to break.

I don't think these tests are providing sufficient value to merit their
added complexity.
 2019-09-09 10:52:57 -04:00
Brittney Exline
d35218a820 ENT-2230 Upgrade edx-enterprise to 1.9.12 2019-09-09 08:52:01 -06:00
Awais Qureshi
b8b6dc4883 PROD-662 
Photo verification Fixing python3
 2019-09-08 20:35:52 +05:00
Kyle McCormick
7e928ade22 Increase assignment upload limit from 4MB to 20MB (#21589) 
Due to a request from a Master's partner who reports
that the current 4MB limit is not enough for their
degree programs.

EDUCATOR-4635
 2019-09-08 11:25:24 -04:00
Awais Qureshi
2ca2a39973 PROD-661 
Photo verification Fixing python3
 2019-09-08 19:22:11 +05:00
amitvadhel
a5a0403444 Response decoding for RssProxyViewTests 2019-09-08 13:34:52 +03:00
amitvadhel
77ac61212b Updates for TypeError in Python 3 2019-09-08 13:02:55 +03:00
amitvadhel
b0c28187b6 Fixes decoding for csv response 2019-09-08 11:10:46 +03:00
amitvadhel
9daa1528fa Fixes for Python 3 decoding 2019-09-08 10:33:06 +03:00
Feanil Patel
f2445cfe36 Turn off hash randomization on the xdist workers as well. 2019-09-06 17:04:17 -04:00
Feanil Patel
486e25bd79 Set a default value for PROCTORING_SETTINGS 
The proctoring app assumes that this setting exists and so we get an
attribute error at runtime if it doesn't.  In python 2 this was not an
issue but because of the change in how exceptions are handle for getting
attributes, it's a problem in python 3.

The correct thing to do would be to fix this in the proctoring app so
that it checks for the existence of its value before using it but that's
a longer cycle to make/deploy that change so doing this as a stopgap to
get past it.
 2019-09-06 17:04:17 -04:00
Awais Qureshi
725d7eaa36 Merge pull request #21588 from edx/awais786/BOM-133 
BOM-133
 2019-09-06 23:27:04 +05:00
Feanil Patel
3ec196405c Merge pull request #21582 from edx/feanil/fix_more_test_collection_issues 
Feanil/fix more test collection issues
 2019-09-06 11:01:45 -04:00
Feanil Patel
01650084ab Merge pull request #21585 from edx/feanil/fix_i18n_extract_paver_command 
Fix i18n extract command.
 2019-09-06 10:47:55 -04:00
Awais Qureshi
a57d1fd7da BOM-133 
python3 tests failures.
 2019-09-06 18:22:51 +05:00
Ayub
e27439772d Merge pull request #21551 from edx/BOM-280 
BOM-280
 2019-09-06 15:38:41 +05:00