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

51174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
68a06b0a0f Merge pull request #21544 from amitvadhel/BOM-127 
BOM-127
 2019-09-05 11:30:22 -04:00
Awais Qureshi
07a683a8d7 Merge pull request #21569 from edx/awais786/BOM-129 
BOM-129
 2019-09-05 20:09:18 +05:00
Chris Pappas
228920e701 Merge pull request #21566 from edx/cpappas/course-overview-serializer-bug-fix 
Updating course overview serializer to return bool data for has_end…
 2019-09-05 09:55:26 -04:00
Feanil Patel
81d83e0680 Merge pull request #21543 from amitvadhel/BOM-119 
BOM-119
 2019-09-05 09:46:15 -04:00
Alex Dusenbery
6917a29e84 PROD-287 | Add an optional treat_undefined_as_zero flag to the helper functions is_score_higher_or_equal() and compare_scores(), which defaults to False, that we call with value True from SubsectionGradeFactory.update(), which occassionally deals with invalid subsection scores containing zero as the denominator. 2019-09-05 09:31:23 -04:00
Feanil Patel
d04df12281 Merge pull request #21564 from edx/feanil/fix_running_on_jenkins 
Feanil/fix running on jenkins
 2019-09-05 08:47:11 -04:00
Mushtaq Ali
7c4a08d75c Merge pull request #21552 from edx/mushtaq/upgrade-packages 
Upgrade edx-enterprise package
 2019-09-05 17:14:07 +05:00
Awais Qureshi
3a61df0655 BOM-129 
python3 tests failures.
 2019-09-05 16:51:43 +05:00
Awais Qureshi
84fb6aa20d Merge pull request #21574 from edx/awais786/BOM-243 
BOM-243
 2019-09-05 16:46:26 +05:00
amitvadhel
56a8b440af Line too long fix 2019-09-05 14:35:51 +03:00
Aarif
1a886f3d4a Merge pull request #21534 from edx/BOM-143 
BOM-143
 2019-09-05 15:55:02 +05:00
Aarif
954d6cae06 Merge pull request #21540 from edx/BOM-130 
BOM-130
 2019-09-05 15:53:43 +05:00
Mushtaq Ali
79801affdc Upgrade packages 2019-09-05 15:44:30 +05:00
Awais Qureshi
908adacdc2 BOM-243 
python3 tests failures.
 2019-09-05 15:41:36 +05:00
Ayub
f0468f2fc6 Merge pull request #21545 from edx/BOM-331 
BOM-331
 2019-09-05 15:38:44 +05:00
Awais Qureshi
898eba600f Merge pull request #21520 from edx/awais786/BOM-149 
BOM-149
 2019-09-05 15:15:35 +05:00
arbisoft
1f78305f99  This is a combination of 2 commits. 
 This is the 1st commit message:

BOM-149
python3 tests failures.

 This is the commit message #2:

BOM-149
python3 tests failures.
 2019-09-05 12:49:06 +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