Commit Graph

19481 Commits

Author SHA1 Message Date
rabiaiftikhar
aac430da34 EDUCATOR-3213 make Global EdX Staff able to view all forum posts 2018-10-10 12:01:23 +05:00
Ned Batchelder
6be27ed08d Merge pull request #18882 from appsembler/omar/ace-for-email-change
edX-ACE support for email change messages
2018-10-09 13:53:54 -04:00
emma-green
143a01915d Merge pull request #19066 from edx/emma.green/rev-bundling-fix-bundle-info
fix-bundle-info
2018-10-09 12:34:26 -04:00
Emma Green
5af901e016 fix-bundle-info 2018-10-09 09:27:15 -04:00
Omar Al-Ithawi
ceacfc8a75 edX-ACE support for email change messages 2018-10-08 20:43:09 +03:00
Diana Huang
02c15bf563 Refactor password reset email and send after failure. 2018-10-04 15:22:24 -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
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
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
Farhanah Sheets
e009d5e4db bump studio-frontend to 1.16.12 and update bokchoy tests 2018-10-03 09:36:55 -04:00
John Eskew
aacdce17d4 Check for retired usernames as well as existing ones in validation. 2018-10-02 17:23:11 -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
J Eskew
873eb40896 Revert "Check for username retirement in validation endpoint." 2018-10-02 11:10:21 -04:00
J Eskew
8dc4900eb0 Merge pull request #18990 from edx/jeskew/PLAT_2146_add_username_retirement_check
Check for username retirement in validation endpoint.
2018-10-01 15:04:46 -04:00
John Eskew
fba2a8b5dc Check for retired usernames as well as existing ones in validation. 2018-10-01 11:00:19 -04:00
Ahsan Ulhaq
ee7555e85f update usage of SessionAuthenticationAllowInactiveUser
LEARNER-6469
2018-10-01 17:52:52 +05:00
Matthew Piatetsky
ed6b27ff83 Merge pull request #19007 from edx/bundles_on_track_selection
bundles on track selection
2018-09-28 08:26:35 -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
Matthew Piatetsky
30c14b36ba bundles on track selection 2018-09-27 14:45:32 -04:00
Diana Huang
deb8bd47d9 Switch existing tests to use the newer endpoint. 2018-09-27 13:33:42 -04:00
Omar Al-Ithawi
6ff3235f84 Convert instructor email messages to ACE 2018-09-25 17:51:10 +03:00
Nimisha Asthagiri
0a88746aef Merge pull request #18980 from edx/arch/jwt-http-cookies
Refactor Login Cookies
2018-09-25 09:46:37 -04:00
Nimisha Asthagiri
b7deedfb36 Refactor Login Cookies 2018-09-25 09:12:08 -04:00
Stu Young
a531953543 Merge pull request #18984 from edx/testeng/bokchoy_auto_cache_update_5f06ea40003105ed26d042509c33f30d67aa5e6e
Bokchoy db cache update
2018-09-24 15:16:08 -04:00
edx-pipeline-bot
007869836c Merge pull request #18995 from edx/private_to_public_7a92944
Mergeback PR from private to public.
2018-09-24 12:07:56 -04:00
edx-cache-uploader-bot
5ca3418d9f Updating migrations 2018-09-24 11:54:27 -04:00
Calen Pennington
44c6936ecb Merge pull request #18950 from cpennington/fix-educator-3262-v4
Return an unresolved promise when loading javascript resource urls in…
2018-09-19 19:14:15 -04:00
Calen Pennington
5b7e59e02b Return an unresolved promise when loading javascript resource urls in ConditionalModule 2018-09-19 15:00:51 -04:00
Ned Batchelder
784594b41b Merge pull request #18961 from edx/nedbat/simplify-a-mixin
No need to keep self.tracker here
2018-09-18 18:32:30 -04:00
Stu Young
7701b28097 Merge pull request #18969 from edx/testeng/bokchoy_auto_cache_update_b480b115d499240404ff58542305060895d74c9a
Bokchoy db cache update
2018-09-18 14:54:43 -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
edx-cache-uploader-bot
07eadd46e1 Updating migrations 2018-09-18 13:46:15 -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
Peter Pinch
204a08271c Merge pull request #18158 from mitodl/pdpinch/undefined-var-error
More descriptive error messages for UndefinedVariable
2018-09-18 13:23:47 -04:00
Michael Youngstrom
e614b96082 Refactor PipelineRenderTest to avoid npm install 2018-09-18 10:08:00 -04:00
Peter Pinch
b43f2242ad more descriptive error messages for UndefinedVariable 2018-09-17 17:14:25 -04:00
Ned Batchelder
6a48195908 No need to keep self.tracker here 2018-09-17 16:48:14 -04:00
Agha Awais
dd610ac3e4 HTML editor bokchoy tests I 2018-09-17 08:21:52 +00: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
Amir Qayyum Khan
0e2febbce2 OLX export: Reverted url_name from a constant to course run
- New exported courses include course run information in:
  - `url_name` of root course node
  - file name of root node in course folder
  - root key name in policy.json
  - directory name inside policies folder

- when imported via management command, the OLX will overwrite an
available existing course with the same course key (i.e. same org,
course number and course run)
  - if there is no matching course, one will be created

- when imported via the studio web ui (or import API), the OLX will
replace the current course (no change in behavior)

- courses exported with this commit have been tested to import via
management command and studio web UI in hawthorn and ginkgo releases.
They should also work in prior releases, but have not been tested.
2018-09-14 14:50:40 +05:00
Dave St.Germain
a020c897e8 Merge pull request #18912 from edx/dcs/enroll-cohorts
Added the ability to assign learners to a cohort in the enrollment API.
2018-09-13 13:37:19 -04:00
Dave St.Germain
864f59ed1e Added the ability to assign learners to a cohort in the enrollment API. 2018-09-13 11:15:08 -04:00
edx-cache-uploader-bot
b26863ce60 Updating migrations 2018-09-13 11:14:26 -04:00
Calen Pennington
5b71d4408b Merge pull request #18902 from cpennington/fix-educator-3262-v3
Load all webpack chunks into fragments as correctly-typed resources
2018-09-13 10:11:26 -04:00