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

1.2.0 WIP #126

Merged
merged 25 commits into from Jan 15, 2013
Merged

1.2.0 WIP #126

merged 25 commits into from Jan 15, 2013

Conversation

neocotic
Copy link
Member

@neocotic neocotic commented Jan 7, 2013

Contains work to be included as part of version 1.2.0.

I've had to create a new pull request as I made a mess by accidentally merging all 1.2.0 fixes into the master branch which closed the original #118 pull request somehow. These have since been revered in the master branch.

@ghost ghost assigned neocotic Jan 7, 2013
@neocotic
Copy link
Member Author

neocotic commented Jan 7, 2013

After #116 has been completed and delivered into this branch I'll update the versions in the necessary places as well as the change log.

Finally, I'll work out how I can cleanly merge this branch back into master since I reverted most of it's changes. I thought a rebase would do it but I've not done one before.

Then it's just a matter of creating the tag for 1.2.0 and publishing it to the Chrome Web Store as well as updating the homepage.

@neocotic
Copy link
Member Author

neocotic commented Jan 8, 2013

#128 appears to have fixed the conflict issue preventing this being merged back into master so I'll now continue with the remaining work for 1.2.0.

@neocotic
Copy link
Member Author

I just need to finish the following to finalize this release;

  • Complete testing
  • Update versions (manifest, package etc.)
  • Update change log
  • Update screenshots
  • Merge into master branch
  • Create v1.2.0 tag in master branch
  • Update i18n
  • Update homepage
  • Update Chrome Web Store

neocotic added a commit that referenced this pull request Jan 15, 2013
@neocotic neocotic merged commit 7902b9e into master Jan 15, 2013
@neocotic neocotic deleted the wip-1.2.0 branch January 15, 2013 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant