Commit Graph

20747 Commits

Author SHA1 Message Date
Joseph Mulloy
c870ec3872 Fix pylint warnings OPS-3450 2018-10-01 14:54:58 -04:00
Cory Lee
688968e8c8 Add production.py OPS-3450 2018-10-01 14:54:55 -04:00
Cory Lee
e145049f46 Add deprecation warning to aws.py OPS-3450 2018-10-01 14:54:50 -04:00
Nimisha Asthagiri
31a1ad4a09 Merge pull request #18999 from edx/arch/refactor-jwt-builder
JWT Cookies
2018-10-01 13:45:15 -04:00
Nimisha Asthagiri
02ba5fb0e8 Login service support for JWT Cookies 2018-10-01 13:08:40 -04:00
Ahsan Ulhaq
ee7555e85f update usage of SessionAuthenticationAllowInactiveUser
LEARNER-6469
2018-10-01 17:52:52 +05:00
Kaushik Varanasi
17de614665 added fix for broken 'enroll in class' button on about course page in safari browser full screen 2018-09-30 17:56:06 +05:30
David Ormsbee
5f97cecefb Remove course publish from CCX data migration.
This removes the portion of the CCX course names data migration
that triggers course publishing. While course publishing is the
desired behavior, doing so within the migration makes it so that
this migration is not practical to run if you have hundreds or
thousands of CCX courses (we run out of memory).

By doing the data migration without the accompanying course
publishes, this means that CCX course names will still show up
incorrectly for courses until there is an edit or publish of
either that CCX course or the underlying course that the CCX
course extends. But we at least set up the data so that it's
gradually self-correcting over time, and do so with little coding
effort or operational risk/weirdness.

A more comprehensive fix for this would involve:

* Fixing the memory leak around CourseOverviews creation and/or;
* Moving CourseOverview generation to happen asynchronously and/or;
* Being more careful about transactionality in the data migration
  and running it repeatedly until it all passes.

Full details of our migration issues are at:

https://github.com/edx/edx-platform/pull/18808#issuecomment-422930820
2018-09-28 18:54:14 -04:00
Ned Batchelder
f2dac46681 Merge pull request #18475 from appsembler/omar/ace-enroll-email
Convert instructor email messages to ACE
2018-09-27 16:44:08 -04:00
Diana Huang
8c589dcf34 Merge pull request #19006 from edx/diana/update-login-registration-tests
Registration deprecation: switch existing tests to use the newer endpoint.
2018-09-27 15:52:55 -04:00
Attiya Ishaque
5c8d594518 Merge pull request #18849 from edx/aj/fix-bulk-email
Skip sending email if an email address contains non-ascii char.
2018-09-27 23:51:10 +05:00
Feanil Patel
17d8410b41 Merge pull request #18985 from edx/feanil/remove_lms_migrate
Remove tools that don't seem to be used.
2018-09-27 14:26:05 -04:00
Awais Jibran
ac3c274d57 Skip sending email if an email address contains non-ascii char. 2018-09-27 22:45:15 +05:00
Diana Huang
deb8bd47d9 Switch existing tests to use the newer endpoint. 2018-09-27 13:33:42 -04:00
Ahsan Ulhaq
39f48a8c10 Reduce query to user table
LEARNER-6336
2018-09-26 17:16:42 +05:00
Omar Al-Ithawi
6ff3235f84 Convert instructor email messages to ACE 2018-09-25 17:51:10 +03:00
hamzamunir7300
636ce3b7d7 Merge pull request #18883 from edx/LEARNER-3832
Account Page refreshes on autosave/combobox Language value change
2018-09-25 18:04:54 +05:00
Bill DeRusha
e878b9fb0e Merge pull request #18978 from edx/bderusha/unGDPRfix
Set usable password when canceling user retirement
2018-09-21 15:19:48 -04:00
Bill DeRusha
b43b174fdd Set usable password when canceling user retirement 2018-09-21 14:18:57 -04:00
Matthew Piatetsky
e1d2169f70 Merge pull request #18977 from edx/prevent_activation_time_error
prevent activation time error
2018-09-21 12:21:11 -04:00
Feanil Patel
e1e06afc20 Remove the rest of the lms_migration django app.
The management commands don't seem to be used anywhere and if we remove
that, then there is nothing left in this app.
2018-09-21 11:22:06 -04:00
Feanil Patel
58139bfcdb Remove tools that don't seem to be used.
These views and tools don't seem to be enabled and I think it's safe to
say that we have migrated to LMS+CMS.
2018-09-21 10:37:48 -04:00
Feanil Patel
8bcdc65e4c Remove the cybersource processor that was deprecated in 2014. 2018-09-20 13:54:27 -04:00
Matthew Piatetsky
f738e74e7e prevent activation time error 2018-09-19 17:06:15 -04:00
Cali Stenson
46a4bdb115 Override change password urls in django admin.
LEARNER-4928
2018-09-18 17:11:49 -04:00
Diana Huang
f88415f89a Merge pull request #18970 from edx/diana/override-admin-templates
Override admin templates to remove links that allow admin users to change passwords
2018-09-18 14:53:22 -04:00
Diana Huang
0fb8f08d2e Override admin templates to remove links that allow admin users to change
passwords.

LEARNER-4928
2018-09-18 13:43:30 -04:00
edx-pipeline-bot
89963efd3a Merge pull request #18968 from edx/release-mergeback-to-master
Merge release back to master
2018-09-18 12:56:07 -04:00
Ned Batchelder
0dcd1b3339 Merge pull request #18962 from edx/nedbat/remove-setup-args
No need for superstitious kwargs
2018-09-18 12:07:58 -04:00
Taranjeet Singh
b06b2136a8 Update log message. 2018-09-18 17:46:44 +05:30
Taranjeet Singh
02be16dff8 Handle exception while saving course display name.
This commit introduces error check for a special case
where the root course does not exists and a data migration
is attempting to save it.
2018-09-18 16:06:53 +05:30
Hamza Munir
97106e78b3 Account Page refreshes on autosave/combobox Language value change
Passing the next field id to focus the next field automatically after the page
reload due to the language selection.

LEARNER-3832
2018-09-18 14:47:19 +05:00
Ned Batchelder
93d4af35bd No need for superstitious kwargs 2018-09-17 17:01:11 -04:00
Kevin Falcone
4e8b179ac2 Merge pull request #18651 from edx/robrap/ARCH-180-dot-upgrade-all-steps
ARCH-180: Upgrade DOT to 1.1.2
2018-09-17 16:00:20 -04:00
Squirrel18
7533fe92e1 Add dir attribute for xblock RTL support. 2018-09-17 11:07:40 -05:00
ayub-khan
92b78e1dec updated-translations 2018-09-17 15:03:48 +05:00
Nimisha Asthagiri
e2ff1ec537 Merge pull request #18917 from edx/arch/user-authn-app
Consolidate user login and authentication code
2018-09-15 10:00:51 -04:00
Nimisha Asthagiri
8cf44283c9 Consolidate user login and authentication code 2018-09-15 03:21:39 -04:00
Waheed Ahmed
32c29b0d8f Merge pull request #18924 from edx/waheed/LEARNER-6356-escape-reset-password-error-msgs
Escape validation error messages on reset password page.
2018-09-14 15:06:00 +05:00
Kevin Falcone
488c7f2d10 Merge pull request #18927 from edx/jibsheet/change-DOT-expiry-window
Come down from 6 months to 3 months
2018-09-13 11:08:44 -04:00
David Ormsbee
4057190435 Merge pull request #18808 from open-craft/opencraft/taranjeet/fix-child-course-display
Fix incorrect course name displayed for CCX courses.
2018-09-13 10:53:35 -04:00
Kevin Falcone
71859e8403 Come down from 6 months to 3 months 2018-09-13 10:39:22 -04:00
Robert Raposa
c7800acaa0 Restore "Upgrade DOT to 1.1.2."
This upgrades DOT by reverting the revert.

This reverts commit 4d8b9c3

ARCH-180
2018-09-13 09:54:30 -04:00
Waheed Ahmed
00c7cce1d8 Escape validation error messages on reset password page.
Properly escape validation error messages on reset password page while
passing to reactJS.

LEARNER-6356
2018-09-13 16:28:52 +05:00
J Eskew
7affa237df Merge pull request #18557 from mreyk/teltek/feature/improve-course-modes-configuration
OSPR: Improve Course Modes configuration
2018-09-12 15:52:48 -04:00
Nimisha Asthagiri
700a902b68 Cleanup and remove deprecated RequestCache Django app
ARCH-223
2018-09-12 14:39:11 -04:00
Brian Mesick
f9de1f1927 Merge pull request #18911 from edx/bmedx/add_unretire_button
Add admin UI to cancel pending retirements
2018-09-12 13:38:44 -04:00
mrey
9003a2dcde Allow to override COURSE_ENROLLMENT_MODES in AWS environment
Add more parameters to COURSE_ENROLLMENT_MODES to allow to display friendly mode name and more options

Fix python tests of PR #18557

PR #18557: Fix Diff Quality test line too long

PR #18557: Fix Diff Quality test unused-variable

Use six.iteritems() in COURSE_MODE_SLUG_CHOICES for future Python 3 compatibility
2018-09-12 17:35:57 +02:00
Taranjeet Singh
6931c3b7e1 Fix incorrect course name displayed for CCX courses.
This commit updates the course name for CCX course at Info, Course
and Instructor tabs.
2018-09-12 18:49:21 +05:30
bmedx
405a8ada59 Add admin UI to cancel pending retirements 2018-09-10 16:37:13 -04:00