Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
6b6e5680
Commit
6b6e5680
authored
Oct 22, 2013
by
Adam Palay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove instances of @edx.org email addresses in our default settings
Bug: LMS-1363
parent
71ece15c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
15 deletions
+21
-15
cms/envs/common.py
+3
-3
cms/templates/404.html
+3
-1
cms/templates/500.html
+5
-1
lms/envs/common.py
+10
-10
No files found.
cms/envs/common.py
View file @
6b6e5680
...
...
@@ -195,9 +195,9 @@ IGNORABLE_404_ENDS = ('favicon.ico')
# Email
EMAIL_BACKEND
=
'django.core.mail.backends.console.EmailBackend'
DEFAULT_FROM_EMAIL
=
'registration@e
dx.org
'
DEFAULT_FEEDBACK_EMAIL
=
'feedback@e
dx.org
'
SERVER_EMAIL
=
'devops@e
dx.org
'
DEFAULT_FROM_EMAIL
=
'registration@e
xample.com
'
DEFAULT_FEEDBACK_EMAIL
=
'feedback@e
xample.com
'
SERVER_EMAIL
=
'devops@e
xample.com
'
ADMINS
=
()
MANAGERS
=
ADMINS
...
...
cms/templates/404.html
View file @
6b6e5680
...
...
@@ -11,7 +11,9 @@
<p>
${_('The page that you were looking for was not found.')}
${_('Go back to the {homepage} or let us know about any pages that may have been moved at {email}.').format(
homepage='
<a
href=
"/"
>
homepage
</a>
',
email='
<a
href=
"mailto:technical@edx.org"
>
technical@edx.org
</a>
')}
email=u'
<a
href=
"mailto:{address}"
>
{address}
</a>
'.format(
address=settings.TECH_SUPPORT_EMAIL,
))}
</p>
</section>
</div>
...
...
cms/templates/500.html
View file @
6b6e5680
...
...
@@ -11,7 +11,11 @@
<p>
${_("An error occurred in Studio and the page could not be loaded. Please try again in a few moments.")}
${_("We've logged the error and our staff is currently working to resolve this error as soon as possible.")}
${_('If the problem persists, please email us at {email}.').format(email='
<a
href=
"mailto:technical@edx.org"
>
technical@edx.org
</a>
')}
${_('If the problem persists, please email us at {email_link}.').format(
email_link=u'
<a
href=
"mailto:{email_address}"
>
{email_address}
</a>
'.format(
email_address=settings.TECH_SUPPORT_EMAIL,
)
)}
</p>
</section>
</div>
...
...
lms/envs/common.py
View file @
6b6e5680
...
...
@@ -437,12 +437,12 @@ IGNORABLE_404_ENDS = ('favicon.ico')
# Platform Email
EMAIL_BACKEND
=
'django.core.mail.backends.console.EmailBackend'
DEFAULT_FROM_EMAIL
=
'registration@e
dx.org
'
DEFAULT_FEEDBACK_EMAIL
=
'feedback@e
dx.org
'
SERVER_EMAIL
=
'devops@e
dx.org
'
TECH_SUPPORT_EMAIL
=
'technical@e
dx.org
'
CONTACT_EMAIL
=
'info@e
dx.org
'
BUGS_EMAIL
=
'bugs@e
dx.org
'
DEFAULT_FROM_EMAIL
=
'registration@e
xample.com
'
DEFAULT_FEEDBACK_EMAIL
=
'feedback@e
xample.com
'
SERVER_EMAIL
=
'devops@e
xample.com
'
TECH_SUPPORT_EMAIL
=
'technical@e
xample.com
'
CONTACT_EMAIL
=
'info@e
xample.com
'
BUGS_EMAIL
=
'bugs@e
xample.com
'
ADMINS
=
()
MANAGERS
=
ADMINS
...
...
@@ -511,7 +511,7 @@ WIKI_LINK_DEFAULT_LEVEL = 2
################################# Pearson TestCenter config ################
PEARSONVUE_SIGNINPAGE_URL
=
"https://www1.pearsonvue.com/testtaker/signin/SignInPage/EDX"
# TESTCENTER_ACCOMMODATION_REQUEST_EMAIL = "exam-help@e
dx.org
"
# TESTCENTER_ACCOMMODATION_REQUEST_EMAIL = "exam-help@e
xample.com
"
##### Feedback submission mechanism #####
FEEDBACK_SUBMISSION_EMAIL
=
None
...
...
@@ -522,7 +522,7 @@ ZENDESK_USER = None
ZENDESK_API_KEY
=
None
##### shoppingcart Payment #####
PAYMENT_SUPPORT_EMAIL
=
'payment@e
dx.org
'
PAYMENT_SUPPORT_EMAIL
=
'payment@e
xample.com
'
##### Using cybersource by default #####
CC_PROCESSOR
=
{
'CyberSource'
:
{
...
...
@@ -540,7 +540,7 @@ PAID_COURSE_REGISTRATION_CURRENCY = ['usd', '$']
#By setting up the default settings with an incorrect user name and password,
# will get an error when attempting to connect
OPEN_ENDED_GRADING_INTERFACE
=
{
'url'
:
'http://
sandbox-grader-001.m.edx.org
/peer_grading'
,
'url'
:
'http://
example.com
/peer_grading'
,
'username'
:
'incorrect_user'
,
'password'
:
'incorrect_pass'
,
'staff_grading'
:
'staff_grading'
,
...
...
@@ -853,7 +853,7 @@ CELERYD_HIJACK_ROOT_LOGGER = False
# Suffix used to construct 'from' email address for bulk emails.
# A course-specific identifier is prepended.
BULK_EMAIL_DEFAULT_FROM_EMAIL
=
'no-reply@
courseupdates.edx.org
'
BULK_EMAIL_DEFAULT_FROM_EMAIL
=
'no-reply@
example.com
'
# Parameters for breaking down course enrollment into subtasks.
BULK_EMAIL_EMAILS_PER_TASK
=
100
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment