Commit Graph

13 Commits

Author SHA1 Message Date
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