Commit Graph

83 Commits

Author SHA1 Message Date
Shadi Naif
1b83f24d3c Convert the (Email Change Confirmation) message to use edx-ACE
Basically, this was done by:
1. Adding new class type in [common/djangoapps/student/message_types.py]
2. Adding new files for the ace template in a new directory named
    [common/templates/student/edx_ace/emailchangeconfirmation]
3. Removing old template files
    [confirm_email_change.txt] and [email_change_subject.txt]
    from the directories:
    [lms/templates/emails] and
    [common/test/test_sites/test_site/templates/emails]
4. Converting the [confirm_email_change] code to use [ace.send()]
2019-02-27 16:22:16 +02:00
Omar Al-Ithawi
ceacfc8a75 edX-ACE support for email change messages 2018-10-08 20:43:09 +03:00
Omar Al-Ithawi
6ff3235f84 Convert instructor email messages to ACE 2018-09-25 17:51:10 +03:00
uzairr
af81113acf Update verification status emails
Previously Verfication status emails are sent using sail-thru.Now,
Separate templates are added in the platform that will be used to
sent status emails to the learners.

LEARNER-5931
2018-08-16 17:50:41 +05:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
2018-06-05 13:59:09 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Gabe Mulley
5fa6c51368 Revert "Use edx-ace for the password reset email" 2018-05-10 13:06:52 -04:00
Omar Al-Ithawi
556c8b86d0 Use edx-ace for password reset email 2018-05-08 18:53:31 +03:00
uzairr
dfb295fe38 Send verification status email through sailthru
Support needs to inform a learner different states of its
id-verification.In order to achieve it email will be sent
to learner about its verification state using sailthru.

LEARNER-617
2018-05-07 12:30:47 +05:00
uzairr
c6a951796a Send email for the failed verification status
Support Team need to handle bulk of tickets every month
about the verification status of learners.To avoid it,
suitable changes have done to send verification email
to the learner.

LEARNER-1488
2018-04-20 13:12:56 +05:00
Uzair Rasheed
e0d20be11d Merge pull request #17912 from edx/LEARNER-1487/send_successfull_verification_email
Send verification email status
2018-04-18 12:09:42 +05:00
uzairr
ad7fb01883 Edit email acknowledging photo-submission
To add more context,content of the acknowledging
email of photo-submission is updated so that a learner aware of
the whole process.

LEARNER-4048
2018-04-12 13:48:52 +05:00
uzairr
d85dc4532e Send verification email status
Support Team need to handle bulk of tickets every month about the
verification status of learners.To avoid it,suitable changes have
done to send verification email to the learner.

LEARNER-1487
2018-04-12 11:47:49 +05:00
Ahsan Ulhaq
0ed84584bf Revert "Send email to learners to inform verification status"
This reverts commit 0865e52c32.
2018-04-07 00:23:11 +05:00
uzairr
0865e52c32 Send email to learners to inform verification status
Support Team need to handle bulk of tickets every month about
the verification status of learners.To avoid it,suitable changes
have done to send verification email to the learner.

LEARNER-1487
2018-04-05 15:17:49 +05:00
George Song
06c9826904 Merge pull request #14845 from Salomari1987/salah/password_reset_email_subject
Use platform_name instead of site_name in password reset email
2017-07-13 05:52:21 -07:00
Omar Al-Ithawi
8816b85464 Use the marketing contact us page in email confirm change message 2017-07-10 10:24:49 -04:00
Salah Alomari
8dba6c49a6 Use platform_name instead of site_name in password reset email subject 2017-06-28 02:30:58 +03:00
Douglas Hall
d22afb8c92 Fix formatting issues with LMS account activation email.
This removes extra whitespace in the body of the LMS account activation email.

ENT-388
2017-05-16 12:53:43 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
2016-07-27 13:55:14 +05:00
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Douglas Hall
51d8580982 Fix default from email lookups 2016-06-22 13:54:57 -04:00
Douglas Hall
7b86da02f7 Check theme overrides when retrieving platform name from settings 2016-06-22 13:54:57 -04:00
Saleem Latif
14572c19d4 Create a theme named 'stanford-style' to be used by comprehensive theming 2016-02-04 11:17:23 +05:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Peter Fogg
238968c3cd Add mailing address to activation email form.
ECOM-3318
2015-12-30 13:30:43 -05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
2015-12-22 11:52:04 -05:00
Amir Qayyum Khan
e15732114d Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members 2015-09-01 13:22:50 +05:00
unknown
88a038aa1e Fixed email parm function for CCX email
modified:   lms/djangoapps/instructor/tests/test_enrollment.py
2015-08-24 20:34:11 +05:00
Awais
424e1f5b3c ECOM-1572 implementing code to new branch. 2015-06-08 23:23:23 +05:00
Sylvia Pearce
2c7405940e Update enrollment code confirmation emails 2015-06-03 16:35:23 -04:00
aamir-khan
a975b8384c ECOM-1476: sending email on software secure response initial work 2015-05-07 18:56:49 +05:00
Chris Dodge
768dd92256 fix I18N errors in business order confirmation email 2015-04-13 09:39:07 -04:00
Will Daly
c37dc913a0 Copy changes to the activation email 2015-03-18 13:45:15 -04:00
Will Daly
79ffa0f57f Merge pull request #6838 from edx/will/fix-translator-comments-in-email
ECOM-1018: Fix translator comments showing up in redeem code email.
2015-01-30 17:47:16 -05:00
Will Daly
bf68daa46b Fix translator comments showing up in redeem code email.
Fix newlines in redeem code email.

Update copy to make sense for edx.org as well as white label.
2015-01-30 15:28:47 -05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
2015-01-29 10:56:25 -05:00
David Baumgold
0ec4855909 clean up reject_name_change email template a bit 2015-01-07 13:38:38 -05:00
Will Daly
a90f7ab1bf Enter the new verification / payment flow using a GET param
Allow disabling of experiment
2014-12-30 13:36:25 -08:00
Renzo Lucioni
1e4f890120 Send confirmation email on successful photo submission 2014-12-18 18:27:05 -05:00
Renzo Lucioni
dfcbcd5435 Add a verification reminder to order confirmation emails 2014-12-16 10:28:33 -05:00
Sarina Canelake
dc972eb2d6 Add additional context for translators 2014-12-02 20:56:08 -05:00
Sarina Canelake
6539a6e0fc Keep closing lines of email together for translation purposes 2014-12-02 20:56:07 -05:00
Muhammad Shoaib
9fddc6946a WL-163-added-the-USD-symbol-himBHin-the-HTML-templates-configuration-settings
added the unit tests for the default currency settings
2014-11-27 17:05:19 +05:00
asadiqbal08
1035d67a25 WL-98
fix typo and add more security on API

fix some bugs and typos

address PR feedback

be sure to send emails when accounts already exist

PR feedback

fix multiple uploads

pep8 fixes

pep8 fix

pylint fixes

fix url mapping

WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions

updated the UI of the auto_enroll feature

fixed the errors

PR feedback

add test

add back file filtering

add some more error handling of input

remove unneeded coffeescript code

pylint fixes

add pep8 space

WL-98
- Updated and added test cases.
- Updated membership coffee file for errors display handling.
- fixed minor text issues.

allow for blank lines and add a test

add blank line (pep8)
2014-10-21 14:23:46 -04:00
asadiqbal08
4f7c494922 EX-71 New shopping Cart UI Single person purchase
Ex-74 Registration Code redemption

fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations

Ex-72-added additional billing information

Added a new CSV file in the instructor dashboard sales tab to download all the order sales separated from the invoice sales

fix path to image

updated the failed unit tests and add some minor tweaks in the Shoppingcart.scss

Ex-78 New UI In receipt page

EX-73 Purchasers can buy a course on behalf of a different student

WL-78 updated the receipt page UI.

Wl-72 updated Billing Information UI and removed the Order Address fields

WL-71 Remove Purchase Type Buttons from UI

WL-71 Updated minor UI issues and updated test cases

WL-78 updated the enrollment links in the receipt page

made changes in Order generated sales csv in Instructor Dashboard.
 The total_registration_codes and total_used_codes
  were not correctly stored in the csv file.

1) The total_registration_codes were not filtered with
 course_id.
2) The total_used_codes that a user had redeemed
 were not correctly included in the CSV.

added a fix in the courseware view to let the users visit the courseware if they have enrolled in the course by clicking on the enrollment link

rebase and resolved conflicts with master

WL-97 Bulk Registration Email Confirmation
Below is the commit summary.
- Make email text bold as per requirement.
- Improve email template quality and reorder points.
- Add text in billing details page : "if no additional billing details are populated the payment confirmation will be sent to the user making the purchase"
- Update text on receipt page "You have successfully purchase 3 course registration codes"

WL-100 fixed the bug on the edit/add coupon and set course price.
Ajax requests were duplicating in each callback. fixed this issue by creating the manual ajax request rather than the Lean Modal Ajax requests

allow for better White Label branding in shopping cart purchase emails

fix up typos and text

fix goof

fix

fix

incorporated model changes as suggested by Jason.

updated order sales csv

updated test cases for CourseRegCodeItem model and csv for the order generated sales

updated the migrations history

fixed the lms acceptance tests

Be sure to check for multiple types

address PR feedback

PR feedback

PR feedback

pep8 fix
2014-10-19 21:50:29 -04:00
Chris Dodge
0c72e37374 change registration code email and attachments, per product requirements
remove extra lines

conditionalize address line 2
2014-09-24 09:13:37 -04:00
Sarina Canelake
046b9b156c Fix link in account activation email 2014-09-03 12:10:24 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00