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

1444 Commits

Author SHA1 Message Date
aarif
07b5c954b0 python 3 fixes 
test fixes

python 3 fixes

minor fixes

python 3 fixes

quality fixes

quality fixes
 2019-09-24 12:01:02 +05:00
Ayub khan
6f1d379a0f BOM-376 
python3 compatibility fixes all tests
 2019-09-20 16:01:06 +05:00
Nicholas D'Alfonso
039b7aed29 DISCO-1342 hide fields 
hide course card image, course about page image, and course
display name when publisher flag is turned on
 2019-09-19 11:56:00 -04:00
Michael Terry
1f024c406b Add Studio note about mktg site delay 
Add a note when marketing site is enabled that there is a delay
from changes in Studio appearing on the marketing site.

DISCO-1356
 2019-09-18 16:31:36 -04:00
Michael Terry
d16bf75777 Merge pull request #21689 from edx/mikix/show-upgrade-deadline 
Show Upgrade Deadline in Studio
 2019-09-17 15:31:51 -04:00
Michael Terry
578a910260 Show Upgrade Deadline in Studio 
This shows the verified upgrade deadline for the course, as a
read-only field.

DISCO-1345
 2019-09-17 14:58:19 -04:00
aarif
cde8a2a62a python 3 fixes 
changes made as suggested

minor change

changes made as suggested

test fixes for python 2

removed debug statement

quality fixes

quality fix

quality fix
 2019-09-16 13:13:45 +05:00
aarif
9301ec38f3 python 3 fixes 2019-09-12 17:29:34 +05:00
Aarif
c3e866cc28 Merge pull request #21577 from edx/BOM-377 
BOM-377
 2019-09-11 15:18:07 +05:00
Ayub
bcad9519bc Merge pull request #21528 from edx/BOM-398 
BOM-398
 2019-09-11 12:29:24 +05:00
Awais Qureshi
b8b6dc4883 PROD-662 
Photo verification Fixing python3
 2019-09-08 20:35:52 +05:00
aarif
e7a9e4cf1f python 3 fixes 2019-09-05 17:19:41 +05:00
Awais Qureshi
18cf37093d Merge pull request #21553 from edx/awais786/BOM-364 
BOM-364
 2019-09-05 09:47:12 +05:00
Michael Terry
b229e9749b Merge pull request #21516 from edx/mikix/enable-publisher 
Use new ENABLE_PUBLISHER feature flag
 2019-09-04 13:28:59 -04:00
Michael Terry
8bbc717637 Use new ENABLE_PUBLISHER feature flag 
ENABLE_MKTG_SITE has been serving double duty to both indicate that
an Open edX installation is using a Drupal marketing site AND
is using the Publisher workflow tool for managing course metadata.

But now that publisher-frontend is available and the Publisher
feature is no longer tied to the marketing site, we want to tease
apart those two concerns. Hence ENABLE_PUBLISHER.

Only really used so far in Studio, to control which fields are
shown (if using Publisher, some fields are only editable in
Publisher).
 2019-09-04 12:18:03 -04:00
Awais Qureshi
6b50e12b0e BOM-364 
python3 tests failures.
 2019-09-04 17:51:26 +05:00
Ayub
667b7cf2ca Merge pull request #21459 from edx/BOM-357 
BOM-357
 2019-09-04 11:22:22 +05:00
Ayub
3a5e58e6a8 Merge pull request #21535 from edx/BOM-361 
BOM-361
 2019-09-04 11:08:52 +05:00
Brian Mesick
75e38fc4fd DEPR-18 Remove deprecated Notes LMS djangoapp (#21008) 2019-09-03 16:49:58 -04:00
Ayub
ce27fb5c33 Merge pull request #21486 from edx/BOM-371 
BOM-371
 2019-09-03 16:50:13 +05:00
Ayub khan
506736b03e BOM-361 
py3 unittest fix
 2019-09-03 16:44:49 +05:00
Ayub khan
6b884c98b6 BOM-370 
py3 unittest fix
 2019-09-03 16:06:48 +05:00
Ayub khan
0dc180ddc3 BOM-398 
py3 combatibility - test fix
 2019-09-03 13:45:15 +05:00
Ayub khan
da9c71557b -Remove unicode and use six.text_type 2019-09-02 16:14:02 +05:00
arbisoft
bcf1e781e2 BOM-349 
Fixing python3
 2019-08-29 23:26:41 +05:00
Ayub khan
588243f959 BOM-371 
py3 test fix
 2019-08-28 16:32:39 +05:00
Ayub khan
136bdf8c0f BOM-357 
Fix failing test
 2019-08-27 15:50:05 +05:00
Awais Qureshi
eddcf50260 Merge pull request #21432 from edx/awais786/BOM-356 
BOM-356
 2019-08-27 14:08:00 +05:00
Awais Qureshi
5dc63a9aab Merge pull request #21405 from edx/awais786/BOM-399 
BOM-399
 2019-08-26 11:03:07 +05:00
arbisoft
bf6cbe7f6b BOM-356 
None type comparison with int was not working in python3.
There was an issue with previous condition also. with Nonetype it was not coming into error part.
 2019-08-24 02:47:24 +05:00
Awais Qureshi
766d9fb649 Merge pull request #21408 from edx/awais786/BOM-388 
BOM-388
 2019-08-22 20:42:03 +05:00
arbisoft
04536e5c5f BOM-388 
Fixing list len issue.
 2019-08-22 16:22:58 +05:00
arbisoft
e140d4aa93 BOM-396 
Fixing encode/decode issues for python3.
 2019-08-22 15:43:23 +05:00
arbisoft
933a55d92e BOM-399 
Fixing encode/decode issues for python3.
 2019-08-22 15:35:01 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm 
Bom/python 3 swarm
 2019-08-21 09:27:59 -04:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Feanil Patel
3c33f6c30f Fix another quality issue. 2019-08-21 07:44:06 -04:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
3bb7d0f61a unicode -> text_type 2019-08-19 16:42:20 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
Feanil Patel
68933ec089 Fix quality issues. 2019-08-19 11:51:30 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Feanil Patel
602970ed90 Fix test collection for CMS in python 3. (#21338) 2019-08-13 13:54:49 -04:00
arbisoft
9b87cb0172 BOM-85 
he builtin basestring abstract type was removed. Use str instead.
 2019-08-09 22:08:57 +05:00
aarif
61800c619f replaced StringIO imports with import from six 
replaced cStringIO and StringIO imports with import from six

fixed StringIO imports

fixed StringIO imports

fixed XSS python-wrap warning
 2019-08-08 00:09:16 +05:00
Feanil Patel
18e988b747 Fix some minor issues that prevent some tests from being collected. 2019-08-06 15:19:55 -04:00
Feanil Patel
21fd145ab9 Use relative import for content store reference. 
The full import path was having issues in python 3 complaining that it
couldn't find the module.
 2019-08-06 14:56:57 -04:00
David Ormsbee
b3614f3a00 Merge pull request #20954 from open-craft/symbolist/html-block 
HtmlModule to HtmlBlock [SE-1089]
 2019-08-01 11:36:23 -04:00