Commit Graph

49891 Commits

Author SHA1 Message Date
Alex Dusenbery
e5fd43264d EDUCATOR-4307 | Don't bother with celery to run expire waiting enrollments command. 2019-06-03 13:08:59 -04:00
David Ormsbee
12d893862c Merge pull request #20632 from tanyaxp/progress-certificates-title
Remove the word "Student" from the progress title.
2019-06-03 10:33:48 -04:00
Kyle McCormick
c487b9a384 Change 'withdrawn' status to 'canceled' in program_enrollments
This makes the LMS program_enrollments API compatible with the
Registrar programs API, as specified in the Master's partner
integration guide.

EDUCATOR-4389
2019-06-03 10:16:19 -04:00
alangsto
4a1346b068 INCR-265 Run python-modernize on lms/djangoapps/courseware/management and lms/djangoapps/courseware/tests (#20716)
* updated files according to INCR-265

* fixed docstring and line-length problems from quality test

* Revert "fixed docstring and line-length problems from quality test"

This reverts commit d050f55a4ecfaa38f46b80ec4bb85ff399a79a8c.

* fixed errors reported in quality report

* had error, fixed it

* reversed change

* fixed over/under indentation, and added line to import.py that Ned had suggested

* tried disabling pylint for this line

* testing new email

* testing email in different window

* re-added symlink and docstring
2019-05-31 14:07:18 -04:00
Andytr1
9e01a9e2aa Merge pull request #20727 from edx/Andytr1-patch-1
Update testing.rst
2019-05-31 13:16:35 -04: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
Andytr1
c9f958279e Merge pull request #20703 from edx/andytr1/waffle_for_proctored_test
waffle flag - test_settings.show_review_rules
2019-05-31 11:07:58 -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
Andytr1
10cf20235b Update testing.rst 2019-05-31 09:23:20 -04:00
David Joy
6327b00575 Merge pull request #20683 from caesar2164/cleanup-bootstrap-footer
Make platform bootstrap footer match other footer
2019-05-30 14:55:50 -04:00
Feanil Patel
be1d0197ee Merge pull request #20724 from edx/feanil/fix_test_repo_reference
Use our fork of this repo instead of the mitocw one.
2019-05-30 14:53:58 -04:00
Feanil Patel
9ebcf758df Use our fork of this repo instead of the mitocw one. 2019-05-30 13:43:04 -04:00
Dave St.Germain
9c8ed25001 Merge pull request #20722 from edx/dcs/when-now
Bumped edx-when
2019-05-30 11:43:52 -04:00
Dave St.Germain
49b5b88a30 Bumped edx-when 2019-05-30 10:48:38 -04:00
Giulio Gratta
7819a2d5d7 Mark alt text for translation 2019-05-30 07:40:23 -07:00
Giulio Gratta
dddfac8380 Make platform bootstrap footer match other footer
Changes:
- Add logo back
- Fix up spacing
- Change font sizes and color
2019-05-30 07:40:23 -07:00
irfanuddinahmad
69496576ee Merge pull request #20665 from edx/iahmad/ENT-1634-Remove-linking-enterprise-SSO-accounts-to-existing-users-via-username-lookup
ENT-1634 user existence check updated to use email only
2019-05-30 13:25:08 +05:00
irfanuddinahmad
53265d506e user existence check updated to use email only 2019-05-30 12:30:14 +05:00
Waheed Ahmed
78f6135e5e Merge pull request #20717 from edx/geoip2-bot-update-country-database2019-05-29
geoip2: update maxmind geolite country database
2019-05-30 12:08:05 +05:00
edX Transifex Bot
b11affc5e3 geoip2: update maxmind geolite country database 2019-05-29 20:33:12 +00:00
Nimisha Asthagiri
ba4921b538 Merge pull request #20710 from edx/bom/course-experience-readme
README for course_experience
2019-05-29 15:33:53 -04:00
Nimisha Asthagiri
407438970b Merge pull request #20709 from edx/bom/certificates-readme
README for certificates
2019-05-29 15:33:03 -04:00
Nimisha Asthagiri
a8e3624d9f Merge pull request #20711 from edx/bom/commerce-readme
README for commerce and shoppingcart
2019-05-29 14:12:03 -04:00
Nimisha Asthagiri
54bf50e429 Merge pull request #20707 from edx/depr/microsites-static-template-view
Remove microsites from static_template_view
2019-05-29 14:11:38 -04:00
Natalia Berdnikov
8d41aa2ea9 Merge pull request #20687 from eduNEXT/lmm/proctored_translation
Mark missing string for internationalization
2019-05-29 12:57:14 -04:00
emma-green
8615b1b0ac Merge pull request #20661 from edx/emma-green/REVEM-355/add-arch-decision
add arch decision of computation of course-user discount
2019-05-29 12:08:21 -04:00
edX cache uploader bot
97c8c176a6 Updating Bokchoy testing database cache (#20715) 2019-05-29 11:43:06 -04:00
Nimisha Asthagiri
ad608bea67 Merge pull request #20706 from edx/depr/microsites-shopping-cart
Remove microsites from shoppingcart
2019-05-29 11:00:40 -04:00
Nimisha Asthagiri
c0c17601c0 Merge pull request #20705 from edx/depr/microsites-certificates
Remove microsites from certificates
2019-05-29 10:58:24 -04:00
Nimisha Asthagiri
feaacef3f3 Remove microsites from static_template_view
DEPR-28
2019-05-29 10:38:00 -04:00
Nimisha Asthagiri
5c3dbaa588 Merge pull request #20708 from edx/depr/microsites-user_authn
Remove microsites from user_authn
2019-05-29 10:30:33 -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
Emma Green
95c15495dd add arch decision of computation of course-user discount 2019-05-29 10:21:46 -04:00
edX cache uploader bot
b4df3a10f4 Updating Bokchoy testing database cache (#20713) 2019-05-29 09:55:53 -04:00
Zia Fazal
34777350d4 Merge pull request #20712 from edx/ziafazal/WL-1927
Bumped edx-enterprise version and added cornerstone app
2019-05-29 15:11:21 +05:00
Zia Fazal
504decf345 Bumped edx-enterprise version and added cornerstone app 2019-05-29 14:21:09 +05:00
Nimisha Asthagiri
aee2d36580 Remove microsites from certificates
DEPR-26
2019-05-29 03:15:53 -04:00
Nimisha Asthagiri
9e4a98b712 README for commerce and shoppingcart 2019-05-29 03:12:59 -04:00
Nimisha Asthagiri
5945d1dcee README for course_experience 2019-05-29 03:00:19 -04:00
Nimisha Asthagiri
1118c2bef7 README for certificates 2019-05-29 02:49:41 -04:00
Nimisha Asthagiri
3eb5783f51 Remove microsites from shoppingcart
DEPR-27
2019-05-29 02:23:51 -04:00
Nimisha Asthagiri
5b29672ed1 Remove microsites from user_authn
DEPR-30
2019-05-29 02:20:42 -04: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
Luis Moreno
0996cd8642 Mark missing string for internationalization 2019-05-28 15:28:44 -04:00
Nimisha Asthagiri
d3b79ae5f7 README for enrollments app 2019-05-28 15:28:15 -04:00
Nimisha Asthagiri
9127075bcf Fix Pylint for enrollments 2019-05-28 13:25:02 -04:00
Ned Batchelder
2de1e99586 Merge pull request #20701 from edx/nedbat/fix-one-message
Move a message to make it extractable
2019-05-28 13:07:32 -04:00
Stu Young
13e624a50b INCR-307 Run python-modernize on lms/djangoapps/discussion/rest_api (#20618)
* run python modernize

* run isort

* Fix quality
2019-05-28 12:51:49 -04:00
Stu Young
22856fdc1a INCR-315 (#20610): python-modernize lms/djangoapps/grades/tests
* run python modernize
* run isort
* fix pylint issues
2019-05-28 11:21:34 -04:00