Commit Graph

59 Commits

Author SHA1 Message Date
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
Victor Shnayder
26d975c2f4 Update activation email text
Make it more active.  Adds a separate section for edX.org-specific copy,
because it's hard to make it generic.

LMS-11084
2014-08-25 12:09:47 -04:00
Sarina Canelake
d408f174e3 Wording for batch beta email add with autoenroll (LMS-2551) 2014-04-18 10:13:19 -04:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
louyihua
0316f3b758 i18n: make emails in lms translatable
The email texts in lms/templates/emails are not extracted by rake i18n:generate because the babel_mako.cfg does not include them.
And a several emails are not translatable because they do not use ugettext.
2014-03-26 22:33:21 +08:00
Sarina Canelake
8f24a5fd5e Batch add/remove beta testers on beta dash
LMS-1287
2014-03-18 16:08:59 -04:00
Ned Batchelder
ddf377cfb9 Remove unused massemail commands. 2014-02-01 07:41:16 -05:00
David Adams
ed980f2189 Port of invitation/enroll/unenroll email functionality
into beta dashboard.

Also includes new functionality, in both legacy and beta
dashboard, to include appropriate email text for a
Shibboleth course.
2013-11-15 10:10:04 -08:00
Adam Palay
4ed6ee64d3 fix typo in registration email [LMS-1419] 2013-10-30 14:59:13 -04:00
Jason Bau
667a1eadb5 Stanford paid course registration
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
2013-09-26 18:25:00 -07:00
Diana Huang
90951a7bdb Merge branch 'release'
Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py
2013-09-12 16:03:39 -04:00
Adam Palay
bc70b1d9da change formatting for email messages to use full_name instead of first_ and last_name
fix templates
2013-09-12 09:32:34 -04:00
Diana Huang
24efb4e8d6 Clean up text of Order Confirmation E-mail. 2013-09-09 15:56:01 -04:00
Diana Huang
20d72ea703 Clean up views and start work on edit name modal. 2013-09-05 15:20:48 -04:00
Diana Huang
a1373f4830 Update content of the order confirmation e-mail. 2013-09-04 15:17:08 -04:00
Diana Huang
f819137b30 Fix bracket bug. 2013-09-04 15:17:08 -04:00
David Adams
c8b2863a46 Slightly change email registration template
Added some text to guide the student to register with a particular email address.
    This is the one that was entered into the enrollment/invitation form by the instructor.
    Modified the template and associated test.
2013-08-29 15:27:30 -07:00
Diana Huang
1b5fde9dae Send email on purchase success. 2013-08-27 17:24:01 -04:00
dcadams
306ac48210 Email on enroll/un-enroll actions
Optionally email students on enroll/un-enroll actions
by instructor from enrollment tab in LMS.
2013-06-26 15:28:36 -07:00
Nate Hardison
2640ab49e0 Stanfordize LMS emails
Adjust language of LMS emails to work specifically for Stanford. Here
there be dragons: lots of ugly conditionals that will need to be
changed once we develop a way to "theme" arbitrary strings throughout
the site.
2013-06-05 10:27:25 -07:00
Nate Hardison
2c90948623 Use settings in LMS emails, not hardcoded values
Instead of hardcoding things like the platform name, use the
corresponding overrideable settings instead. This allows themes to
control emails as well.
2013-06-05 10:27:25 -07:00
David Ormsbee
ea8b9577ce Email wording changes based on Sarina's review 2012-10-18 14:28:15 -04:00
John Jarvis
517e6ddeda Contact email address updates 2012-09-06 09:26:52 -04:00
David Ormsbee
48e0e222d9 Changing email messages to be edX, even the ones I don't think will be sent. 2012-07-18 18:43:48 -04:00
Bridger Maxwell
c24c88022b Changed wording in emails to remove any 6.002x or MITx reference. 2012-07-18 10:36:55 -04:00