Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,111 Commits 1 Branch 0 Tags
441d2e44b9457817bf9d2e052d160bc2e3effc2a
Commit Graph

3042 Commits

Author SHA1 Message Date
Nadeem Shahzad
441d2e44b9 Merge pull request #20818 from edx/nadeem/OPS-4041 
Defaults to common.py lms (OPS-4041)
 2019-06-25 18:47:12 +05:00
nadeemshahzad
993a21181a defaults to common.py 2019-06-25 13:01:29 +00: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
Mushtaq Ali
07addf5f22 Merge pull request #20853 from edx/mushtaq/fix-csrf-referer-not-trusted 
Add CSRF_TRUSTED_ORIGINS settings
 2019-06-24 16:18:10 +05:00
Manjinder Singh
a787cd51cf Merge pull request #20801 from edx/msingh/INCR-482 
INCR-482: ran python modernization and isort
 2019-06-21 11:10:37 -04:00
Mushtaq Ali
d9a67496ff Add CSRF_TRUSTED_ORIGINS settings to successfully make POST requests from edx-learner-portal to edx-platform - ENT-2025 2019-06-19 16:04:24 +05:00
msingh
215dde1eca Fixing error introduced by formatter 2019-06-12 10:55:32 -04:00
msingh
7e26fa3823 Fixing quility test 2019-06-12 10:42:48 -04:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
msingh
f441a262cd INCR-482: ran python modernization and isort 2019-06-11 15:20:37 -04:00
Ned Batchelder
756dd88691 Merge pull request #20393 from edx/nedbat/drf-yasg 
Use drf-yasg for Open API documentation
 2019-06-11 13:58:13 -04:00
edx-pipeline-bot
de5d25eccc Merge pull request #20794 from edx/private_to_public_55dd3e1 
Mergeback PR from private to public.
 2019-06-11 19:17:13 +05:00
Ned Batchelder
9257f68fd8 The default TIME_ZONE should be UTC 
In production, we use UTC as the time zone.  DRF 3.7.7 now puts all
times in the currently set timezone where it used to use UTC.  By
setting TIME_ZONE to UTC, we keep the same results we used to get.

In a few places, we had to change the expected test results to be UTC.
 2019-06-10 15:27:39 -04:00
Ned Batchelder
5985480409 Add drf-yasg 
* Install drf-yasg

* Add drf-yasg settings and urls

* Pin drf to make drf-yasg work

* Adjust config-models version to be compatible

* Remove django-rest-swagger (the old way)
 2019-06-10 15:27:38 -04:00
Thomas Tracy
f0ecc938ef Add IdentityServer3 Backend (#20275) 
* Add IdentityServer3 Backend

This adds a backend for users who want to use IdentityServer3 as their
SSO provider. It can be used with the OAuth2ProviderConfig in django
admin to point to an external provider.
 2019-06-07 09:38:46 -04:00
Zia Fazal
504decf345 Bumped edx-enterprise version and added cornerstone app 2019-05-29 14:21:09 +05:00
Zainab Amir
3eb13ae7ac Merge pull request from zamir/LEARNER_7313_move_command_arguments_to_common_settings 
Move command arguments to common settings
 2019-05-29 10:39:49 +05:00
Nimisha Asthagiri
01ccd877e6 Merge pull request #20702 from edx/bom/enrollment-readme 
Enrollments README and refactor
 2019-05-28 16:58:27 -04:00
Nimisha Asthagiri
6e214a85b0 Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments 2019-05-28 11:20:53 -04:00
Zainab Amir
886834adb5 Move command arguments to common settings 
Move command parameter arguments, resend-days and days-range, to
common settings. This will help in creating a consistency when the
default values are changed in the future.

LEARNER-7313
 2019-05-28 14:49:27 +05:00
David Ormsbee
2b0151ceac Merge pull request #20266 from open-craft/josuebc/upstream/BB-1063 
Add capability to override MANUAL_ENROLLMENT_ROLE_CHOICES
 2019-05-24 15:46:25 -04:00
Nimisha Asthagiri
1ebecef5ed Prevent JWT Authentication from updating LMS User Data 2019-05-24 12:24:05 -04:00
noraiz-anwar
34cf433588 rate limit requests for password reset emails 2019-05-23 13:29:36 +05:00
adeelehsan
db50cbe503 Merge pull request #20598 from edx/aehsan/prod-277/update_the_edx_icp_license 
Updated ICP license in edx footer
 2019-05-22 22:12:56 +05:00
Dave St.Germain
73e8324f64 Merge pull request #20399 from edx/dahlia/sgp 
Runtime Support for Staff Graded Points
 2019-05-21 09:29:01 -04:00
adeelehsan
791b9d8e5d Updated ICP license in edx footer 
changed ICP license to link and added
sentence with ICP license

PROD-277
 2019-05-21 16:23:18 +05:00
Waheed Ahmed
137be4bf79 Merge pull request #20537 from edx/waheed/revert-LEARNER-4117 
Revert "Making honor code not eligible for Certificate"
 2019-05-20 14:29:02 +05:00
Waheed Ahmed
2c80a76f8e Add feature flag to disable honor mode certificates. 
Added a feature flag to disable honor mode certificates for
edx.org, by default set to false to allow honor mode certificates
for open community.

PROD-269
 2019-05-20 12:53:22 +05:00
Stu Young
6478d43329 incr-298 (#20606) 
* run python modernize
* run isort
* Split out handlers/apps into separate files.
 2019-05-16 11:02:36 -04:00
Dave St.Germain
0573b2e4d4 Grade runtime service support for Staff Graded Points 2019-05-16 10:21:46 -04:00
Hammad Ahmad Waqas
cdc8ddf190 clearing all relevant cache if enterprise customer change DSC enable flag. 2019-05-14 17:50:48 +05:00
Chris Pappas
d937708432 Merge pull request #20438 from edx/cpappas/ENT-1887 
ENT-1887 | Adding logic for new business marketing footer url constru…
 2019-05-10 16:28:27 -04:00
Emma Green
7ae68aa383 add applicability endpoint 2019-05-10 09:11:54 -04:00
Christopher Pappas
4c5ca6d086 ENT-1887 | Adding logic for new business marketing footer url construction, while maintaining backwards compatibility 
Fixing quality test

Testsing out a default value for the sake of jenkins tests. will revert

Fix footer test from being flaky

Moving an import statement

ran isort. adding a test. fixing 1 quality issue

Quality cleanups

Attempting more quality fixes

adding back in config variable name for default value

Adding ENTERPRISE_MARKETING_FOOTER_QUERY_PARAMS to common settings

Changing marketing_url logic to only concatenate enterprise url to root if the enterprise url is relative (starts with a /)

quality fixes
 2019-05-09 17:15:47 -04:00
Brian Mesick
a4a009e57b Merge pull request #20222 from edx/bmedx/course_enrollment_history 
Re-adding django-simple-history for CourseEnrollment
 2019-05-09 13:02:07 -04:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
bmedx
17cb93dd51 Re-adding django-simple-history for CourseEnrollment 2019-05-03 16:16:41 -04:00
Diana Huang
c6a89b03b9 Remove Diff Paid experimental features. 2019-05-03 15:09:20 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
7b4b6c3539 Move notifier and notification_prefs to discussion/ 2019-05-03 12:09:47 -04:00
Nimisha Asthagiri
e160b23903 Move django_comment_client to discussion/ 2019-05-03 12:09:46 -04:00
Nimisha Asthagiri
b949452eb2 Move discussion_api to discussion/rest_api 2019-05-03 12:07:21 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Nimisha Asthagiri
df962a31b7 Move django_comment_common to openedx/core/djangoapps/discussion_common 2019-05-01 19:15:02 -04:00
Nimisha Asthagiri
97862d2ed7 Move notifier and notification_prefs to discussion/ 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
db89a64d06 Move django_comment_client to discussion/ 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
3d1bb23809 Move discussion_api to discussion/rest_api 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
2a168a4e1b Account: Toggle for Microfrontend Redirect 
ARCH-636
 2019-05-01 11:31:48 -04:00
Douglas Hall
9880676e6a Add site configuration check to order history MFE toggle. 2019-04-25 11:10:08 -04:00
Michael Youngstrom
bfe10720c6 Remove lettuce infrastructure 2019-04-18 09:58:21 -04:00