Commit Graph

7647 Commits

Author SHA1 Message Date
Christie Rice
fee8e17f95 REVMI-341 Stop sending lms_client_id in jwt sent to ecommerce (#21167) 2019-07-19 10:46:46 -04:00
Feanil Patel
e51fae3784 letters doesn't exist in python 3.6
Use `ascii_letters` instead which is a reasonable alternative for our
usecases.
2019-07-19 09:48:10 -04:00
Ayub
10df92857f Merge pull request #21035 from edx/INCR-380
INCR-380 python 3 compatibility
2019-07-19 12:25:43 +05:00
Ayub
8da4955ea9 Merge pull request #21034 from edx/INCR-379
INCR-379 python 3 compatibility
2019-07-19 12:25:06 +05:00
Ayub
ef1da0f007 Merge pull request #21032 from edx/INCR-377
INCR-377 python 3 compatibility
2019-07-19 12:24:25 +05:00
Calen Pennington
0e187f85b7 Only attempt to use the parent's CONTENT_GATING_PARTITION settings if there is actually a parent 2019-07-18 15:08:12 -04:00
Aarif
d0a73e7f1a Merge pull request #21037 from edx/INCR-382
INCR-382 Python 3 compatibility
2019-07-18 13:13:47 +05:00
Ayub
c3ad8a2f48 Merge pull request #21030 from edx/INCR-376
INCR-376 python3 compatibility
2019-07-18 12:09:29 +05:00
Ayub
e324ccaf7e Merge pull request #21028 from edx/INCR-375
INCR-375 python3 comptatibility
2019-07-18 11:19:00 +05:00
Ayub
9e3d66f3d4 Merge pull request #21025 from edx/INCR-366
INCR-366 python3 compatibility
2019-07-18 11:17:49 +05:00
Alex Dusenbery
ba2f0725ee EDUCATOR-4498 | Add optional output-file option to generate_jwt_signing_key command. 2019-07-17 14:45:25 -04:00
Aarif
5e7f39efa8 Merge pull request #21027 from edx/INCR-367
INCR-367 Python 3 compatibility
2019-07-17 14:33:27 +05:00
Ayub
79872f54d9 Merge pull request #21019 from edx/INCR-355
INCR-355 python3 compatibility
2019-07-17 13:10:59 +05:00
Awais Qureshi
6f3680ced5 Merge pull request #21039 from edx/awais786/INCR-383
INCR-383
2019-07-17 12:22:37 +05:00
Ayub khan
8dfba01f14 INCR-355 python3 compatibility 2019-07-17 12:02:31 +05:00
Ayub
be92bba430 Merge pull request #21020 from edx/INCR-361
INCR-361 python3 compatibility
2019-07-17 10:46:42 +05:00
aarif
cdfee4348f ran python-modernize and isort on files mentioned in INCR-367
changes made to comply with pylint
2019-07-16 09:58:17 +00:00
Awais Qureshi
c89ecb384f Merge pull request #21026 from edx/awais786/INCR-368
INCR-368
2019-07-16 12:57:22 +05:00
Ayub
31ab0bed32 Merge pull request #21016 from edx/INCR-349
INCR-349 python3 compatibility
2019-07-16 12:36:54 +05:00
Awais Qureshi
46b089c12c Merge pull request #21021 from edx/awais786/INCR-357
INCR-357
2019-07-16 11:48:01 +05:00
Waheed Ahmed
eead45987f Merge pull request #21087 from edx/waheed/PROD-433-add-student-support-role
Add system wide student support role.
2019-07-12 12:30:08 +05:00
Matt Tuchfarber
b1998e202e Merge pull request #20945 from edx/tuchfarber/remove_journals
Remove all references to Journals
2019-07-11 11:08:24 -04:00
Waheed Ahmed
41e8f31765 Add system wide student support role.
Created a data migration to add system wide student support
role, also registered SystemWideRoleAssignment into Django
admin.

PROD-433
2019-07-11 20:03:23 +05:00
Ayub khan
2250411222 INCR-349 python3 compatibility 2019-07-11 13:29:34 +05:00
Aarif
a6ff5e3005 ran python-modernize and isort on openedx/core/djangoapps/user_authn (#20976) 2019-07-11 12:25:22 +05:00
Alex Dusenbery
df3d6d160f give create_api_access_request mgmt cmd an option to disconnect signals. 2019-07-10 19:50:08 -04:00
Ayub
a4ea763b95 Merge pull request #20974 from edx/INCR-324
INCR-324 python 3 compatibility
2019-07-11 00:03:41 +05:00
Awais Qureshi
a443a4ac94 Merge pull request #20979 from edx/awais786/INCR-322-
INCR-322 python3 compatibilty
2019-07-10 23:28:28 +05:00
Ayub khan
7ffccff0f3 INCR-376 python3 compatibility 2019-07-10 19:57:32 +05:00
Ayub khan
33227b8a72 INCR-384 python 3 compatibility 2019-07-10 16:31:18 +05:00
arbisoft
6155f2c81f Fixing python-modernize issues. 2019-07-10 15:41:27 +05:00
arbisoft
fe86f4e45a Fixing python-modernize issues. 2019-07-10 15:30:23 +05:00
aarif
87e498587b ran python-modernize and isort on files mentioned in INCR-382 2019-07-10 15:24:18 +05:00
Ayub khan
1f2d15f540 INCR-380 python 3 compatibility 2019-07-10 15:16:58 +05:00
Ayub khan
80f89dc982 INCR-379 python 3 compatibility 2019-07-10 15:13:26 +05:00
Ayub khan
91a3c91fd2 INCR-377 python 3 compatibility 2019-07-10 15:10:05 +05:00
Ayub khan
f2ac9498fd INCR-375 python3 comptatibility 2019-07-10 14:57:45 +05:00
arbisoft
5ba895d900 Fixing python-modernize issues. 2019-07-10 14:53:35 +05:00
Ayub khan
a218ba62b7 INCR-366 python3 compatibility 2019-07-10 14:46:34 +05:00
arbisoft
86a5066991 Fixing python-modernize issues. 2019-07-10 14:35:29 +05:00
Ayub khan
45a1053a60 INCR-361 python3 compatibility 2019-07-10 14:34:22 +05:00
Zainab Amir
92c7a43011 Add system_wide_roles app and roles classes (#20935)
* New system_wide_roles app added in openedx/core/djangoapps
* Added SystemWideRole and SystemWideRoleAssignment classes to govern
  non-enterprise system wide roles

PROD-424
2019-07-10 11:33:33 +05:00
Matt Tuchfarber
2583d317db Remove all references to Journals 2019-07-09 14:19:25 -04:00
Ayub khan
f33a89fc52 python 3 compatibility 2019-07-09 19:02:05 +05:00
arbisoft
bc39c60715 Fixing python-modernize issues. 2019-07-09 14:37:36 +05:00
Brian Mesick
e462b0b824 Merge pull request #20741 from edx/pwnage101/add-history-to-courseoverviews
Add history to CourseOverview
2019-07-08 14:46:55 -04:00
Calen Pennington
566cd9775d Merge pull request #20936 from cpennington/discount-holdback
Discount holdback
2019-07-05 10:06:40 -04:00
Troy Sankey
4500536151 Add history to CourseOverview 2019-07-03 16:24:28 -04:00
Calen Pennington
708118f9c0 Enable holdback in first purchase discounts 2019-07-03 15:23:34 -04:00
Calen Pennington
8b4b5a4547 Move stable_bucketing into its own library to minimize circular dependencies 2019-07-03 15:03:31 -04:00