Commit Graph

19803 Commits

Author SHA1 Message Date
Amit
c54a18c9fc INCR-413: Run python-modernize and isort (#20786)
* INCR-413: Run python-modernize and isort

* INCR-413: Fix for text_type usage
2019-06-12 11:54:48 -04:00
edX cache uploader bot
d0de873217 Updating Bokchoy testing database cache (#20805) 2019-06-12 11:42:36 -04:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Jeremy Bowman
237d264a50 DEPR-12 Remove microsites references from edxmako (#20796) 2019-06-11 15:27:10 -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 cache uploader bot
a6c802b3f1 Updating Bokchoy testing database cache (#20788) 2019-06-11 12:24:54 -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
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same. 2019-06-10 15:27:39 -04:00
Ned Batchelder
8a44397139 Is this field missing because it is None? 2019-06-10 15:27:39 -04:00
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
edX cache uploader bot
a26ad5868a Updating Bokchoy testing database cache (#20749) 2019-06-05 13:58:24 -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
edX cache uploader bot
1626270d1e Updating Bokchoy testing database cache (#20744) 2019-06-04 17:33:45 -04:00
Troy Sankey
df8f581d36 Add history to CourseEntitlement
DE-1510
2019-06-04 13:52:17 -04:00
edX cache uploader bot
f1f7e7e2ec Updating Bokchoy testing database cache (#20740) 2019-06-04 09:24:08 -04:00
Matthew Piatetsky
ad77392f8d add discount banner to track selection 2019-06-03 14:18:17 -04:00
Noraiz Anwar
55dd3e18bb Merge pull request #153 from edx/noraiz/PROD-169
rate limit requests for password reset emails
2019-06-03 11:39:59 +05:00
Ned Batchelder
f72b1d56de Merge pull request #20639 from edx/nedbat/welcome-message
Some trademark improvements to the default home page
2019-05-31 12:39:41 -04:00
atesker
5eeb423372 waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.

waffle flag - studio.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.
Added CR comments - moved UI vis toggle to template instead of js. Moved waffle flag to waffle.py

waffle flag - studio.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.
Added CR comments - moved UI vis toggle to template instead of js. Moved waffle flag to waffle.py

waffle flag - studio.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.
Added CR comments - moved UI vis toggle to template instead of js. Moved waffle flag to waffle.py
Updated JS UT and acceptance

Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments

Fix Pylint for enrollments

README for enrollments app

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

Bumped edx-enterprise version and added cornerstone app

Updating Bokchoy testing database cache (#20713)

complete waiting enrollments. fixed

Remove microsites from user_authn
DEPR-30

Remove microsites from certificates
DEPR-26

Remove microsites from shoppingcart
DEPR-27

Updating Bokchoy testing database cache (#20715)

add arch decision of computation of course-user discount

Mark missing string for internationalization

Remove microsites from static_template_view
DEPR-28

README for commerce and shoppingcart

README for certificates

README for course_experience

geoip2: update maxmind geolite country database

user existence check updated to use email only

Bumped edx-when

Use our fork of this repo instead of the mitocw one.

Make platform bootstrap footer match other footer

Changes:
- Add logo back
- Fix up spacing
- Change font sizes and color

Mark alt text for translation

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.

waffle flag - test_settings.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.

waffle flag - studio.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.
Added CR comments - moved UI vis toggle to template instead of js. Moved waffle flag to waffle.py

waffle flag - studio.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.
Added CR comments - moved UI vis toggle to template instead of js. Moved waffle flag to waffle.py

waffle flag - studio.show_review_rules
To toggle proctored exam advanced settings
acceptance testing update.
Added CR comments - moved UI vis toggle to template instead of js. Moved waffle flag to waffle.py
Updated JS UT and acceptance

Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments

Fix Pylint for enrollments

README for enrollments app

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

Bumped edx-enterprise version and added cornerstone app

Updating Bokchoy testing database cache (#20713)

complete waiting enrollments. fixed

Remove microsites from user_authn
DEPR-30

Remove microsites from certificates
DEPR-26

Remove microsites from shoppingcart
DEPR-27

Updating Bokchoy testing database cache (#20715)

add arch decision of computation of course-user discount

Mark missing string for internationalization

Remove microsites from static_template_view
DEPR-28

README for commerce and shoppingcart

README for certificates

README for course_experience

geoip2: update maxmind geolite country database

user existence check updated to use email only

Bumped edx-when

Use our fork of this repo instead of the mitocw one.

Make platform bootstrap footer match other footer

Changes:
- Add logo back
- Fix up spacing
- Change font sizes and color

Mark alt text for translation
2019-05-31 10:01:51 -04:00
irfanuddinahmad
53265d506e user existence check updated to use email only 2019-05-30 12:30:14 +05:00
edX Transifex Bot
b11affc5e3 geoip2: update maxmind geolite country database 2019-05-29 20:33:12 +00:00
edX cache uploader bot
97c8c176a6 Updating Bokchoy testing database cache (#20715) 2019-05-29 11:43:06 -04: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
edX cache uploader bot
b4df3a10f4 Updating Bokchoy testing database cache (#20713) 2019-05-29 09:55:53 -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
Amit
9c9f38e4e9 INCR-251: Make compatible with Python 3.x without breaking Python 2.7 support --> common/test/acceptance/tests/discussion (#20646) 2019-05-24 14:20:03 -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
Dave St.Germain
fdc785bfb0 Merge pull request #20605 from edx/mroytman/EDUCATOR-4276-get-course-enrollments
program course enrollment overview GET endpoint
2019-05-24 07:39:45 -04:00
Usama Sadiq
6faa5bdf1b Merge pull request #20539 from edx/usama/learner-7023-Mathjax-Configurations
MathJax Output Format in LMS

Issue: 
MathJax expressions were not rendering properly in the drop-down menu. 

Reason: 
MathJax SVG configurations do not work properly in case of a drop-down menu.

Solution:
The output format for MathJax expressions changed from SVG to HTML to allow the MathJax rendering in the drop-down menu as well.
2019-05-23 13:57:12 +05:00
noraiz-anwar
34cf433588 rate limit requests for password reset emails 2019-05-23 13:29:36 +05:00
Ned Batchelder
cf2432c151 Use PLATFORM_NAME on the home page 2019-05-22 17:39:00 -04:00
edX Transifex Bot
054279d6d0 geoip2: update maxmind geolite country database 2019-05-22 17:08:37 -04:00
Jeremy Bowman
64e7c46cf5 Remove flaky tab reordering test (#20629) 2019-05-22 15:52:58 -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
usama sadiq
2091535b2d LMS MathJax output format Update
MathJax format updated to HTMLorMML instead of SVG
Test files updated in lms.
2019-05-22 11:59:32 +05:00
usama sadiq
a59964119f Updated Output format in both LMS and CMS 2019-05-22 11:59:32 +05: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
AsadAzam
4444b1210c Merge pull request #20657 from edx/asad/prod-302-added-logs
Added logs
2019-05-21 19:16:27 +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
Michael Roytman
b33b8e8897 introduce Python API for BulkEmail Djangoapp 2019-05-21 09:22:08 -04:00
asadazam93
e7ee94552b Added logs 2019-05-21 18:01:08 +05:00
Waheed Ahmed
2d0662b49a Merge pull request #20634 from edx/geoip2-bot-update-country-database2019-05-15
geoip2: update maxmind geolite country database
2019-05-21 15:28:02 +05:00
David Ormsbee
309c92f6e6 Merge pull request #20642 from jolyonb/linkfix
Bug fix: broken course links in solution blocks
2019-05-20 11:01:22 -04:00