Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,952 Commits 1 Branch 0 Tags
23ab20a6fd1863c02bf1197ff8f0d3a288288d32
Commit Graph

4763 Commits

Author SHA1 Message Date
Matthew Piatetsky
aba836b517 Merge pull request #20674 from edx/REVEM-354 
add discount banner to track selection and discount price to upgrade button
 2019-06-07 11:35:34 -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
Josue Balandrano Coronel
df14f5cdf6 [BB-1132] Decrease NAME_MIN_LENGTH to 1 2019-06-06 22:52:00 +02:00
Matthew Piatetsky
ce5b976f5e update local currency code 2019-06-05 15:46:16 -04:00
David Ormsbee
74492907d8 Merge pull request #19582 from open-craft/josuebc/upstream/BB-732 
BB-732 Fix Django admin form for Course Enrollment
 2019-06-04 18:21:53 -04:00
Troy Sankey
df8f581d36 Add history to CourseEntitlement 
DE-1510
 2019-06-04 13:52:17 -04:00
Matthew Piatetsky
ad77392f8d add discount banner to track selection 2019-06-03 14:18:17 -04:00
irfanuddinahmad
53265d506e user existence check updated to use email only 2019-05-30 12:30:14 +05:00
Zachary Hancock
1bb449a742 Merge pull request #20653 from edx/zhancock/complete-waiting-enrollments 
complete waiting enrollments. fixed
 2019-05-29 10:30:16 -04: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
Zach Hancock
a350d327de complete waiting enrollments. fixed 2019-05-24 13:47:49 -04:00
Matthew Piatetsky
936f94cfb4 fix issue for all dashboard redirect messages (#20689) 
fix issue for all dashboard redirect messages
 2019-05-24 12:32:06 -04:00
Matthew Piatetsky
42d551096a fix xss issue for all dashboard redirect messages 2019-05-24 11:34:39 -04:00
Jeremy Bowman
f9929f32b5 Update quality threshold counts (#20681) 2019-05-24 08:27:54 -04:00
Michael Roytman
b0f715d1c2 add a GET endpoint to get course run overviews for a user's program enrollment 2019-05-22 13:35:49 -04:00
Michael Roytman
5da94023e6 Merge pull request #20620 from edx/mroytman/bulk-email-python-api 
introduce Python API for BulkEmail Djangoapp
 2019-05-21 18:38:24 -04: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
Michael Roytman
b33b8e8897 introduce Python API for BulkEmail Djangoapp 2019-05-21 09:22:08 -04: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
Josue Balandrano Coronel
0e85af8a98 Update CourseEnrollment Admin ModelForm to correct edit and create 
student enrollments. We no longer need to parse the course key into an
opaque key since the opaque key class can already handle strings and the
parsing happens there. We also need to specify which course enrollment
are we editing or else the reference is lost when saving the edits.
 2019-05-18 17:24:13 +02:00
Dave St.Germain
0573b2e4d4 Grade runtime service support for Staff Graded Points 2019-05-16 10:21:46 -04:00
Anthony Wee
489c78dfa7 INCR-132: Run python-modernize on common/djangoapps/status (#20450) 
* INCR-132: Run python-modernize on common/djangoapps/status

* isort

* isort migrations
 2019-05-13 13:00:01 -04:00
Amit
65f4a63ecf INCR-248: Make compatible with Python 3.x without breaking Python 2.7… (#20529) 
* INCR-248: Make compatible with Python 3.x without breaking Python 2.7 support --> common/djangoapps/xblock_django

* INCR-248: Grouped absolute_import and unicode_literals imports

* INCR-248: Grouped absolute_import and unicode_literals imports for migrations
 2019-05-13 12:35:39 -04:00
Waheed Ahmed
98c286a009 Revert "Making honor code not eligible for Certificate" 
This reverts commit 25130ae3c8.
 2019-05-13 15:39:35 +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
Amit
40068aecb5 INCR-232: Run python-modernize and isort on common/djangoapps/track (#20513) 2019-05-10 12:05:31 -04:00
Amit
a10fbd682c INCR-231: Run python-modernize and isort at common/djangoapps/entitlements (#20515) 2019-05-10 11:14:18 -04:00
Amit
9e6d71c49b INCR-144: Run python-modernize on common/djangoapps/microsite_configuration/tests (#20517) 2019-05-10 10:16:31 -04:00
Amit
0bd61d5d9f INCR-133: Run python-modernize on common/djangoapps/xblock_django [migrations, management, tests] (#20520) 2019-05-10 09:47:20 -04:00
Stu Young
c3571a5fb9 Merge pull request #20521 from amitvadhel/INCR-139 
INCR-139
 2019-05-10 09:44:26 -04:00
Amit
07b75ae690 INCR-164: Run python-modernize on common/djangoapps/microsite_configuration [backends, management, migrations] (#20507) 2019-05-10 08:37:27 -04:00
amitvadhel
8ef8dd27b2 INCR-139: Run python-modernize on common/djangoapps/third_party_auth/tests [tests, data] 2019-05-10 12:54:01 +03: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
Amit
328bcbe047 INCR-135: Run python-modernize on common/djangoapps/edxmako (#20483) 2019-05-09 10:08:57 -04:00
Amit
f8ef9878d2 INCR-136: Run python-modernize at common/djangoapps/pipeline_mako (#20482) 2019-05-09 10:00:16 -04:00
Amit
9e2397a60a INCR-137: Run python-modernize at common/djangoapps/static_replace (#20481) 2019-05-09 09:36:45 -04:00
Kyle Mulka
b2e6ed0488 incr-205 ran modernize on common/djangoapps/course_modes (#20465) 2019-05-08 13:35:40 -04:00
Jeremy Bowman
47292e5f92 Update StringIO usage for Python 3 (#20462) 2019-05-08 12:13:22 -04:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
Cameron Cairns
6363090144 Addresses INCR-195 - runs modernise /student/tests (#20419) 2019-05-07 15:44:49 -04:00
Anthony Wee
3dcdf96faf INCR-123: Run python-modernize on common/djangoapps/track/backends (#20444) 
* anthonywee/INCR-123

* isort
 2019-05-07 15:16:42 -04:00
Anthony Wee
a0bb7e572d INCR-125: Run python-modernize on common/djangoapps/track/views and migrations (#20425) 
* INCR-125: Run python-modernize on common/djangoapps/track/views and migrations

* isort
 2019-05-07 14:26:57 -04:00
Anthony Wee
b095ce15c8 INCR-124: Run python-modernize on common/djangoapps/track/tests (#20445) 
* INCR-124: Run python-modernize on common/djangoapps/track/tests

* isort
 2019-05-07 14:05:38 -04:00
Anthony Wee
2ab8794c78 INCR-131: Run python-modernize on common/djangoapps/entitlements/api (#20448) 
* INCR-131: Run python-modernize on common/djangoapps/entitlements/api

* isort
 2019-05-07 13:05:21 -04:00
Anthony Wee
aa1d142ddd INCR-130: Run python-modernize on common/djangoapps/entitlements/migrations (#20447) 
* INCR-130: Run python-modernize on common/djangoapps/entitlements/migrations

* isort
 2019-05-07 13:01:04 -04:00
Anthony Wee
2d8dfa895f INCR-129: Run python-modernize on common/djangoapps/entitlements/management and tests (#20446) 
* INCR-129: Run python-modernize on common/djangoapps/entitlements/management

* isort

* INCR-129: Run python-modernize on common/djangoapps/entitlements/tests

* isort
 2019-05-07 12:52:09 -04:00
Evans Dianga
391b91b99a Modernize common/djangoapps/util- INCR-203 (#20437) 2019-05-07 09:53:17 -04:00