Commit Graph

27 Commits

Author SHA1 Message Date
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
Bridger Maxwell
70e2f7c0d5 Merged with master. Moved a bunch of static template files to their own urls (without /t/template). 2012-07-16 15:32:22 -04:00
Victor Shnayder
6e98255cd5 remove reference to course from signup email subject 2012-07-13 11:51:32 -04:00
John Jarvis
1a3549903c updating activation mail, adding Gemfile.lock to gitignore 2012-07-12 13:41:51 -04:00
John Jarvis
6df2226777 updating URL for activation email to edx4edx 2012-06-29 09:37:14 -04:00
ichuang
c5630e6d9f MITx -> edX in activation email 2012-06-26 23:09:52 -04:00
ichuang
c0581f8c86 fix subject in activation email - now uses course_title 2012-06-26 23:07:24 -04:00
ichuang
200e188c09 add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation
- issue is that content machine isn't whitelisted for email
 - this also provides secondary filtering for user registration
2012-06-26 23:00:25 -04:00
ichuang
caa14922bb edx4edx configuration running on content server. Notes:
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
  - email backend set
  - index page modified for edx4edx
2012-06-26 14:04:56 +00:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00