Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(common): updated common to freeCodeCamp #12533

Merged
merged 1 commit into from
Jan 15, 2017
Merged

chore(common): updated common to freeCodeCamp #12533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/app/redux/reducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { handleActions } from 'redux-actions';
import types from './types';

const initialState = {
title: 'Learn To Code | Free Code Camp',
title: 'Learn To Code | freeCodeCamp',
isSignInAttempted: false,
user: '',
lang: '',
Expand All @@ -16,7 +16,7 @@ export default handleActions(
{
[types.updateTitle]: (state, { payload = 'Learn To Code' }) => ({
...state,
title: payload + ' | Free Code Camp'
title: payload + ' | freeCodeCamp'
}),

[types.updateThisUser]: (state, { payload: user }) => ({
Expand Down
4 changes: 2 additions & 2 deletions common/app/routes/settings/components/Settings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export class Settings extends React.Component {
className='btn-link-social'
href={ '/signout' }
>
Sign me out of Free Code Camp
Sign me out of freeCodeCamp
</Button>
<Button
block={ true }
Expand Down Expand Up @@ -269,7 +269,7 @@ export class Settings extends React.Component {
className='btn-link-social'
href='/delete-my-account'
>
Delete my Free Code Camp account
Delete my freeCodeCamp account
</Button>
<Button
block={ true }
Expand Down
4 changes: 2 additions & 2 deletions common/models/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ module.exports = function(User) {
text: `
Hello,\n\n
This email is confirming that you requested to
reset your password for your Free Code Camp account.
reset your password for your freeCodeCamp account.
This is your email: ${ info.email }.
Go to ${ url } to reset your password.
\n
Expand Down Expand Up @@ -441,7 +441,7 @@ module.exports = function(User) {
type: 'email',
to: email,
from: 'Team@freecodecamp.com',
subject: 'Welcome to Free Code Camp!',
subject: 'Welcome to freeCodeCamp!',
protocol: isDev ? null : 'https',
host: isDev ? 'localhost' : 'freecodecamp.com',
port: isDev ? null : 443,
Expand Down