Commit Graph

51562 Commits

Author SHA1 Message Date
Ayub khan
e2d56d0a0a BOM-273
python3 compatibility
2019-09-05 12:20:26 +05:00
amitvadhel
6075d18af8 Fix for continuation line over-indented for visual indent (PEP 8 violations) 2019-09-05 10:13:10 +03:00
Aarif
e0500adc90 Merge pull request #21539 from edx/BOM-125
BOM-125
2019-09-05 12:06:35 +05:00
Ayub khan
eb221e8076 BOM-331
python3 compatibility
2019-09-05 11:59:09 +05:00
Ayub
cf91c28b8f Merge pull request #21559 from edx/BOM-245
BOM-245
2019-09-05 09:57:37 +05:00
Ayub
2f606b1a50 Merge pull request #21549 from edx/BOM-121
BOM-121
2019-09-05 09:51:22 +05:00
Ayub
e5923e89ee Merge pull request #21548 from edx/BOM-363
BOM-363
2019-09-05 09:49:14 +05:00
Ayub
b5dbdde347 Merge pull request #21547 from edx/BOM-227
BOM-227
2019-09-05 09:47:45 +05:00
Awais Qureshi
18cf37093d Merge pull request #21553 from edx/awais786/BOM-364
BOM-364
2019-09-05 09:47:12 +05:00
Ayub
aff9aca950 Merge pull request #21461 from edx/BOM-294
BOM-294
2019-09-05 09:44:35 +05:00
Christopher Pappas
5f510a8dd5 Updating course overview serializer to return string data for has_ended and has_started, and not a bound method
Oops meant this to be a bool and not a string type

Had to add a start and end date for the course overview test fixture for tests to pass
2019-09-04 19:32:28 -04:00
Feanil Patel
666f1b748d Be explicit about the location of the home on the remote machine. 2019-09-04 15:11:10 -04:00
Feanil Patel
04025cd8c7 Untar the correct venv as a part of preparing the xdist worker. 2019-09-04 15:11:10 -04:00
Feanil Patel
113e0cdc06 Pass the python version to tox. 2019-09-04 15:11:10 -04:00
Nimisha Asthagiri
1c4a645d4c Merge pull request #21363 from edx/robrap/adr-update-jwt-login-redirect
Update ADR around HTTP_USE_JWT_COOKIE
2019-09-04 14:18:20 -04:00
Kyle McCormick
ea5652010c Create Python API for program_enrollments: Part I (#21511)
This is the first in a series of commits to create
a Python API for the LMS program_enrollments app.
We do some general refactoring, renaming, and clean-up
in order to move toward the creation of that API.

EDUCATOR-4321
2019-09-04 14:06:00 -04: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
Albert (AJ) St. Aubin
9eabc2a8f9 Added FERNET_KEY information to the CMS configuration (#21561)
[ENT-2191]
2019-09-04 12:20:56 -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
Robert Raposa
ab4ec931be Update ADR around HTTP_USE_JWT_COOKIE
Update the ADR to clarify another rollout strategy with
HTTP_USE_JWT_COOKIE using the new
JwtRedirectToLoginIfUnauthenticatedMiddleware and new permission class
LoginRedirectIfUnauthenticated.

ARCH-1051
2019-09-04 12:13:57 -04:00
Awais Qureshi
4d2ca1660a Merge pull request #21557 from edx/awais786/BOM-169
BOM-169
2019-09-04 20:18:59 +05:00
Ayub khan
611e43bc6d BOM-245
python3 compatibility
2019-09-04 18:20:20 +05:00
Awais Qureshi
e7712e0c9b BOM-169
python3 tests failures.
2019-09-04 18:17:30 +05:00
Awais Qureshi
6b50e12b0e BOM-364
python3 tests failures.
2019-09-04 17:51:26 +05:00
Waheed Ahmed
6612423420 Merge pull request #21524 from edx/waheed/LEARNER-5114-fix-reset-password
Fixed password reset for authenticated user.
2019-09-04 16:26:44 +05:00
aarif
2e7349b04e python 3 fixes
removed pdb statement

quality fixes

quality fixes

test fixes

quality fixes

python 3 fixes

removed pdb statement

quality fixes

quality fixes

test fixes

quality fixes
2019-09-04 16:02:29 +05:00
Awais Qureshi
52c5a2d547 Merge pull request #21469 from edx/awais786/BOM-240
BOM-240
2019-09-04 15:47:47 +05:00
Ayub khan
a372d44b09 BOM-121
python3 compatibility
2019-09-04 15:35:15 +05:00
Ayub khan
cbba8d8455 BOM-363
python 3 compatibility
2019-09-04 14:49:36 +05:00
Ayub khan
09beb2c72e BOM-227
python3 compatibility
2019-09-04 14:36:06 +05:00
Ayub
2c1fc22af9 Merge pull request #21484 from edx/BOM-264
BOM-264
2019-09-04 12:48:13 +05:00
arbisoft
3fb5db43ea BOM-240
Fixing python3. Hashvalues were saving with b prefix in db. Decoded them before insertion.
2019-09-04 12:13:02 +05:00
Ayub
8a5d25f9fd Merge pull request #21476 from edx/BOM-104
BOM-104
2019-09-04 12:05:00 +05:00
Awais Qureshi
659cdbddb0 Merge pull request #21542 from edx/awais786/BOM-302
BOM-302
2019-09-04 11:38:28 +05:00
Ayub
667b7cf2ca Merge pull request #21459 from edx/BOM-357
BOM-357
2019-09-04 11:22:22 +05:00
Ayub khan
9b46bd02fc BOM-104
Fixed failing unittest
2019-09-04 11:20:43 +05:00
Ayub
0b29872808 Merge pull request #21479 from edx/BOM-289
BOM-289
2019-09-04 11:11:19 +05:00
Ayub
eb133f61ac Merge pull request #21480 from edx/BOM-335
BOM-335
2019-09-04 11:09:56 +05:00
Ayub
3a5e58e6a8 Merge pull request #21535 from edx/BOM-361
BOM-361
2019-09-04 11:08:52 +05:00
amitvadhel
8ee3dd4959 [Fix] BulkEnrollmentTest (make zip_longest compatible with Python2 and 3) 2019-09-04 00:06:39 +03:00
Brian Mesick
75e38fc4fd DEPR-18 Remove deprecated Notes LMS djangoapp (#21008) 2019-09-03 16:49:58 -04:00
Zachary Hancock
1a03816ddc ignore enrollment checks for masters (#21517) 2019-09-03 16:45:02 -04:00
amitvadhel
b819024d0e Fixes for encoding (Python 3.5) 2019-09-03 23:08:46 +03:00
Awais Qureshi
8b0bb0a707 BOM-302
TypeError: unorderable types: int() <= MagicMock()
2019-09-03 23:17:11 +05:00
aarif
929d73bd88 python 3 fixes 2019-09-03 20:33:22 +05:00
Feanil Patel
3205cdab5f Merge pull request #21536 from edx/feanil/get_runserver_working
Fix errors when running runserver in python 3.
2019-09-03 11:06:25 -04:00
Feanil Patel
c0a666fcbb Merge pull request #21537 from edx/feanil/update_gitignore
Ignore generated badge images.
2019-09-03 11:06:14 -04:00
Feanil Patel
8aa214ddd3 Merge pull request #21527 from amitvadhel/BOM-275
BOM-275
2019-09-03 10:35:48 -04:00
Feanil Patel
27dcc11ac6 Ignore generated badge images. 2019-09-03 09:34:33 -04:00
Feanil Patel
ca9cfb128c Fix errors when running runserver in python 3.
- The fields need to be unicode not bytes.  In python 2 it was auto
converting.
- The static url base has been allowed to be a unicode string for a
while.
2019-09-03 09:10:58 -04:00