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

51137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Awais Qureshi
52c5a2d547 Merge pull request #21469 from edx/awais786/BOM-240 
BOM-240
 2019-09-04 15:47:47 +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
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
Awais Qureshi
8b0bb0a707 BOM-302 
TypeError: unorderable types: int() <= MagicMock()
 2019-09-03 23:17:11 +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
Ayub
ce27fb5c33 Merge pull request #21486 from edx/BOM-371 
BOM-371
 2019-09-03 16:50:13 +05:00
Ayub
09fd8076f5 Merge pull request #21533 from edx/BOM-370 
BOM-370
 2019-09-03 16:47:26 +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
Aarif
ee2fd56d8d Merge pull request #21503 from edx/BOM-269 
BOM-269 Python 3 fixes
 2019-09-03 13:56:02 +05:00
amitvadhel
19dd19d0e9 BOM-275: Test case fixes for Python 3.5 2019-09-02 23:29:56 +03:00
AmiT
4c01e204bc Merge pull request #3 from edx/master 
Update the repo
 2019-09-02 19:28:07 +05:30
Ayub
dd26f3bc12 Merge pull request #21477 from edx/make-unicode-fixes 
Remove unicode and use six.text_type
 2019-09-02 16:52:07 +05:00
Ayub khan
da9c71557b -Remove unicode and use six.text_type 2019-09-02 16:14:02 +05:00
Waheed Ahmed
9f80fd2b87 Fixed password reset for authenticated user. 
Password reset link for one user is working for other logged in users.
Fixed by verifying the token with request.user if authenticated.

LEARNER-5114
 2019-09-02 15:30:25 +05:00
Aarif
85f622f0e1 Merge pull request #21515 from edx/BOM-362 
BOM-362 Python 3 fixes
 2019-09-02 14:34:46 +05:00
Aarif
43a36709ec Merge pull request #21500 from edx/BOM-327 
BOM-327 Python 3 fixes
 2019-09-02 14:33:49 +05:00
Aarif
bb83ab683b Merge pull request #21491 from edx/BOM-290 
BOM-290 Python 3 fixes
 2019-09-02 14:28:46 +05:00
edX Transifex Bot
774cfc109c fix(i18n): update translations 2019-09-02 05:27:48 -04:00
Aarif
a14064eb42 Merge pull request #21490 from edx/BOM-262 
BOM-262 Python 3 fixes
 2019-09-02 14:26:55 +05:00
Ayub
48b5dd781e Merge pull request #21512 from edx/BOM-96-2 
BOM-96
 2019-09-02 14:26:20 +05:00
Awais Qureshi
01a33b98ac Merge pull request #21505 from edx/awais786/BOM-115 
BOM-115
 2019-09-02 14:08:14 +05:00
arbisoft
19ea7c3875 BOM-115 
Fixing python3
 2019-09-02 13:37:16 +05:00
Ayub khan
8e71206312 BOM-96 
-fixes all issues
 2019-09-02 13:30:33 +05:00
Aarif
40f4ab2b90 Merge pull request #21487 from edx/BOM-161 
BOM-161 Python 3 fixes
 2019-09-02 12:34:05 +05:00