Commit Graph

51562 Commits

Author SHA1 Message Date
Omar Al-Ithawi
ceacfc8a75 edX-ACE support for email change messages 2018-10-08 20:43:09 +03:00
Troy Sankey
f9488a8502 Merge pull request #19043 from edx/pwnage101/also-prevent-retired-email-reuse-via-account-settings-PLAT-2334
Prevent retired email reuse via account settings
2018-10-05 13:59:20 -04:00
Simon Chen
8293c17086 Merge pull request #19069 from edx/schen/LEARNER-3500
Default the ENFORCE_FREEZE_GRADE_AFTER_COURSE_END  waffle flag to be on
2018-10-05 13:36:14 -04:00
Michael Terry
c90edab169 Bundle an SQL query for performance
We were doing many individual SQL queries for certificates when
awarding program certs. It's possible this was contributing to
high SQL load. Instead, let's bundle those queries up into a larger
one.

LEARNER-6490
2018-10-05 12:43:47 -04:00
John Eskew
e493781996 Add user retirement warning text about email retirement. 2018-10-05 11:56:39 -04:00
Simon Chen
929ca61e6c Default the waffle flag to be on 2018-10-05 11:54:04 -04:00
Diana Huang
1f506fb09f Merge pull request #19050 from edx/diana/password-reset-email
Send password reset email after password compliance failure.
2018-10-05 09:37:07 -04:00
Troy Sankey
5b9bb005bd Prevent retired email reuse via account settings
PLAT-2334
2018-10-04 15:38:03 -04:00
Diana Huang
02c15bf563 Refactor password reset email and send after failure. 2018-10-04 15:22:24 -04:00
Robert Raposa
79b2992fe1 Merge pull request #19055 from edx/robrap/ARCH-233-jwt-auth-middleware
ARCH-233: Add JWT Auth Middleware.
2018-10-04 10:38:52 -04:00
Michael Youngstrom
b6f223ef80 Merge pull request #19057 from edx/youngstrom/fix-xdist-flaky-query-counts
Cache WaffleSwitch data to avoid query count failures with pytest-xdist
2018-10-04 10:36:22 -04:00
emma-green
53adc395b5 Merge pull request #19053 from edx/emma-green/bundle-discount-adding-type-and-title
rev-bundle-discount
2018-10-04 09:44:31 -04:00
Simon Chen
4132eb3fcd Merge pull request #19026 from edx/naa/freeze-grades
Stop-gap implementation to freeze grades 30 days after course end
2018-10-04 08:55:01 -04:00
Rabia Iftikhar
2075218919 Merge pull request #19034 from edx/ri/EDUCATOR-3514-download-student-profile-info
EDUCATOR-3514 increase the length of task_input while creating instance of InstructorTask
2018-10-04 17:18:04 +05:00
Nimisha Asthagiri
ddafbb0d29 POC: Stop-gap implementation to freeze grades. 2018-10-04 08:13:35 -04:00
Saleem Latif
44575e2b97 Merge pull request #19059 from edx/saleem-latif/ENT-1199
ENT-1199: edx-enterprise version upgrade to 0.73.6
2018-10-04 16:16:18 +05:00
Hasnain Naveed
6c31a78f3d Merge pull request #19001 from edx/hasnain-naveed/WL-1645
WL-1645 | Suppressing Error Alerts for WL Programs without Program Ce…
2018-10-04 13:29:20 +05:00
Saleem Latif
f3664d4d3e edx-enterprise version upgrade to 0.73.6 2018-10-04 12:38:08 +05:00
stv
9112de2309 Deprecate ImageModal HtmlModule
Stop displaying the template in CMS.

This has no effect on already-existing components; it merely prevents
new components from being created with this template.

All functionality has been replaced by the XBlock version [1][2].

Backstory:

This was written by Stanford, circa 2013; it was always a bit of
a hack. While it masquerades as if it were an XBlock/XModule, it's
really a YAML template for the HTML module. It depends on JS/CSS
that is embedded as a first-class citizen of the platform. This has
all caused confusion. Worse, it's a pain to edit/configure/update,
since it uses none of the XBlock infrastructure.

Nearly two years ago, we XBlock-ified the component and have
been running it ever since [1][2]. As such, we no longer support
this "component" and would suggest edX follow suite. Consider this
a request-for-comments on the path forward.

Process:

Deprecation of this module would follow a few steps:

1. Prevent new components from being added in Studio with this template.
    - This PR represents step 1.
    - This is backward compatible; it will have no effect on
      existing components.
2. (optional) Install the XBlock version.
    - This allows new ImageModal components to be added, now via the
      XBlock.
3. (optional) Identify and convert existing HTML modules to XBlocks [3].
    - We have enough of the legacy components in use that we can't
      just break support by removing this feature; we need a
      conversion process.
    - Because these are really just HTML modules with special
      contents, we have to query based on file contents (see, I told
      you this thing was hacky!):
        - All such components must contain an HTML anchor tag with
          the class `modal-content`.
    - Beyond the query, we don't intend to automate the actual
      conversion. Our use of the original component is limited
      enough that it's probably not worth converting from one module
      type to the other. Exacerbating the situation, because it's
      HTML, other changes could have been made to the module that
      would prevent automatic parity. As such, we'll work with our
      CoureOperations team to convert these manually at Stanford.
4. Remove all references.
    - At this point, we can safely remove all supporting static
      assets like CSS, JS, etc.
5. Enjoy less technical debt.

[1] https://github.com/Stanford-Online/xblock-image-modal
[2] https://pypi.python.org/pypi/xblock-image-modal/
[3] The one saving grace of the legacy component is that it was designed
    to degrade gracefully. Specifically, the HTML itself is just an
    image inside a link. The extra platform JavaScript progressively
    enhances the display, if the relevant CSS classes are found. As
    such, even if you removed all supporting CSS/JS from the platform
    tomorrow, existing legacy components would simply render as an image
    that links to a larger copy of itself. This is deemed an acceptable
    failure mode; graceful degradation FTW!
2018-10-03 16:47:38 -07:00
Emma Green
fcc1b55496 rev-bundle-discount 2018-10-03 17:20:43 -04:00
Michael Youngstrom
0744c0f99c Cache waffleswitch data to avoid query count failures 2018-10-03 17:09:30 -04:00
Robert Raposa
3e3c1333f0 Add JWT Auth Middleware.
From edx-drf-extensions:
1. EnsureJWTAuthSettingsMiddleware: Ensures proper JWT auth settings
   for endpoints.
2. JwtAuthCookieMiddleware: Combines the JWT auth cookie parts into a
   JWT auth cookie.

ARCH-233
2018-10-03 16:26:05 -04:00
Robert Raposa
eca340d2e1 Merge pull request #18989 from edx/robrap/ARCH-241-logout-redirect
ARCH-241: Add ability to redirect to subdomain for logout.
2018-10-03 15:06:11 -04:00
J Eskew
d447c6c9b5 Merge pull request #19045 from edx/jeskew/PLAT_2146_again_add_username_retirement_check
Check for retired usernames as well as existing ones in validation.
2018-10-03 14:57:50 -04:00
Farhanah Sheets
0daf16852d Merge pull request #19040 from edx/fsheets/bump-sfe
bump studio-frontend to 1.16.12
2018-10-03 14:28:42 -04:00
Robert Raposa
027c53e61e Add ability to redirect to subdomain for logout.
ARCH-241
2018-10-03 12:13:14 -04:00
Douglas Hall
602d2fb221 Merge pull request #19044 from edx/douglashall/csrf-protection-decision
Add decisions record related to frontend apps and CSRF protection.
2018-10-03 12:11:08 -04:00
Douglas Hall
dec77f2ad3 Add decisions record related to frontent apps and CSRF protection. 2018-10-03 11:28:58 -04:00
Hammad Ahmad Waqas
db73d99da6 Merge pull request #19033 from edx/hammad/WL-1798
Hammad/WL-1798 Participants not able to move on to course assignments from pre-assessment
2018-10-03 19:11:44 +05:00
Cory Lee
257768c8a4 Merge pull request #19039 from edx/devops/move_tasks_to_more_appropriate_queues
Move tasks to non-default queues
2018-10-03 09:56:04 -04:00
Cory Lee
282bab3e90 Merge pull request #19041 from edx/coryleeio/remove_unneeded_log_config
Removing broken log config
2018-10-03 09:40:24 -04:00
Farhanah Sheets
e009d5e4db bump studio-frontend to 1.16.12 and update bokchoy tests 2018-10-03 09:36:55 -04:00
Hammad Ahmad Waqas
c7a8ddedea excluding html blocks form adding in computable blocks for completion 2018-10-03 17:18:23 +05:00
rabiaiftikhar
667bf488d9 EDUCATOR-3514 increase the length of task_input while creating instance of InstructorTask 2018-10-03 12:16:40 +05:00
Nimisha Asthagiri
1c1088358c Merge pull request #19031 from edx/arch/login-service-migration
Login service user creation - data migration
2018-10-02 20:45:42 -04:00
John Eskew
aacdce17d4 Check for retired usernames as well as existing ones in validation. 2018-10-02 17:23:11 -04:00
Cory Lee
bd6e060ea7 Use production.py instead of aws.py 2018-10-02 17:02:07 -04:00
Robert Raposa
4a0bda7690 Merge pull request #18988 from edx/robrap/ARCH-238-login-redirect
ARCH-238: Add ability to redirect to subdomain for login.
2018-10-02 16:34:13 -04:00
Robert Raposa
23b9cfd76c Add whitelist for login redirect.
Use LOGIN_REDIRECT_WHITELIST to provide a whitelist of
additional domains to which login will now redirect.

ARCH-238
2018-10-02 16:00:55 -04:00
Cory Lee
93dcfa01f4 Update tasks.py 2018-10-02 15:08:10 -04:00
Cory Lee
8d36e8b4ab Remove unecessary bits 2018-10-02 15:06:36 -04:00
Cory Lee
fb281ae9c8 Remove unnecessary specification 2018-10-02 15:05:56 -04:00
Cory Lee
0f63f4c643 Remove unnecessary import 2018-10-02 15:05:26 -04:00
Cory Lee
8c15a5794e Remove accidentally added line 2018-10-02 15:01:54 -04:00
Cory Lee
14ed6cf682 Prepare to remove low priority queue, replacing with default 2018-10-02 14:37:31 -04:00
Michael Youngstrom
912ec712ea Merge pull request #19029 from edx/youngstrom/xdist-flaky-mock
Fix xdist flakiness in test_signals.py
2018-10-02 14:03:16 -04:00
Stu Young
a67a47aa75 Merge pull request #19038 from edx/estute/fetch-correct-target-branch
fetch correct target branch for diff jobs
2018-10-02 13:39:26 -04:00
Cory Lee
84e1076a11 Move certificate task to low priority queue 2018-10-02 13:37:46 -04:00
Joseph Mulloy
1533623a0d Move tasks to low priority queue from default 2018-10-02 13:27:44 -04:00
Fred Smith
eae5a8117f move instructor tasks to low priority queue 2018-10-02 13:26:36 -04:00