Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5629 Commits

Author SHA1 Message Date
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
Adeel Khan
ef0d56aac6 Fix lms templates to prevent xss attacks. 
This patch is part of multiple PR's.

LEARNER-4632
 2019-07-03 19:57:59 +05:00
DawoudSheraz
b15f923c47 refactor the login user method 2019-07-02 13:12:03 +05:00
Zachary Hancock
0ed2e67c2b site configuration management (#20919) 
site config management cmd
 2019-07-01 11:07:26 -04:00
Emma Green
c4ae093e75 remove discount banner display flag 2019-06-28 14:46:21 -04:00
Uzair Rasheed
c3af0ed3f1 Merge pull request #20848 from edx/LEARNER-7155/update-entitlement-support-view 
Update enrollment support view
 2019-06-28 00:11:10 +05:00
uzairr
789a48e27b Update enrollment support view 
Currently, entitlement view is not displaying any message if there
are no records against a query.To improve user experience, changes
have been made so that a proper message would be displayed.

LEARNER-7155
 2019-06-27 14:48:05 +05:00
usama sadiq
7a5f0b7d24 Pylint Warning Supression Removed 2019-06-27 12:15:06 +05:00
Calen Pennington
39efc54a27 Merge pull request #20884 from cpennington/discount-no-previous-purchase 
REVEM-289: Discount no previous purchase
 2019-06-25 17:12:19 -04:00
Calen Pennington
f07f2121ba Make has_non_audit_enrollments exclude entitlements 2019-06-25 16:44:36 -04:00
Calen Pennington
388fac3b9c Make has_non_audit_enrollments exclude honor courses correctly 2019-06-25 16:44:36 -04:00
Ned Batchelder
aa13a634a6 Merge pull request #20821 from edx/nedbat/drf-yasg 
Upgrade djangorestframework and install drf-yasg to get better OpenAPI support
 2019-06-25 13:49:13 -04:00
Calen Pennington
ce058aa5ee Only allow users who have no entitlements to receive discounts 2019-06-25 12:04:59 -04:00
Calen Pennington
ac9ba2b95a Only make users who haven't previously enrolled in a non-upsellable course eligible for the discount 2019-06-25 12:04:59 -04:00
Calen Pennington
390122ec93 Make CourseOverviewFactory create new courses every time (unless otherwise specified) 2019-06-25 12:04:59 -04:00
Adeel Khan
298d3554fe Fix templates for XSS code injection via translations 
This would patch all templates (django/mako)
for a possible XSS code injection via
translation files by html escaping them..

LEARNER-4632
 2019-06-25 14:22:42 +05:00
Hammad Ahmad Waqas
34589393ac Merge pull request #20840 from edx/hammad/WL-1492 
WL-1492 | Remove arbitrary code rendering on course about page
 2019-06-25 11:20:07 +05:00
Matt Tuchfarber
4e1877670e Check if enterprise matches site before consent 
We don't support enterprises with catalogs that span sites, so we can
safely ignore checking for consent when the site a learner is viewing a
course in is different than the enterprise that the learner is linked
to.
 2019-06-24 14:30:59 -04:00
Ned Batchelder
b3a731550c Fix problems that drf-yasg uncovered. 
These were originally fixed individually, but had to be reverted, and
are now combined in one commit.  The originals were:

7b9040f6b0 This enum was backwards
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same.
8a44397139 Is this field missing because it is None?
4a1154a7ca Give a safer buffer for clearing the rate limiting
64c47856dd DRF 3.7.4 changed how you delegate to another view, so don't
7359ca4fb2 Is this right? It fixes two tests
fdd66e5390 Adjust the expected error message for DRF 3.7.7
9257f68fd8 The default TIME_ZONE should be UTC
 2019-06-21 18:04:15 -04:00