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.

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

Removed apostrophe from MicroMaster's #560

Merged
merged 5 commits into from
Jun 22, 2016
Merged

Conversation

noisecapella
Copy link
Contributor

What are the relevant tickets?

Fixes #557

What's this PR do?

Removes apostrophe from MicroMaster's to become MicroMasters. Some apostrophes are left if they make sense in context

How should this be manually tested?

Grep through the code base to make sure all existing uses are updated, if relevant to the context

@bdero bdero temporarily deployed to micromasters-ci-pr-560 June 16, 2016 15:06 Inactive
@@ -7,7 +7,7 @@ class Footer extends React.Component {
<div className="container container-footer">
<div className="row">
<div className="col-md-8">
<img src="/static/images/[email protected]" alt="MicroMaster’s" />
<img src="/static/images/[email protected]" alt="MicroMasters" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this alt tag should actually be "MIT"

@pdpinch
Copy link
Member

pdpinch commented Jun 20, 2016

a couple of small things, but otherwise looks good

@pdpinch
Copy link
Member

pdpinch commented Jun 20, 2016

whoops, didn't realize this was still in progress

@noisecapella
Copy link
Contributor Author

It's just in progress so we could discuss the questions in the linked issue. Did you have any feedback on those questions?

@bdero bdero temporarily deployed to micromasters-ci-pr-560 June 20, 2016 15:57 Inactive
@bdero bdero temporarily deployed to micromasters-ci-pr-560 June 20, 2016 15:58 Inactive
@bdero bdero temporarily deployed to micromasters-ci-pr-560 June 20, 2016 16:10 Inactive
@giocalitri giocalitri added this to the Independence Day milestone Jun 21, 2016
@alicewriteswrongs alicewriteswrongs self-assigned this Jun 22, 2016
<p>
Use your edX.org account to enroll in a MicroMaster’s program and share your grades and progress with MIT. When you complete all the requirements and earn a MicroMaster’s credential, you can use it to apply for a Masters degree at MIT.
Use your edX.org account to enroll in a MicroMasters program and share your grades and progress with MIT. When you complete all the requirements and earn a MicroMaster’s credential, you can use it to apply for a Masters degree at MIT.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the second MicroMaster's here retaining an apostrophe intentionally?

@alicewriteswrongs
Copy link
Contributor

few questions, looked like there's a merge conflict as well.

@noisecapella
Copy link
Contributor Author

Ok, all comments should be addressed

@alicewriteswrongs
Copy link
Contributor

👍 :shipit: 🎊 🎆 👌

@noisecapella noisecapella merged commit 7cd7483 into master Jun 22, 2016
@noisecapella noisecapella deleted the gs/remove_apostrophe branch June 22, 2016 15:14
This was referenced Jul 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants